[josm] 01/06: Imported Upstream version 0.0.svn12039+dfsg
Bas Couwenberg
sebastic at debian.org
Wed May 3 06:28:11 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 45f7069c632ef4b9cbef77fc6d958edcf220aa3b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed May 3 07:23:10 2017 +0200
Imported Upstream version 0.0.svn12039+dfsg
---
.classpath | 1 +
README | 2 +-
REVISION | 8 +-
build.xml | 25 +-
data/boundaries.osm | 2 +-
data/defaultpresets.xml | 56 +-
data/security/StartCom_Certification_Authority.pem | 44 -
data/tagging-preset.xsd | 1 +
data/validator/deprecated.mapcss | 2 +-
data/validator/ignoretags.cfg | 6 +-
data/validator/wikipedia.mapcss | 1 +
data_nodist/mapcss/basic.osm | 2 +-
data_nodist/mapcss/relation.osm | 2 +-
.../projection/projection-regression-test-data | 11764 +++++++++----------
data_nodist/trans/ast.lang | Bin 8801 -> 8733 bytes
data_nodist/trans/be.lang | Bin 18388 -> 18299 bytes
data_nodist/trans/bg.lang | Bin 2433 -> 2433 bytes
data_nodist/trans/ca-valencia.lang | Bin 7813 -> 7752 bytes
data_nodist/trans/ca.lang | Bin 10474 -> 10413 bytes
data_nodist/trans/cs.lang | Bin 11585 -> 11579 bytes
data_nodist/trans/da.lang | Bin 10536 -> 10485 bytes
data_nodist/trans/de.lang | Bin 12238 -> 12328 bytes
data_nodist/trans/el.lang | Bin 1435 -> 1435 bytes
data_nodist/trans/en.lang | Bin 9957 -> 10042 bytes
data_nodist/trans/en_AU.lang | Bin 1520 -> 1520 bytes
data_nodist/trans/en_GB.lang | Bin 2112 -> 2112 bytes
data_nodist/trans/es.lang | Bin 12618 -> 12546 bytes
data_nodist/trans/et.lang | Bin 1412 -> 1412 bytes
data_nodist/trans/fi.lang | Bin 3033 -> 3033 bytes
data_nodist/trans/fr.lang | Bin 12219 -> 12170 bytes
data_nodist/trans/gl.lang | Bin 2983 -> 2983 bytes
data_nodist/trans/hu.lang | Bin 12512 -> 13382 bytes
data_nodist/trans/id.lang | Bin 6723 -> 6723 bytes
data_nodist/trans/it.lang | Bin 10357 -> 10297 bytes
data_nodist/trans/ja.lang | Bin 11661 -> 11610 bytes
data_nodist/trans/km.lang | Bin 16686 -> 16577 bytes
data_nodist/trans/lt.lang | Bin 2041 -> 2041 bytes
data_nodist/trans/nb.lang | Bin 1711 -> 1711 bytes
data_nodist/trans/nl.lang | Bin 12362 -> 12773 bytes
data_nodist/trans/pl.lang | Bin 2860 -> 2860 bytes
data_nodist/trans/pt.lang | Bin 13644 -> 13644 bytes
data_nodist/trans/pt_BR.lang | Bin 10116 -> 10116 bytes
data_nodist/trans/ru.lang | Bin 18731 -> 19151 bytes
data_nodist/trans/sk.lang | Bin 10489 -> 10867 bytes
data_nodist/trans/sv.lang | Bin 1334 -> 1334 bytes
data_nodist/trans/uk.lang | Bin 18807 -> 19539 bytes
data_nodist/trans/vi.lang | Bin 10676 -> 10614 bytes
data_nodist/trans/zh_CN.lang | Bin 7531 -> 7531 bytes
data_nodist/trans/zh_TW.lang | Bin 4921 -> 5341 bytes
eclipse/JOSM (Java 8).launch | 4 +-
i18n/convwiki.pl | 1 +
i18n/po/af.po | 623 +-
i18n/po/am.po | 623 +-
i18n/po/ar.po | 623 +-
i18n/po/ast.po | 679 +-
i18n/po/az.po | 623 +-
i18n/po/be.po | 711 +-
i18n/po/bg.po | 649 +-
i18n/po/bn.po | 623 +-
i18n/po/br.po | 623 +-
i18n/po/bs.po | 623 +-
i18n/po/ca.po | 706 +-
i18n/po/ca at valencia.po | 665 +-
i18n/po/cs.po | 809 +-
i18n/po/cy.po | 623 +-
i18n/po/da.po | 804 +-
i18n/po/de.po | 741 +-
i18n/po/de_DE.po | 623 +-
i18n/po/el.po | 641 +-
i18n/po/en_AU.po | 655 +-
i18n/po/en_CA.po | 623 +-
i18n/po/en_GB.po | 707 +-
i18n/po/eo.po | 623 +-
i18n/po/es.po | 712 +-
i18n/po/et.po | 637 +-
i18n/po/eu.po | 627 +-
i18n/po/fa.po | 623 +-
i18n/po/fi.po | 647 +-
i18n/po/fil.po | 623 +-
i18n/po/fo.po | 623 +-
i18n/po/fr.po | 794 +-
i18n/po/ga.po | 623 +-
i18n/po/gl.po | 633 +-
i18n/po/he.po | 643 +-
i18n/po/hi.po | 623 +-
i18n/po/hr.po | 635 +-
i18n/po/ht.po | 623 +-
i18n/po/hu.po | 814 +-
i18n/po/hy.po | 623 +-
i18n/po/ia.po | 623 +-
i18n/po/id.po | 665 +-
i18n/po/is.po | 627 +-
i18n/po/it.po | 771 +-
i18n/po/ja.po | 739 +-
i18n/po/ka.po | 623 +-
i18n/po/km.po | 643 +-
i18n/po/ko.po | 1367 ++-
i18n/po/ku.po | 623 +-
i18n/po/ky.po | 623 +-
i18n/po/lb.po | 623 +-
i18n/po/lo.po | 623 +-
i18n/po/lt.po | 738 +-
i18n/po/lv.po | 623 +-
i18n/po/mk.po | 623 +-
i18n/po/mr.po | 623 +-
i18n/po/ms.po | 623 +-
i18n/po/nb.po | 643 +-
i18n/po/nds.po | 623 +-
i18n/po/nl.po | 1084 +-
i18n/po/nn.po | 623 +-
i18n/po/oc.po | 623 +-
i18n/po/pa.po | 623 +-
i18n/po/pl.po | 1407 ++-
i18n/po/pt.po | 732 +-
i18n/po/pt_BR.po | 707 +-
i18n/po/rm.po | 623 +-
i18n/po/ro.po | 623 +-
i18n/po/ru.po | 852 +-
i18n/po/sk.po | 747 +-
i18n/po/sl.po | 625 +-
i18n/po/sq.po | 623 +-
i18n/po/sr.po | 623 +-
i18n/po/sv.po | 665 +-
i18n/po/ta.po | 623 +-
i18n/po/te.po | 623 +-
i18n/po/th.po | 623 +-
i18n/po/tr.po | 641 +-
i18n/po/ug.po | 623 +-
i18n/po/uk.po | 920 +-
i18n/po/ur.po | 623 +-
i18n/po/vi.po | 673 +-
i18n/po/wae.po | 623 +-
i18n/po/zh_CN.po | 685 +-
i18n/po/zh_TW.po | 8316 ++++++-------
i18n/specialmessages.java | 10 +
josm-latest.jnlp | 2 +-
josm.jnlp | 2 +-
linux/latest/DEBIAN/control | 3 +-
linux/tested/DEBIAN/control | 3 +-
scripts/SyncEditorLayerIndex.groovy | 341 +-
scripts/TagInfoExtract.groovy | 2 +
scripts/presets_lang.pl | 6 +-
snapcraft.yaml | 9 +-
src/JOSM.java | 16 -
src/org/openstreetmap/josm/Main.java | 298 +-
.../josm/actions/AbstractMergeAction.java | 54 +-
.../josm/actions/AlignInLineAction.java | 4 +-
.../josm/actions/MergeLayerAction.java | 41 +-
.../josm/actions/MergeSelectionAction.java | 5 +-
src/org/openstreetmap/josm/actions/MoveAction.java | 14 +-
.../openstreetmap/josm/actions/OpenFileAction.java | 16 +-
.../josm/actions/OpenLocationAction.java | 27 +-
.../josm/actions/OrthogonalizeAction.java | 4 +-
.../josm/actions/SearchNotesDownloadAction.java | 5 +-
.../josm/actions/SessionLoadAction.java | 2 +-
.../josm/actions/SessionSaveAsAction.java | 3 +-
.../openstreetmap/josm/actions/SplitWayAction.java | 3 +-
.../openstreetmap/josm/actions/UnGlueAction.java | 8 +-
.../josm/actions/UnJoinNodeWayAction.java | 4 +-
.../openstreetmap/josm/actions/UploadAction.java | 5 +-
.../downloadtasks/DownloadOsmChangeTask.java | 37 +-
.../actions/downloadtasks/DownloadOsmTask.java | 12 +-
.../josm/actions/mapmode/DeleteAction.java | 6 +-
.../josm/actions/mapmode/DrawAction.java | 6 +
.../josm/actions/mapmode/ExtrudeAction.java | 6 +-
.../actions/mapmode/ImproveWayAccuracyAction.java | 14 +-
.../josm/actions/mapmode/MapMode.java | 12 +
.../josm/actions/mapmode/ParallelWayAction.java | 4 +-
.../josm/actions/mapmode/SelectAction.java | 39 +-
.../actions/relation/AbstractRelationAction.java | 10 +-
.../actions/relation/RecentRelationsAction.java | 2 +-
.../josm/actions/search/SearchAction.java | 24 +-
.../josm/actions/search/SearchCompiler.java | 9 +-
.../josm/actions/upload/FixDataHook.java | 10 +-
.../josm/command/SequenceCommand.java | 19 +-
.../josm/command/conflict/ConflictAddCommand.java | 5 +-
.../josm/corrector/ReverseWayNoTagCorrector.java | 2 +-
src/org/openstreetmap/josm/data/AutosaveTask.java | 2 +-
src/org/openstreetmap/josm/data/Preferences.java | 16 +-
src/org/openstreetmap/josm/data/Version.java | 23 +-
.../josm/data/cache/JCSCachedTileLoaderJob.java | 6 +-
.../openstreetmap/josm/data/coor/EastNorth.java | 15 +
src/org/openstreetmap/josm/data/gpx/WayPoint.java | 30 +-
.../josm/data/imagery/AbstractWMSTileSource.java | 43 +-
.../data/imagery/GetCapabilitiesParseHelper.java | 2 +-
.../josm/data/imagery/ImageryInfo.java | 72 +-
.../josm/data/imagery/TMSCachedTileLoaderJob.java | 54 +-
.../josm/data/imagery/TemplatedWMSTileSource.java | 19 +-
.../josm/data/imagery/WMSCachedTileLoaderJob.java | 3 +-
.../josm/data/imagery/WMTSTileSource.java | 187 +-
src/org/openstreetmap/josm/data/notes/Note.java | 20 +-
.../openstreetmap/josm/data/notes/NoteComment.java | 5 +-
.../josm/data/oauth/SignpostAdapters.java | 1 +
src/org/openstreetmap/josm/data/osm/Changeset.java | 23 +-
.../josm/data/osm/ChangesetDataSet.java | 33 +-
.../josm/data/osm/ChangesetDiscussionComment.java | 6 +-
.../data/osm/DataIntegrityProblemException.java | 17 +
src/org/openstreetmap/josm/data/osm/DataSet.java | 34 +-
src/org/openstreetmap/josm/data/osm/Filter.java | 25 +
.../openstreetmap/josm/data/osm/FilterMatcher.java | 3 +-
.../josm/data/osm/HighlightUpdateListener.java | 42 +
src/org/openstreetmap/josm/data/osm/Node.java | 10 +
src/org/openstreetmap/josm/data/osm/NodeData.java | 9 +
.../openstreetmap/josm/data/osm/OsmPrimitive.java | 4 +-
.../josm/data/osm/OsmPrimitiveType.java | 58 +-
.../openstreetmap/josm/data/osm/PrimitiveData.java | 18 +-
.../openstreetmap/josm/data/osm/RelationData.java | 21 +
src/org/openstreetmap/josm/data/osm/User.java | 2 +
src/org/openstreetmap/josm/data/osm/UserInfo.java | 5 +-
src/org/openstreetmap/josm/data/osm/WayData.java | 9 +
.../openstreetmap/josm/data/osm/WaySegment.java | 7 +-
.../osm/event/AbstractDatasetChangedEvent.java | 26 +
.../data/osm/event/ChangesetIdChangedEvent.java | 15 +
.../josm/data/osm/event/DataChangedEvent.java | 4 +-
.../data/osm/event/DataSetListenerAdapter.java | 15 +-
.../josm/data/osm/event/DatasetEventManager.java | 7 +
.../josm/data/osm/event/NodeMovedEvent.java | 10 +-
.../data/osm/event/PrimitiveFlagsChangedEvent.java | 5 +
.../josm/data/osm/event/PrimitivesAddedEvent.java | 10 +-
.../data/osm/event/PrimitivesRemovedEvent.java | 10 +-
.../osm/event/RelationMembersChangedEvent.java | 9 +
.../josm/data/osm/event/SelectionEventManager.java | 15 +-
.../josm/data/osm/event/TagsChangedEvent.java | 14 +
.../josm/data/osm/event/WayNodesChangedEvent.java | 9 +
.../josm/data/osm/history/HistoryNode.java | 13 +
.../josm/data/osm/history/HistoryOsmPrimitive.java | 45 +-
.../josm/data/osm/history/HistoryRelation.java | 13 +
.../josm/data/osm/history/HistoryWay.java | 13 +
.../osm/visitor/paint/AbstractMapRenderer.java | 11 +-
.../osm/visitor/paint/ComputeStyleListWorker.java | 181 +
.../data/osm/visitor/paint/OffsetIterator.java | 3 +-
.../data/osm/visitor/paint/StyledMapRenderer.java | 173 +-
.../josm/data/projection/AbstractProjection.java | 6 +-
.../josm/data/projection/CustomProjection.java | 31 +-
.../josm/data/projection/Ellipsoid.java | 7 +-
.../josm/data/projection/Projection.java | 16 +
.../josm/data/projection/Projections.java | 10 +-
.../data/projection/datum/SevenParameterDatum.java | 7 +-
.../josm/data/projection/proj/AlbersEqualArea.java | 7 +-
.../josm/data/projection/proj/CassiniSoldner.java | 3 +-
.../data/projection/proj/DoubleStereographic.java | 4 +-
.../projection/proj/LambertAzimuthalEqualArea.java | 3 +-
.../projection/proj/LambertConformalConic.java | 49 +-
.../josm/data/projection/proj/LonLat.java | 5 +-
.../josm/data/projection/proj/Mercator.java | 5 +-
.../josm/data/projection/proj/ObliqueMercator.java | 23 +-
.../data/projection/proj/PolarStereographic.java | 3 +-
.../data/projection/proj/SwissObliqueMercator.java | 4 +-
.../data/projection/proj/TransverseMercator.java | 5 +-
.../josm/data/validation/OsmValidator.java | 24 +-
.../josm/data/validation/PaintVisitor.java | 16 +-
.../data/validation/routines/DomainValidator.java | 9 +-
.../validation/routines/InetAddressValidator.java | 7 +-
.../data/validation/routines/UrlValidator.java | 21 +-
.../josm/data/validation/tests/CrossingWays.java | 18 +-
.../josm/data/validation/tests/DuplicateNode.java | 14 +-
.../josm/data/validation/tests/Highways.java | 20 +-
.../josm/data/validation/tests/LongSegment.java | 95 +-
.../data/validation/tests/MultipolygonTest.java | 42 +-
.../data/validation/tests/OpeningHourTest.java | 2 +-
.../data/validation/tests/OverlappingWays.java | 6 +-
.../data/validation/tests/RelationChecker.java | 95 +-
.../josm/data/validation/tests/TagChecker.java | 41 +-
.../data/validation/tests/UnconnectedWays.java | 16 +-
.../josm/data/validation/tests/UntaggedWay.java | 3 +-
.../data/validation/tests/WayConnectedToArea.java | 9 +-
.../josm/data/validation/util/ValUtil.java | 17 +-
.../josm/gui/ConditionalOptionPaneUtil.java | 4 +-
.../josm/gui/DefaultNameFormatter.java | 2 +-
.../josm/gui/ExceptionDialogUtil.java | 5 +-
src/org/openstreetmap/josm/gui/ExtendedDialog.java | 149 +-
.../openstreetmap/josm/gui/IExtendedDialog.java | 181 +
.../josm/gui/JosmUserIdentityManager.java | 26 +-
.../openstreetmap/josm/gui/MainApplication.java | 2 -
src/org/openstreetmap/josm/gui/MainFrame.java | 2 +-
src/org/openstreetmap/josm/gui/MapFrame.java | 2 +-
src/org/openstreetmap/josm/gui/MapStatus.java | 6 +-
src/org/openstreetmap/josm/gui/MapView.java | 8 +-
src/org/openstreetmap/josm/gui/MapViewState.java | 7 +-
.../josm/gui/NavigatableComponent.java | 39 +-
.../josm/gui/NotificationManager.java | 50 +-
.../openstreetmap/josm/gui/ProgramArguments.java | 2 +-
.../openstreetmap/josm/gui/SelectionManager.java | 17 +-
src/org/openstreetmap/josm/gui/SplashScreen.java | 8 +-
.../josm/gui/bbox/TileSelectionBBoxChooser.java | 4 +-
.../josm/gui/conflict/pair/ComparePairType.java | 16 +-
.../conflict/pair/properties/PropertiesMerger.java | 3 +-
.../josm/gui/datatransfer/ClipboardUtils.java | 1 +
.../gui/datatransfer/importers/OsmLinkPaster.java | 2 +-
.../josm/gui/dialogs/FilterDialog.java | 17 +-
.../josm/gui/dialogs/FilterTableModel.java | 20 +-
.../josm/gui/dialogs/LayerListDialog.java | 46 +-
.../josm/gui/dialogs/MapPaintDialog.java | 34 +-
.../josm/gui/dialogs/ToggleDialog.java | 20 +-
.../dialogs/changeset/ChangesetContentPanel.java | 3 +-
.../ChangesetContentTableCellRenderer.java | 10 +-
.../changeset/ChangesetContentTableModel.java | 18 +-
.../dialogs/changeset/ChangesetDetailPanel.java | 10 +-
.../dialogs/layer/LayerListTransferHandler.java | 16 +-
.../gui/dialogs/layer/LayerVisibilityAction.java | 11 +-
.../josm/gui/dialogs/properties/TagEditHelper.java | 24 +-
.../gui/dialogs/relation/ChildRelationBrowser.java | 3 +-
.../dialogs/relation/GenericRelationEditor.java | 5 +-
.../gui/dialogs/relation/MemberTableModel.java | 4 +-
.../dialogs/relation/MemberTransferHandler.java | 7 +-
.../dialogs/relation/RelationDialogManager.java | 14 +-
.../gui/dialogs/relation/actions/SavingAction.java | 5 +-
.../relation/sort/WayConnectionTypeCalculator.java | 4 +-
.../openstreetmap/josm/gui/help/HelpBrowser.java | 15 +-
.../josm/gui/history/CoordinateInfoViewer.java | 2 +-
.../josm/gui/history/VersionInfoPanel.java | 2 +-
.../josm/gui/io/ChangesetCellRenderer.java | 10 +-
.../josm/gui/io/DownloadOpenChangesetsTask.java | 14 +-
.../josm/gui/io/LayerNameAndFilePathTableCell.java | 7 +-
.../josm/gui/io/SaveLayersTableColumnModel.java | 12 +-
.../josm/gui/layer/AbstractMapViewPaintable.java | 1 +
.../josm/gui/layer/AbstractTileSourceLayer.java | 660 +-
src/org/openstreetmap/josm/gui/layer/GpxLayer.java | 2 +-
.../openstreetmap/josm/gui/layer/ImageryLayer.java | 34 +-
src/org/openstreetmap/josm/gui/layer/Layer.java | 10 +-
.../openstreetmap/josm/gui/layer/LayerManager.java | 81 +-
.../openstreetmap/josm/gui/layer/OsmDataLayer.java | 27 +-
src/org/openstreetmap/josm/gui/layer/TMSLayer.java | 15 +-
.../josm/gui/layer/ValidatorLayer.java | 4 +-
src/org/openstreetmap/josm/gui/layer/WMSLayer.java | 77 +-
.../openstreetmap/josm/gui/layer/WMTSLayer.java | 33 +-
.../gui/layer/geoimage/CorrelateGpxWithImages.java | 214 -
.../josm/gui/layer/geoimage/GeoImageLayer.java | 2 +-
.../josm/gui/layer/geoimage/Offset.java | 101 +
.../josm/gui/layer/geoimage/Timezone.java | 142 +
.../gui/layer/gpx/ConvertToDataLayerAction.java | 5 +-
.../josm/gui/layer/gpx/GpxDrawHelper.java | 2 +-
.../josm/gui/layer/gpx/ImportAudioAction.java | 2 +-
.../josm/gui/layer/gpx/ImportImagesAction.java | 2 +-
.../gui/layer/imagery/AutoLoadTilesAction.java | 51 +
.../josm/gui/layer/imagery/AutoZoomAction.java | 51 +
.../josm/gui/layer/imagery/ColorfulFilter.java | 136 +
.../gui/layer/imagery/ColorfulImageProcessor.java | 127 -
.../josm/gui/layer/imagery/DecreaseZoomAction.java | 34 +
.../gui/layer/imagery/FlushTileCacheAction.java | 50 +
.../josm/gui/layer/imagery/IncreaseZoomAction.java | 34 +
.../josm/gui/layer/imagery/LoadAllTilesAction.java | 37 +
.../layer/imagery/LoadErroneousTilesAction.java | 33 +
.../josm/gui/layer/imagery/ReprojectionTile.java | 213 +
.../josm/gui/layer/imagery/ShowErrorsAction.java | 51 +
.../josm/gui/layer/imagery/TileAnchor.java | 79 +
.../gui/layer/imagery/TileCoordinateConverter.java | 140 +-
.../josm/gui/layer/imagery/TilePosition.java | 3 +-
.../josm/gui/layer/imagery/TileRange.java | 58 -
.../layer/imagery/TileSourceDisplaySettings.java | 14 +-
.../josm/gui/layer/imagery/ZoomToBestAction.java | 34 +
.../gui/layer/imagery/ZoomToNativeLevelAction.java | 36 +
.../layer/markerlayer/DefaultMarkerProducers.java | 79 +
.../josm/gui/layer/markerlayer/Marker.java | 76 +-
.../josm/gui/layer/markerlayer/MarkerLayer.java | 76 +-
.../josm/gui/mappaint/ElemStyles.java | 22 +-
.../josm/gui/mappaint/mapcss/ConditionFactory.java | 6 +-
.../gui/mappaint/mapcss/MapCSSStyleSource.java | 2 +-
.../gui/mappaint/styleelement/NodeElement.java | 6 +-
.../gui/mappaint/styleelement/TextElement.java | 3 +-
.../gui/oauth/FullyAutomaticAuthorizationUI.java | 3 +-
.../josm/gui/oauth/TestAccessTokenTask.java | 2 +-
.../josm/gui/preferences/PreferenceTabbedPane.java | 8 +-
.../josm/gui/preferences/SourceEditor.java | 4 +-
.../preferences/imagery/CommonSettingsPanel.java | 6 +-
.../gui/preferences/imagery/ImageryPreference.java | 12 +
.../preferences/map/TaggingPresetPreference.java | 9 +-
.../gui/preferences/plugin/PluginCheckBox.java | 2 +-
.../gui/tagging/presets/TaggingPresetReader.java | 4 +-
.../josm/gui/tagging/presets/items/Roles.java | 26 +-
.../openstreetmap/josm/gui/util/RotationAngle.java | 22 +-
.../gui/widgets/BoundingBoxSelectionPanel.java | 12 +-
.../josm/gui/widgets/DateEditorWithSlider.java | 8 +-
.../josm/gui/widgets/MultiSplitLayout.java | 50 +-
.../josm/gui/widgets/ScrollableTable.java | 46 +
.../gui/widgets/VerticallyScrollablePanel.java | 17 +-
src/org/openstreetmap/josm/io/AbstractReader.java | 4 +
.../openstreetmap/josm/io/CacheCustomContent.java | 5 +-
src/org/openstreetmap/josm/io/CachedFile.java | 5 +-
.../josm/io/CertificateAmendment.java | 113 +-
.../josm/io/ChangesetClosedException.java | 4 +-
src/org/openstreetmap/josm/io/ChangesetQuery.java | 6 +-
src/org/openstreetmap/josm/io/FileImporter.java | 6 +-
src/org/openstreetmap/josm/io/MessageNotifier.java | 40 +-
src/org/openstreetmap/josm/io/OsmExporter.java | 6 +-
src/org/openstreetmap/josm/io/OsmReader.java | 1 +
src/org/openstreetmap/josm/io/OsmWriter.java | 35 +-
.../openstreetmap/josm/io/OsmWriterFactory.java | 27 +-
.../josm/io/OverpassDownloadReader.java | 90 +-
.../josm/io/auth/CredentialsAgentResponse.java | 2 +-
.../josm/io/imagery/ImageryReader.java | 47 +-
.../josm/io/remotecontrol/RequestProcessor.java | 17 +-
.../josm/io/session/SessionReader.java | 4 +-
.../openstreetmap/josm/plugins/PluginHandler.java | 78 +-
.../josm/plugins/PluginInformation.java | 6 +-
src/org/openstreetmap/josm/tools/HttpClient.java | 2 +-
src/org/openstreetmap/josm/tools/ImageWarp.java | 202 +
.../openstreetmap/josm/tools/OsmUrlToBounds.java | 11 +-
src/org/openstreetmap/josm/tools/PlatformHook.java | 18 +
.../josm/tools/PlatformHookWindows.java | 34 +-
src/org/openstreetmap/josm/tools/StreamUtils.java | 4 +-
src/org/openstreetmap/josm/tools/Utils.java | 52 +-
.../openstreetmap/josm/tools/date/DateUtils.java | 12 +-
.../template_engine/ContextSwitchTemplate.java | 12 +
.../josm/tools/template_engine/TemplateParser.java | 10 +-
styles/standard/elemstyles.mapcss | 3 +
test/data/create_multipolygon.osm | 2 +-
test/data/multipolygon.osm | 2 +-
test/data/orthogonalize.osm | 2 +-
test/data/regress/10511/10511_mini.osm | 2 +-
test/data/regress/11957/data.osm | 2 +-
test/data/regress/11992/shapes.osm | 2 +-
test/data/regress/12038/data.osm | 2 +-
test/data/regress/12436/example.osm | 2 +-
test/data/regress/12464/example.osm | 2 +-
test/data/regress/12627/overlapping.osm | 2 +-
test/data/regress/14199/emptytag.osm | 2 +-
test/data/regress/14287/example.osm | 2 +-
test/data/regress/14289/example2.osm | 2 +-
test/data/renderer/area-fill-color/data.osm | 2 +-
test/data/renderer/area-fill-color/reference.png | Bin 1725 -> 1724 bytes
test/data/renderer/area-fill-image/data.osm | 2 +-
test/data/renderer/area-icon/data.osm | 2 +-
test/data/renderer/area-icon/reference.png | Bin 11000 -> 10861 bytes
test/data/renderer/area-text/data.osm | 2 +-
test/data/renderer/area-text/reference.png | Bin 4984 -> 4820 bytes
test/data/renderer/node-shapes/data.osm | 2 +-
test/data/renderer/node-shapes/reference.png | Bin 3867 -> 3850 bytes
test/data/renderer/node-text/data.osm | 2 +-
test/data/renderer/node-text/reference.png | Bin 6743 -> 6755 bytes
test/data/renderer/order/data.osm | 2 +-
test/data/renderer/order/reference.png | Bin 13111 -> 13118 bytes
test/data/renderer/way-color/data.osm | 2 +-
test/data/renderer/way-color/reference.png | Bin 4549 -> 4779 bytes
test/data/renderer/way-dashes/data.osm | 2 +-
test/data/renderer/way-dashes/reference.png | Bin 4526 -> 4889 bytes
test/data/renderer/way-width/data.osm | 2 +-
test/data/renderer/way-width/reference.png | Bin 3557 -> 3557 bytes
test/data/sessions/data.osm | 2 +-
test/unit/org/CustomMatchers.java | 7 +-
test/unit/org/openstreetmap/josm/JOSMFixture.java | 3 +-
test/unit/org/openstreetmap/josm/MainTest.java | 210 +-
test/unit/org/openstreetmap/josm/TestUtils.java | 21 +
.../josm/actions/ExtensionFileFilterTest.java | 10 +
.../josm/actions/MergeLayerActionTest.java | 81 +
.../openstreetmap/josm/actions/MoveActionTest.java | 20 +
.../josm/actions/OrthogonalizeActionTest.java | 24 +-
.../actions/SelectByInternalPointActionTest.java | 10 +
.../josm/actions/mapmode/DeleteActionTest.java | 10 +
.../josm/actions/mapmode/DrawActionTest.java | 7 +-
.../josm/actions/mapmode/ExtrudeActionTest.java | 10 +
.../mapmode/ImproveWayAccuracyActionTest.java | 10 +
.../josm/actions/mapmode/MapViewMock.java | 7 +-
.../actions/mapmode/ParallelWayActionTest.java | 19 +
.../josm/actions/mapmode/SelectActionTest.java | 22 +-
.../josm/actions/search/PushbackTokenizerTest.java | 31 +
.../josm/actions/search/SearchActionTest.java | 31 +
.../josm/actions/search/SearchCompilerTest.java | 9 +
.../josm/command/SequenceCommandTest.java | 3 +-
.../josm/corrector/ReverseWayTagCorrectorTest.java | 10 +
.../josm/data/CustomConfiguratorTest.java | 11 +
.../org/openstreetmap/josm/data/VersionTest.java | 36 +-
.../josm/data/cache/JCSCacheManagerTest.java | 10 +
.../imagery/GetCapabilitiesParseHelperTest.java | 31 +
.../data/imagery/TemplatedWMSTileSourceTest.java | 48 +-
.../josm/data/oauth/SignpostAdaptersTest.java | 10 +
.../josm/data/osm/AbstractPrimitiveTest.java | 80 +
.../org/openstreetmap/josm/data/osm/BBoxTest.java | 84 +
.../josm/data/osm/ChangesetCacheTest.java | 86 +-
.../josm/data/osm/ChangesetDataSetTest.java | 54 +-
.../data/osm/ChangesetDiscussionCommentTest.java | 48 +
.../openstreetmap/josm/data/osm/ChangesetTest.java | 229 +
.../osm/DataIntegrityProblemExceptionTest.java | 37 +
.../openstreetmap/josm/data/osm/DataSetTest.java | 47 +
.../openstreetmap/josm/data/osm/FilterTest.java | 62 +-
.../josm/data/osm/OsmPrimitiveKeyHandlingTest.java | 2 +-
.../josm/data/osm/OsmPrimitiveTypeTest.java | 187 +
.../org/openstreetmap/josm/data/osm/UserTest.java | 46 +
.../osm/event/ChangesetIdChangedEventTest.java | 31 +
.../josm/data/osm/event/DataChangedEventTest.java | 31 +
.../josm/data/osm/event/NodeMovedEventTest.java | 31 +
.../osm/event/PrimitiveFlagsChangedEventTest.java | 31 +
.../data/osm/event/PrimitivesAddedEventTest.java | 33 +
.../data/osm/event/PrimitivesRemovedEventTest.java | 33 +
.../osm/event/RelationMembersChangedEventTest.java | 31 +
.../josm/data/osm/event/TagsChangedEventTest.java | 31 +
.../data/osm/event/WayNodesChangedEventTest.java | 31 +
.../josm/data/projection/CustomProjectionTest.java | 11 +
.../data/projection/ProjectionRegressionTest.java | 30 +-
.../josm/data/projection/proj/LonLatTest.java | 30 +
.../josm/data/projection/proj/MercatorTest.java | 30 +
.../josm/data/validation/OsmValidatorTest.java | 31 +
.../data/validation/tests/OpeningHourTestTest.java | 6 +-
.../data/validation/tests/RelationCheckerTest.java | 15 +
.../josm/data/validation/util/EntitiesTest.java | 31 +
.../josm/data/validation/util/ValUtilTest.java | 31 +
.../josm/gui/ConditionalOptionPaneUtilTest.java | 31 +
.../josm/gui/ExceptionDialogUtilTest.java | 31 +
.../josm/gui/JosmUserIdentityManagerTest.groovy | 327 -
.../josm/gui/JosmUserIdentityManagerTest.java | 387 +
.../josm/gui/NavigatableComponentTest.java | 43 +-
.../josm/gui/datatransfer/ClipboardUtilsTest.java | 10 +
.../josm/gui/datatransfer/TagTransferableTest.java | 67 +
.../josm/gui/dialogs/ChangesetDialogTest.java | 32 +
.../sort/WayConnectionTypeCalculatorTest.java | 7 +
.../gui/layer/AbstractTileSourceLayerTest.java | 203 +
.../josm/gui/layer/LayerManagerTest.java | 13 +-
.../josm/gui/layer/MarkerLayerTest.java | 43 +
.../layer/geoimage/CorrelateGpxWithImagesTest.java | 90 +-
.../josm/gui/layer/geoimage/OffsetTest.java | 84 +
.../josm/gui/layer/geoimage/TimezoneTest.java | 60 +
.../gui/mappaint/mapcss/ConditionFactoryTest.java | 11 +
.../gui/mappaint/mapcss/ExpressionFactoryTest.java | 32 +
.../preferences/plugin/PluginPreferenceTest.java | 14 +-
.../gui/tagging/ac/AutoCompletionManagerTest.java | 32 +
.../tagging/presets/TaggingPresetReaderTest.java | 15 +-
.../gui/tagging/presets/TaggingPresetsTest.java | 31 +
.../josm/io/CertificateAmendmentTest.java | 44 +-
.../josm/io/OverpassDownloadReaderTest.java | 26 +
.../josm/io/imagery/WMSImageryTest.java | 38 +
.../josm/plugins/PluginHandlerTest.java | 25 +
.../josm/testutils/JOSMTestRules.java | 31 +-
.../josm/tools/CheckParameterUtilTest.java | 31 +
.../openstreetmap/josm/tools/FontsManagerTest.java | 10 +
.../josm/tools/RightAndLefthandTrafficTest.java | 10 +
.../openstreetmap/josm/tools/StreamUtilsTest.java | 31 +
.../openstreetmap/josm/tools/TerritoriesTest.java | 14 +-
.../org/openstreetmap/josm/tools/UtilsTest.java | 10 +
.../josm/tools/date/DateUtilsTest.java | 19 +-
.../tools/template_engine/TemplateParserTest.java | 19 +
tools/checkstyle/josm_checks.xml | 2 +-
tools/findbugs/josm-filter.xml | 19 +
tools/pmd/josm-ruleset.xml | 10 +-
533 files changed, 62481 insertions(+), 25866 deletions(-)
diff --git a/.classpath b/.classpath
index 5e1eb37..a91e5c2 100644
--- a/.classpath
+++ b/.classpath
@@ -20,6 +20,7 @@
<classpathentry kind="lib" path="test/lib/reflections/javassist-3.21.0-GA.jar"/>
<classpathentry kind="lib" path="test/lib/system-rules-1.16.1.jar"/>
<classpathentry kind="lib" path="test/lib/unitils-core/unitils-core-3.4.6.jar"/>
+ <classpathentry kind="lib" path="test/lib/commons-testing/commons-testing-2.1.0.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
<classpathentry kind="lib" path="test/lib/unitils-core/commons-collections-3.2.2.jar"/>
diff --git a/README b/README
index e6d6caa..1aa89e4 100644
--- a/README
+++ b/README
@@ -126,7 +126,7 @@ This is an overview of the files and directories in the JOSM code repository:
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
- - groovy-all-2.4.8.jar used for some unit tests and various scripts
+ - groovy-all-2.4.11.jar used for some unit tests and various scripts
- jacocoant.jar used to include coverage data into JUnit test reports
- japicc/ used to generate a compatibility report between optimized jar and normal one
- javacc.jar used in the build process to generate some .java files from a javacc source file
diff --git a/REVISION b/REVISION
index 9ac6f88..20ac468 100644
--- a/REVISION
+++ b/REVISION
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<info>
<entry
- revision="11826"
kind="dir"
- path="trunk">
+ path="trunk"
+ revision="12039">
<url>https://josm.openstreetmap.de/svn/trunk</url>
<relative-url>^/trunk</relative-url>
<repository>
@@ -11,9 +11,9 @@
<uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
</repository>
<commit
- revision="11826">
+ revision="12039">
<author>bastiK</author>
-<date>2017-04-01T23:45:00.602997Z</date>
+<date>2017-05-02T21:28:33.757815Z</date>
</commit>
</entry>
</info>
diff --git a/build.xml b/build.xml
index 77d47ce..8309765 100644
--- a/build.xml
+++ b/build.xml
@@ -24,7 +24,7 @@
<property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/>
<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.8.jar"/>
+ <property name="groovy.jar" location="${base.dir}/tools/groovy-all-2.4.11.jar"/>
<property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant-2.0.19.jar"/>
<property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
<!-- build parameter: compression level (ant -Dclevel=N)
@@ -136,7 +136,7 @@ Build-Date: ${build.tstamp}
<jar destfile="${dist.dir}/josm-custom.jar" basedir="${build.dir}" level="${clevel}">
<!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
<manifest>
- <attribute name="Main-class" value="JOSM"/>
+ <attribute name="Main-class" value="org.openstreetmap.josm.gui.MainApplication"/>
<attribute name="Main-Version" value="${version.entry.commit.revision} SVN"/>
<attribute name="Main-Date" value="${version.entry.commit.date}"/>
<attribute name="Permissions" value="all-permissions"/>
@@ -229,6 +229,7 @@ Build-Date: ${build.tstamp}
<!-- get rid of "internal proprietary API" warning -->
<compilerarg value="-XDignore.symbol.file"/>
<exclude name="org/apache/commons/compress/compressors/bzip2/BZip2Utils.java"/>
+ <exclude name="org/apache/commons/compress/compressors/brotli/**"/>
<exclude name="org/apache/commons/compress/compressors/lzma/**"/>
<exclude name="org/apache/commons/compress/compressors/xz/**"/>
<exclude name="org/apache/commons/compress/compressors/CompressorStreamFactory.java"/>
@@ -272,7 +273,7 @@ Build-Date: ${build.tstamp}
</javac>
<!-- JMapViewer -->
<javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
- excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,JOSM.java,gnu/**"
+ excludes="com/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,gnu/**"
destdir="build" target="1.8" source="1.8" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
<compilerclasspath>
<pathelement location="${error_prone_ant.jar}"/>
@@ -481,8 +482,7 @@ Build-Date: ${build.tstamp}
</junitreport>
<jacoco:report>
<executiondata>
- <file file="${test.dir}/jacoco.exec"/>
- <file file="${test.dir}/jacocoIT.exec"/>
+ <fileset dir="${test.dir}" includes="*.exec"/>
</executiondata>
<structure name="JOSM Test Coverage">
<classfiles>
@@ -516,7 +516,6 @@ Build-Date: ${build.tstamp}
public static void main(java.lang.String[]);
}
- -keep class JOSM
-keep class * extends org.openstreetmap.josm.io.FileImporter
-keep class * extends org.openstreetmap.josm.io.FileExporter
-keep class org.openstreetmap.josm.actions.search.SearchCompiler$Never
@@ -702,7 +701,11 @@ 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/SyncEditorLayerIndex.groovy" classpath="${dist.dir}/josm-custom.jar">
- <arg value="-noskip"/>
+ <arg value="-noeli"/>
+ <arg value="-p"/>
+ <arg value="imagery_eliout.imagery.xml"/>
+ <arg value="-q"/>
+ <arg value="imagery_josmout.imagery.xml"/>
</groovy>
</target>
@@ -710,19 +713,19 @@ Build-Date: ${build.tstamp}
<exec append="false" executable="wget" failifexecutionfails="true">
<arg value="https://josm.openstreetmap.de/maps"/>
<arg value="-O"/>
- <arg value="maps.xml"/>
+ <arg value="imagery_josm.imagery.xml"/>
<arg value="--unlink"/>
</exec>
<exec append="false" executable="wget" failifexecutionfails="true">
<arg value="https://josm.openstreetmap.de/wiki/ImageryCompareIgnores?format=txt"/>
<arg value="-O"/>
- <arg value="maps_ignores.txt"/>
+ <arg value="imagery_josm.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="https://raw.githubusercontent.com/osmlab/editor-layer-index/gh-pages/imagery.geojson"/>
<arg value="-O"/>
- <arg value="imagery.geojson"/>
+ <arg value="imagery_eli.geojson"/>
<arg value="--unlink"/>
</exec>
<antcall target="imageryindex"/>
diff --git a/data/boundaries.osm b/data/boundaries.osm
index 3b35423..e2ad666 100644
--- a/data/boundaries.osm
+++ b/data/boundaries.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='false' generator='JOSM'>
+<osm version='0.6' upload='never' 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' />
diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index 72162f4..2341132 100644
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -1081,6 +1081,7 @@
</item> <!-- Dedicated Bridleway -->
<item name="Cycle Lane/Track" icon="presets/transport/way/cycle_lane_track.svg" type="way,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Bicycle"
+ cs.href="http://wiki.openstreetmap.org/wiki/Cs:Bicycle"
de.href="http://wiki.openstreetmap.org/wiki/DE:Bicycle"
es.href="http://wiki.openstreetmap.org/wiki/ES:Bicycle"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Bicycle"
@@ -1093,9 +1094,9 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Bicycle"
uk.href="http://wiki.openstreetmap.org/wiki/Uk:Bicycle" />
<space />
- <combo key="cycleway" text="Cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" />
- <combo key="cycleway:left" text="Cycleway left" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
- <combo key="cycleway:right" text="Cycleway right" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
+ <combo key="cycleway" text="Cycleway" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" match="key" />
+ <combo key="cycleway:left" text="Cycleway left" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
+ <combo key="cycleway:right" text="Cycleway right" values_context="cycleway" values="lane,track,opposite_lane,opposite_track,opposite,share_busway,shared_lane" />
<check key="oneway:bicycle" text="Oneway (bicycle)" />
<space />
<optional text="Edit Highway Attributes:">
@@ -1572,6 +1573,7 @@
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=milestone"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=milestone"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:highway=milestone"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=milestone"
zh_TW.href="http://wiki.openstreetmap.org/wiki/Zh-hant:Tag:highway=milestone" />
<key key="highway" value="milestone" />
<text key="distance" text="Distance (kilometers)" />
@@ -1589,6 +1591,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:highway=elevator"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:highway=elevator"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=elevator"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:highway=elevator"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=elevator"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:highway=elevator"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:highway=elevator" />
@@ -2701,6 +2704,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:railway=disused"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:railway=disused"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=disused"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:railway=disused"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=disused"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:railway=disused" />
<key key="railway" value="disused" />
@@ -3121,6 +3125,7 @@
<space />
<key key="amenity" value="car_wash" />
<reference ref="name_brand_operator_oh_wheelchair" />
+ <check key="self_service" text="Self Service" />
<reference ref="link_contact_address_payment" />
</item> <!-- Wash -->
<separator/>
@@ -4055,6 +4060,7 @@
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=fast_food"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fast_food"
el.href="http://wiki.openstreetmap.org/wiki/El:Tag:amenity=fast_food"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=fast_food"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=fast_food"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=fast_food"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:amenity=fast_food"
@@ -5162,6 +5168,7 @@
<item name="College" icon="presets/education/college.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:amenity=college"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=college"
es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:amenity=college"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:amenity=college"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=college"
@@ -5386,6 +5393,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=fire_hydrant"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:emergency=fire_hydrant"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=fire_hydrant"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:emergency=fire_hydrant"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=fire_hydrant"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:emergency=fire_hydrant"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:emergency=fire_hydrant"
@@ -5431,6 +5439,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:emergency=phone"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:emergency=phone"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:emergency=phone"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:emergency=phone"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:emergency=phone"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:emergency=phone"
pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:emergency=phone" />
@@ -5932,10 +5941,11 @@
<multiselect key="valves" text="Valves" values="dunlop;schrader;sclaverand;regina" display_values="Dunlop (Woods);Schrader;Sclaverand (Presta);Regina" values_searchable="true" />
</item> <!-- Compressed Air -->
<separator/>
- <item name="Advertising Column" icon="presets/leisure/advertising_column.svg" type="node" preset_name_label="true">
+ <item name="Advertising Column" icon="presets/leisure/advertising_column.svg" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:advertising=column"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:advertising=column"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:advertising=column"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:advertising=column"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:advertising=column"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:advertising=column" />
<space />
@@ -6098,6 +6108,7 @@
<separator/>
<item name="Bunker" name_context="golf" icon="presets/sport/golf/bunker.svg" type="closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:golf=bunker"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:golf=bunker"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:golf=bunker" />
<space />
<key key="golf" value="bunker" />
@@ -6141,6 +6152,7 @@
</item> <!-- Green -->
<item name="Fairway" name_context="golf" icon="presets/sport/golf/fairway.svg" type="closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:golf=fairway"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:golf=fairway"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:golf=fairway" />
<space />
<key key="golf" value="fairway" />
@@ -6577,6 +6589,7 @@
<item name="Motocross" icon="presets/sport/motocross.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=motocross"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:sport=motocross"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:sport=motocross"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:sport=motocross"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:sport=motocross" />
<space />
@@ -6596,6 +6609,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:sport=rc_car"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:sport"
de.href="http://wiki.openstreetmap.org/wiki/DE:Key:sport"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Key:sport"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:sport"
it.href="http://wiki.openstreetmap.org/wiki/IT:Key:sport"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Key:sport"
@@ -7476,7 +7490,9 @@
<reference ref="power_line_extra" />
</item> <!-- Power Bay -->
<item name="Power Switch" icon="presets/power/switch.svg" type="node" preset_name_label="true">
- <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switch" />
+ <link href="http://wiki.openstreetmap.org/wiki/Tag:power=switch"
+ de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=switch"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=switch" />
<space />
<key key="power" value="switch" />
</item> <!-- Power Switch -->
@@ -7755,7 +7771,7 @@
<space />
<key key="historic" value="memorial" />
<text key="name" text="Name" />
- <combo key="memorial" text="Type" values="statue,bust,plaque,stele,stone,war_memorial" values_context="memorial" />
+ <combo key="memorial" text="Type" values="statue,bust,plaque,stele,stone,war_memorial" values_context="memorial" values_searchable="true" />
<optional>
<text key="inscription" text="Inscription" />
<text key="artist_name" text="Artist Name" />
@@ -7942,6 +7958,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=pastry"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=pastry"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=pastry"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=pastry"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=pastry"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=pastry"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=pastry"
@@ -8013,6 +8030,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=greengrocer"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=greengrocer"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=greengrocer"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=greengrocer"
it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:shop=greengrocer"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=greengrocer"
nl.href="http://wiki.openstreetmap.org/wiki/NL:Tag:shop=greengrocer"
@@ -8523,6 +8541,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=copyshop"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=copyshop"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=copyshop"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=copyshop"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=copyshop"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=copyshop"
pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:shop=copyshop"
@@ -8807,6 +8826,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:shop=doityourself"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:shop=doityourself"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:shop=doityourself"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:shop=doityourself"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:shop=doityourself"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:shop=doityourself"
@@ -9382,6 +9402,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:craft=electrician"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:craft=electrician"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:craft=electrician"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:craft=electrician"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:craft=electrician"
pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:craft=electrician"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:craft=electrician" />
@@ -9487,6 +9508,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:craft=handicraft"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:craft=handicraft"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:craft=handicraft"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:craft=handicraft"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:craft=handicraft"
pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:craft=handicraft"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:craft=handicraft" />
@@ -9543,6 +9565,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:craft=beekeeper"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:craft=beekeeper"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:craft=beekeeper"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:craft=beekeeper"
fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:craft=beekeeper"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:craft=beekeeper"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:craft=beekeeper"
@@ -9654,6 +9677,7 @@
<link href="http://wiki.openstreetmap.org/wiki/Tag:boundary=national_park"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:boundary=national_park"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:boundary=national_park"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:boundary=national_park"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:boundary=national_park"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:boundary=national_park"
pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:boundary=national_park" />
@@ -10467,6 +10491,7 @@
<item name="Common" icon="presets/leisure/common.svg" type="closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:leisure=common"
+ es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:leisure=common"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:leisure=common"
pl.href="http://wiki.openstreetmap.org/wiki/Pl:Tag:leisure=common"
pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:leisure=common"
@@ -10796,6 +10821,7 @@
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Annotations"
de.href="http://wiki.openstreetmap.org/wiki/DE:Annotations"
es.href="http://wiki.openstreetmap.org/wiki/ES:Annotations"
+ fr.href="http://wiki.openstreetmap.org/wiki/FR:Annotations"
ja.href="http://wiki.openstreetmap.org/wiki/JA:Annotations"
ru.href="http://wiki.openstreetmap.org/wiki/RU:Annotations" />
<space />
@@ -10938,6 +10964,24 @@
<role key="label" text="Label point" requisite="optional" type="node" count="1" />
</roles>
</item> <!-- Boundary -->
+ <item name="Building" icon="presets/landmark/building.svg" type="relation" preset_name_label="true">
+ <link href="http://wiki.openstreetmap.org/wiki/Relation:building"
+ ja.href="http://wiki.openstreetmap.org/wiki/JA:Relation:building"
+ ru.href="http://wiki.openstreetmap.org/wiki/RU:Relation:building"
+ uk.href="http://wiki.openstreetmap.org/wiki/Uk:Relation:building" />
+ <key key="type" value="building" />
+ <preset_link preset_name="Building" />
+ <preset_link preset_name="Entrance" />
+ <preset_link preset_name="Building part" />
+ <roles>
+ <role key="outline" text="Outline of building" requisite="required" type="way,closedway,multipolygon" />
+ <role key="part" text="Inner segment" requisite="required" type="way,closedway" />
+ <role key="ridge" text="Roof ridge" requisite="optional" type="way,closedway" />
+ <role key="edge" text="Roof edge" requisite="optional" type="way,closedway" />
+ <role key="entrance" text="Entrance" requisite="optional" type="node" />
+ <role key="level_-?\d+" text="Building level" regexp="true" requisite="optional" type="relation" />
+ </roles>
+ </item> <!-- Building -->
<item name="Site" type="relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Relation:site" />
<space />
diff --git a/data/security/StartCom_Certification_Authority.pem b/data/security/StartCom_Certification_Authority.pem
deleted file mode 100644
index 960f265..0000000
--- a/data/security/StartCom_Certification_Authority.pem
+++ /dev/null
@@ -1,44 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEW
-MBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwg
-Q2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0NjM2WhcNMzYwOTE3MTk0NjM2WjB9
-MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMi
-U2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMgU3Rh
-cnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUA
-A4ICDwAwggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZk
-pMyONvg45iPwbm2xPN1yo4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rf
-OQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/C
-Ji/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/deMotHweXMAEtcnn6RtYT
-Kqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt2PZE4XNi
-HzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMM
-Av+Z6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w
-+2OqqGwaVLRcJXrJosmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+
-Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3
-Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVcUjyJthkqcwEKDwOzEmDyei+B
-26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT37uMdBNSSwID
-AQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
-FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9j
-ZXJ0LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3Js
-LnN0YXJ0Y29tLm9yZy9zZnNjYS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFM
-BgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUHAgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0
-Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRwOi8vY2VydC5zdGFy
-dGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYgU3Rh
-cnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlh
-YmlsaXR5LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2Yg
-dGhlIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFp
-bGFibGUgYXQgaHR0cDovL2NlcnQuc3RhcnRjb20ub3JnL3BvbGljeS5wZGYwEQYJ
-YIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBGcmVlIFNT
-TCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOCAgEAFmyZ
-9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8
-jhvh3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUW
-FjgKXlf2Ysd6AgXmvB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJz
-ewT4F+irsfMuXGRuczE6Eri8sxHkfY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1
-ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3fsNrarnDy0RLrHiQi+fHLB5L
-EUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZEoalHmdkrQYu
-L6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
-yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuC
-O3NJo2pXh5Tl1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6V
-um0ABj6y6koQOdjQK/W/7HW/lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkySh
-NOsF/5oirpt9P/FlUQqmMGqz9IgcgA38corog14=
------END CERTIFICATE-----
diff --git a/data/tagging-preset.xsd b/data/tagging-preset.xsd
index 072f893..8479a64 100644
--- a/data/tagging-preset.xsd
+++ b/data/tagging-preset.xsd
@@ -313,6 +313,7 @@
<attribute name="type" type="string" />
<attribute name="count" type="integer" />
<attribute name="member_expression" type="string" />
+ <attribute name="regexp" type="boolean" />
<anyAttribute processContents="skip" />
</complexType>
diff --git a/data/validator/deprecated.mapcss b/data/validator/deprecated.mapcss
index 34a0060..8ae969e 100644
--- a/data/validator/deprecated.mapcss
+++ b/data/validator/deprecated.mapcss
@@ -29,7 +29,7 @@ way[highway=ford] {
group: tr("deprecated tagging");
}
-*[class] {
+way[class] {
/* from http://wiki.openstreetmap.org/wiki/Deprecated_features */
throwWarning: tr("{0} is deprecated", "{0.key}");
suggestAlternative: "highway";
diff --git a/data/validator/ignoretags.cfg b/data/validator/ignoretags.cfg
index 53f541c..23aa73d 100644
--- a/data/validator/ignoretags.cfg
+++ b/data/validator/ignoretags.cfg
@@ -211,6 +211,11 @@ K:historic=building
K:historic=wreck
K:historic=charcoal_pile
;
+; Landcover Tags
+;
+K:landcover=grass
+K:landcover=trees
+;
; Lifecycle Tags
;
;K:historic=yes
@@ -307,7 +312,6 @@ K:tourism=yes
;
K:type=tmc
K:type=TMC
-K:type=building
;
; Tags not yet decided (to remove from this section when added or deprecated)
; see https://josm.openstreetmap.de/ticket/10759
diff --git a/data/validator/wikipedia.mapcss b/data/validator/wikipedia.mapcss
index bcc46bd..55f9c5a 100644
--- a/data/validator/wikipedia.mapcss
+++ b/data/validator/wikipedia.mapcss
@@ -130,6 +130,7 @@
/* Wikipedia without wikidata */
*[wikipedia][!wikidata] {
throwOther: tr("wikipedia tag is set, but there is no wikidata tag. Wikipedia plugin might help with wikidata id lookups");
+ group: tr("missing tag");
assertMatch: "node wikipedia=a";
assertNoMatch: "node wikipedia=a wikidata=Q123";
assertNoMatch: "node wikidata=Q1";
diff --git a/data_nodist/mapcss/basic.osm b/data_nodist/mapcss/basic.osm
index 188ca6e..e7932fe 100644
--- a/data_nodist/mapcss/basic.osm
+++ b/data_nodist/mapcss/basic.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-200' action='modify' timestamp='2011-03-09T17:19:28Z' visible='true' lat='41.75673969416612' lon='-93.59863786848396' />
<node id='-198' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.756221823885' lon='-93.60012838417869' />
<node id='-196' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.75650110784843' lon='-93.60038185479505' />
diff --git a/data_nodist/mapcss/relation.osm b/data_nodist/mapcss/relation.osm
index dc0d9a3..5c6c2b3 100644
--- a/data_nodist/mapcss/relation.osm
+++ b/data_nodist/mapcss/relation.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-473' action='modify' timestamp='2011-03-09T17:19:29Z' visible='true' lat='41.7555767086837' lon='-93.6101935942561'>
<tag k='name' v='parent selector test' />
</node>
diff --git a/data_nodist/projection/projection-regression-test-data b/data_nodist/projection/projection-regression-test-data
index 7ee5e85..84d4ff0 100644
--- a/data_nodist/projection/projection-regression-test-data
+++ b/data_nodist/projection/projection-regression-test-data
@@ -6,23 +6,23 @@ EPSG:2000
ll2 -45.348339639287325 -66.59029532185629
EPSG:20004
ll -55.06284687830613 13.382264242281078
- en 4013884.3262006086 -6130828.485608456
- ll2 -55.06284684771913 13.38226434541314
+ en 4013884.3262006086 -6130828.485608458
+ ll2 -55.06284684771916 13.38226434541314
EPSG:20005
ll -4.854870201300159 17.298060659972013
- en 4418804.990727649 -544564.9643296505
- ll2 -4.85487018218652 17.298060814994702
+ en 4418804.990727648 -544564.9643296506
+ ll2 -4.854870182186521 17.29806081499469
EPSG:20006
ll -71.07219171799844 33.28525088500556
en 6510453.275239059 -7888688.833756823
ll2 -71.07219169976027 33.28525097488226
EPSG:20007
ll -47.6430257155189 41.98583108070676
- en 7724461.109198339 -5283046.641423415
- ll2 -47.64302569674394 41.98583110952347
+ en 7724461.109198339 -5283046.641423414
+ ll2 -47.64302569674394 41.98583110952346
EPSG:20008
ll 1.7644601935314057 43.23948961688319
- en 8304187.109622844 195279.8004976416
+ en 8304187.109622844 195279.80049764158
ll2 1.7644601971774592 43.23948962199715
EPSG:20009
ll 23.033341740810044 50.55226808963789
@@ -30,36 +30,36 @@ EPSG:20009
ll2 23.03334174059795 50.5522680890825
EPSG:2001
ll 56.22342740564531 -54.24106366212991
- en 880722.2077983087 6257325.323751987
- ll2 56.2234273512729 -54.24106380078355
+ en 880722.2077983079 6257325.32375199
+ ll2 56.22342735127294 -54.241063800783564
EPSG:20010
ll 33.41549888264929 54.45251024175566
en 1.0263109136525175E7 3701810.905764326
- ll2 33.41549888232269 54.452510239396155
+ ll2 33.41549888232269 54.45251023939614
EPSG:20011
ll 38.311364343947446 59.312636990882694
en 1.1177531297346033E7 4248569.751885603
ll2 38.31136434380247 59.31263698737798
EPSG:20012
ll -42.9557969841077 75.90495729713572
- en 1.3063611430778425E7 -4780951.179914348
- ll2 -42.955796960556974 75.90495729920478
+ en 1.3063611430778425E7 -4780951.179914347
+ ll2 -42.955796960556945 75.9049572992048
EPSG:20013
ll -42.73828706999033 66.14680395478561
- en 1.2774868009955745E7 -4771766.732429236
- ll2 -42.73828702063669 66.1468040504397
+ en 1.2774868009955745E7 -4771766.732429237
+ ll2 -42.738287020636704 66.1468040504397
EPSG:20014
ll -88.91823599118361 76.55396946533705
- en 1.4490678378088303E7 -9881545.575288719
- ll2 -88.9182359586766 76.55397022374635
+ en 1.4490678378088303E7 -9881545.575288717
+ ll2 -88.91823595867658 76.55397022374639
EPSG:20015
ll -25.96304916877652 86.52461259848815
en 1.5452417543133682E7 -2872746.3777809558
- ll2 -25.963049163757375 86.52461259984727
+ ll2 -25.96304916375737 86.52461259984727
EPSG:20016
ll 1.4843285461955844 89.0178623414091
- en 1.6056514471093638E7 164609.74376735307
- ll2 1.4843285433030302 89.01786234094075
+ en 1.605651447109364E7 164609.74376735312
+ ll2 1.4843285433030309 89.01786234094077
EPSG:20017
ll 33.835178236690865 102.59720327000427
en 1.783304896797629E7 3751262.661224619
@@ -67,35 +67,35 @@ EPSG:20017
EPSG:20018
ll -82.15462245233385 113.29547949851937
en 1.8626034563663386E7 -9134808.932512691
- ll2 -82.15462241820431 113.29547926601808
+ ll2 -82.1546224182043 113.29547926601806
EPSG:20019
ll 21.400532300801984 114.2951888339341
- en 1.984178885540402E7 2371081.447064063
- ll2 21.400532299118883 114.29518883602296
+ en 1.984178885540402E7 2371081.4470640635
+ ll2 21.400532299118886 114.29518883602296
EPSG:2002
ll -80.1553854223296 -70.00712272175522
- en 246704.9642340197 -8908318.060303362
- ll2 -80.15538562894926 -70.00711641967042
+ en 246704.9642340195 -8908318.060303362
+ ll2 -80.15538562894926 -70.00711641967045
EPSG:20020
ll 11.86266489530027 123.43071279604384
en 2.1201988365766827E7 1320092.321891958
- ll2 11.862664892154005 123.43071279378883
+ ll2 11.862664892154003 123.43071279378881
EPSG:20021
ll -11.025259473733882 119.94496012765913
- en 2.1165948044409342E7 -1220881.2798630658
- ll2 -11.025259473876439 119.94496012780229
+ en 2.1165948044409342E7 -1220881.279863066
+ ll2 -11.02525947387644 119.94496012780229
EPSG:20022
ll 4.381250135630026 120.62592111560012
en 2.1567132428602785E7 489780.2825306502
- ll2 4.381250130759365 120.6259211657249
+ ll2 4.3812501307593665 120.62592116572489
EPSG:20023
ll 81.58186467923761 140.04517195563997
en 2.3582312850075997E7 9065428.202137679
ll2 81.58186467746157 140.0451719427411
EPSG:20024
ll -78.95271623553225 137.73445716557083
- en 2.4430063329064846E7 -8770193.571942221
- ll2 -78.95271620694515 137.73445706643582
+ en 2.4430063329064846E7 -8770193.57194222
+ ll2 -78.95271620694515 137.7344570664358
EPSG:20025
ll 12.243628632724423 137.95963544767986
en 2.451251376234466E7 1370741.209117154
@@ -106,48 +106,48 @@ EPSG:20026
ll2 29.293837113898675 146.0983989603695
EPSG:20027
ll -19.877657001586684 153.89041712136333
- en 2.696421238473139E7 -2206895.7326269518
- ll2 -19.87765699232661 153.89041711166092
+ en 2.6964212384731386E7 -2206895.7326269513
+ ll2 -19.877656992326603 153.89041711166084
EPSG:20028
ll 22.49449418335668 159.2838198847007
- en 2.7910981622972988E7 2499918.4635842894
- ll2 22.494494183500734 159.28381988171776
+ en 2.7910981622972984E7 2499918.46358429
+ ll2 22.494494183500734 159.28381988171773
EPSG:20029
ll 65.16876670251915 167.33256923069067
en 2.932802772420295E7 7235266.899283992
- ll2 65.16876670208242 167.3325692255926
+ ll2 65.16876670208242 167.33256922559264
EPSG:2003
ll 50.478647342368674 -65.1360517873289
en 177371.37172501461 5595842.509500858
- ll2 50.478647313778616 -65.13605174358888
+ ll2 50.47864731377861 -65.13605174358888
EPSG:20030
ll -34.08460089594583 178.1632611590736
- en 3.060723314012818E7 -3773635.7795768846
- ll2 -34.084600880125656 178.16326113052222
+ en 3.060723314012818E7 -3773635.779576885
+ ll2 -34.08460088012568 178.16326113052284
EPSG:20031
ll -50.63141019574047 -173.25971410780738
en 3.176446967180342E7 -5617793.678131881
ll2 -50.63141018115133 -173.2597141564463
EPSG:20032
ll 6.086496582091883 -179.50575469279184
- en 3.1554872713049352E7 680607.3684475361
- ll2 6.086496586833994 -179.5057546562928
+ en 3.1554872713049356E7 680607.3684475361
+ ll2 6.086496586833995 -179.50575465629282
EPSG:2004
ll 58.44404390459903 -58.297083108395384
en 615750.2198875264 6483076.407513204
- ll2 58.44404389941282 -58.297083160422915
+ ll2 58.444043899412826 -58.29708316042292
EPSG:2005
ll -76.63477373094017 -63.72791238301271
- en 355333.14593577577 -8505677.683368253
- ll2 -76.6347736925789 -63.72791212135667
+ en 355333.14593577594 -8505677.683368253
+ ll2 -76.63477369257889 -63.72791212135667
EPSG:2006
ll 70.66559743091199 -55.890763090174076
- en 625459.7798254564 7850375.9422032125
- ll2 70.66559742760576 -55.890763096246665
+ en 625459.7798254564 7850375.942203214
+ ll2 70.66559742760577 -55.89076309624666
EPSG:2007
ll -89.6032908127157 -66.21974843652265
en 396412.81621896126 -9952500.802003162
- ll2 -89.6032909697556 -66.21971594769094
+ ll2 -89.60329096975562 -66.21971594769091
EPSG:2009
ll -36.96064643651137 -66.26833640950098
en -387565.38180808607 -4119852.280203962
@@ -155,39 +155,39 @@ EPSG:2009
EPSG:2010
ll 5.468965920126948 -51.71254373710879
en 1394563.177003695 613583.4482581458
- ll2 5.468965911099514 -51.71254388089721
+ ll2 5.468965911099513 -51.71254388089721
EPSG:2011
ll 33.180754148048194 -71.6812576139562
- en -365594.76562248927 3695301.6195932226
- ll2 33.18075414232452 -71.68125761677547
+ en -365594.7656224894 3695301.6195932226
+ ll2 33.18075414232452 -71.68125761677548
EPSG:2012
ll 8.302096909759584 -61.087817419543924
- en 1012534.2270017145 923649.1728190304
- ll2 8.302096909107021 -61.08781742612796
+ en 1012534.2270017146 923649.1728190304
+ ll2 8.302096909107021 -61.087817426127955
EPSG:2013
ll 89.2364346479128 -65.16462315738633
- en 312729.67247393663 9915976.104398178
- ll2 89.23643464791368 -65.16462316080111
+ en 312729.67247393646 9915976.104398178
+ ll2 89.23643464791367 -65.16462316080123
EPSG:20135
ll -55.01080269138505 26.076893615993434
en 440908.5006435149 -6096395.490984833
- ll2 -55.010802521747486 26.076893671066344
+ ll2 -55.0108025217475 26.076893671066344
EPSG:20136
ll -78.25129007719252 25.025937801965227
- en 319214.4869112741 -8698593.814003754
- ll2 -78.25129005759044 25.025938101423975
+ en 319214.48691127414 -8698593.814003754
+ ll2 -78.25129005759041 25.025938101423975
EPSG:20137
ll 85.37095217427284 46.0650781247092
- en 563406.7025747196 9484820.250972677
- ll2 85.37095217930192 46.065078161672716
+ en 563406.7025747193 9484820.250972679
+ ll2 85.37095217930194 46.065078161672716
EPSG:20138
ll 8.098020471120506 51.90484927833685
en 1262406.534095042 901424.8811055918
- ll2 8.098020466444371 51.90484926385242
+ ll2 8.098020466444368 51.90484926385242
EPSG:2014
ll -14.011005715786382 -76.37038441747607
en -5372.695387722051 -1551194.9531954199
- ll2 -14.011005715781293 -76.37038441744092
+ ll2 -14.011005715781291 -76.37038441744092
EPSG:2015
ll -17.165450115023162 -78.79934789729496
en 60134.28525901915 -1899762.0668413187
@@ -198,28 +198,28 @@ EPSG:2016
ll2 -27.74850277858967 -76.56177739296224
EPSG:2017
ll 41.91261175251477 -74.89278047335935
- en 189256.46024370025 4642190.984739115
- ll2 41.912611752514195 -74.89278047336009
+ en 189256.46024370025 4642190.984739116
+ ll2 41.912611752514216 -74.89278047336009
EPSG:2018
ll 59.44382107698691 -75.69994294027252
en 350186.8769538684 6591516.123766931
ll2 59.44382107698689 -75.6999429402725
EPSG:2019
ll 59.57974571574399 -77.62068644735783
- en 410977.0432181668 6607886.358469073
- ll2 59.579745715740216 -77.62068644735744
+ en 410977.04321816686 6607886.358469073
+ ll2 59.57974571574021 -77.62068644735744
EPSG:2020
ll 48.70994767392709 -80.98151833777705
- en 416544.49381693586 5397725.73630937
- ll2 48.70994767392592 -80.98151833777631
+ en 416544.4938169358 5397725.736309371
+ ll2 48.70994767392593 -80.98151833777631
EPSG:2021
ll 44.32069045402543 -82.35101240098113
en 197033.18890380085 4909636.245298789
- ll2 44.32069045402493 -82.3510124009817
+ ll2 44.32069045402492 -82.3510124009817
EPSG:2022
ll 52.974406405116596 -82.60706276272059
en 398364.5940485396 5871875.610651281
- ll2 52.97440640511588 -82.60706276272028
+ ll2 52.97440640511587 -82.60706276272028
EPSG:2023
ll 48.878498193945305 -87.13823590455254
en 294661.1404832435 5415364.121540996
@@ -230,48 +230,48 @@ EPSG:2024
ll2 51.35687523407062 -90.17997605532246
EPSG:20249
ll -49.48905781565943 114.95533369924239
- en 786280.4137873014 4510535.236725298
- ll2 -49.48905780457147 114.95533372207525
+ en 786280.4137873024 4510535.236725299
+ ll2 -49.489057804571466 114.95533372207527
EPSG:2025
ll 43.959735984270985 -93.91753949513763
en 231163.02116838144 4869054.712592943
ll2 43.95973598427093 -93.91753949513772
EPSG:20250
ll 44.557648575176415 107.13003578729753
- en -284058.7953777149 1.4981337158024618E7
+ en -284058.7953777148 1.4981337158024618E7
ll2 44.557648494654565 107.1300360477658
EPSG:20251
ll -58.44622592105192 131.2814803808194
- en 982499.5287507622 3491676.5153227216
- ll2 -58.446225883757876 131.28148028973374
+ en 982499.528750764 3491676.5153227216
+ ll2 -58.44622588375788 131.28148028973376
EPSG:20252
ll -85.13395800291855 127.3706559590097
- en 484442.15343850927 544998.1707230546
- ll2 -85.13395799609522 127.37065619250072
+ en 484442.15343850915 544998.1707230527
+ ll2 -85.13395799609523 127.37065619250072
EPSG:20253
ll -83.737599957052 129.20560142940963
- en 429428.2590625315 697544.2987493072
- ll2 -83.7375999491282 129.20560161427085
+ en 429428.2590625312 697544.2987493072
+ ll2 -83.7375999491282 129.2056016142708
EPSG:20254
ll 52.555210611405585 147.0312667957006
- en 908603.679784278 1.5839867191172961E7
- ll2 52.55521060029655 147.03126674845794
+ en 908603.6797842798 1.5839867191172961E7
+ ll2 52.55521060029654 147.031266748458
EPSG:20255
ll 67.19933559989579 148.07674606769874
- en 546452.9528851941 1.745402697713778E7
- ll2 67.19933560340303 148.07674600070948
+ en 546452.9528851953 1.745402697713778E7
+ ll2 67.19933560340304 148.0767460007095
EPSG:20256
ll 21.412916331692628 160.98071766801522
- en 1329016.0785890226 1.2388916561791271E7
- ll2 21.41291630552434 160.980717648829
+ en 1329016.0785890287 1.2388916561791271E7
+ ll2 21.412916305524334 160.98071764882906
EPSG:20257
ll -83.96265992347638 163.1953308276141
- en 549132.3473235859 674127.0296875574
- ll2 -83.96265990685679 163.1953309433253
+ en 549132.3473235862 674127.0296875574
+ ll2 -83.96265990685676 163.1953309433254
EPSG:20258
ll -16.7960808690421 157.46774164679078
- en -304660.1728641847 8127471.943300574
- ll2 -16.79608088095608 157.46774164208213
+ en -304660.17286418774 8127471.943300574
+ ll2 -16.79608088095608 157.4677416420821
EPSG:2026
ll 48.06438094907365 -94.45119612154907
en 420226.7693776111 5325995.33576248
@@ -279,11 +279,11 @@ EPSG:2026
EPSG:2027
ll 67.35393793896768 -86.38214978522365
en 783920.5974326716 7485806.294986883
- ll2 67.35393793475076 -86.38214980442832
+ ll2 67.35393793475075 -86.38214980442832
EPSG:2028
ll 7.50445585545252 -77.81623152925611
- en 1517485.059880115 840182.1612586818
- ll2 7.504455847995146 -77.81623161057166
+ en 1517485.059880115 840182.161258682
+ ll2 7.50445584799515 -77.81623161057165
EPSG:2029
ll -31.084869382647895 -72.98104488940454
en 1266048.1080604643 -3466614.229856267
@@ -298,8 +298,8 @@ EPSG:2031
ll2 35.665591866747796 -85.45685862708268
EPSG:2032
ll -34.230943770694104 -65.08379412606699
- en 1414953.1544956686 -3832374.0192434657
- ll2 -34.23094373405914 -65.0837942179672
+ en 1414953.1544956684 -3832374.0192434667
+ ll2 -34.23094373405915 -65.0837942179672
EPSG:2033
ll -37.05639493357674 -67.24591559300052
en 655966.731720794 -4102364.0700238203
@@ -310,15 +310,15 @@ EPSG:2034
ll2 74.25690013191377 -54.63478132602893
EPSG:20349
ll -16.635315014291464 106.59042892747051
- en 29200.485935411067 8155444.585056635
- ll2 -16.635315008758134 106.5904289332859
+ en 29200.485935414094 8155444.585056636
+ ll2 -16.63531500875813 106.59042893328595
EPSG:2035
ll 51.24548796638953 -66.6060926729352
- en -169824.77041090012 5720878.858190519
- ll2 51.24548790097507 -66.60609233589527
+ en -169824.7704108999 5720878.85819052
+ ll2 51.24548790097508 -66.60609233589527
EPSG:20350
ll 71.36864255270496 110.6626367056305
- en 274246.96306217497 1.793034794902093E7
+ en 274246.96306217456 1.793034794902093E7
ll2 71.36864254024348 110.66263661711517
EPSG:20351
ll -64.34088039254353 116.02528527552441
@@ -326,108 +326,108 @@ EPSG:20351
ll2 -64.34088037366529 116.02528535260433
EPSG:20352
ll -70.39938878856736 130.27625953064904
- en 547644.8652847471 2188963.5081648976
- ll2 -70.39938877474798 130.2762595868905
+ en 547644.8652847472 2188963.5081648994
+ ll2 -70.39938877474795 130.2762595868905
EPSG:20353
ll 78.89756018378066 137.7332218341978
- en 558608.2371457244 1.875997824755747E7
- ll2 78.8975601932215 137.73322166845415
+ en 558608.2371457237 1.875997824755747E7
+ ll2 78.8975601932215 137.7332216684541
EPSG:20354
ll -57.90261897205294 136.24279872708735
- en 218065.03835928586 3572046.5690549267
- ll2 -57.90261895789687 136.24279875124373
+ en 218065.03835928597 3572046.569054925
+ ll2 -57.902618957896884 136.24279875124373
EPSG:20355
ll 17.069762807851703 152.06773450182217
en 1039712.181203785 1.1894182752413573E7
ll2 17.069762781916875 152.06773447704626
EPSG:20356
ll 50.676088601992774 156.8400915707293
- en 771194.4844368051 1.5620844747749949E7
- ll2 50.6760885979075 156.84009152699798
+ en 771194.4844368091 1.562084474774995E7
+ ll2 50.67608859790751 156.84009152699804
EPSG:2039
ll 74.57727057448596 32.467148704845556
en 138191.67381549653 5396143.321202573
- ll2 74.57727057286365 32.46714868692121
+ ll2 74.57727057286368 32.46714868692122
EPSG:2040
ll -37.02680712145479 0.20993931247797626
en 785484.7147315987 -4103005.6354890154
- ll2 -37.02680676663744 0.20993934973027417
+ ll2 -37.02680676663744 0.20993934973027373
EPSG:2041
ll -44.99511537005018 6.060487273266315
en 1214059.0064796994 -5022779.504143489
- ll2 -44.99511492693081 6.060487206512963
+ ll2 -44.99511492693081 6.0604872065129625
EPSG:2042
ll 73.25733214787658 -14.968517007636
- en 308337.6280816109 8138462.110341135
- ll2 73.25733212711543 -14.96851701769062
+ en 308337.6280816108 8138462.110341135
+ ll2 73.25733212711543 -14.968517017690628
EPSG:2043
ll -14.235417757601937 0.3532197758239697
- en 1512954.810813776 -1594681.2776863172
- ll2 -14.235417624115609 0.3532197394203208
+ en 1512954.8108137762 -1594681.2776863168
+ ll2 -14.235417624115604 0.35321973942032436
EPSG:20436
ll 30.440567217590697 40.48460574601826
- en 1219786.0197718958 3391502.6622868744
- ll2 30.44056721127529 40.4846057512785
+ en 1219786.0197718958 3391502.6622868753
+ ll2 30.440567211275308 40.48460575127851
EPSG:20437
ll 4.051845015136749 38.22481935607113
- en 414046.83232788823 447891.64923829475
- ll2 4.05184501525497 38.22481935515732
+ en 414046.83232788823 447891.6492382947
+ ll2 4.051845015254969 38.22481935515732
EPSG:20438
ll 21.638176408535486 40.318424868268195
- en 15218.499084706535 2400082.187213248
- ll2 21.638176408482874 40.31842486776641
+ en 15218.499084706593 2400082.187213248
+ ll2 21.638176408482874 40.318424867766424
EPSG:20439
ll 43.411912387109396 56.596053305173996
- en 953144.9840969857 4821775.646768192
- ll2 43.4119123828565 56.59605330520076
+ en 953144.9840969862 4821775.646768192
+ ll2 43.41191238285649 56.59605330520077
EPSG:2044
ll -65.82199117793284 110.26572307201207
- en 1.8740488493088555E7 -7313091.17894407
- ll2 -65.82199115607357 110.2657230460457
+ en 1.8740488493088555E7 -7313091.178944071
+ ll2 -65.82199115607358 110.2657230460457
EPSG:20440
ll 2.57671162868904 50.90925959029514
- en -178337.26068579638 286423.4125482982
- ll2 2.576711628880175 50.909259595339364
+ en -178337.26068579569 286423.4125482983
+ ll2 2.5767116288801764 50.90925959533938
EPSG:2045
ll -25.863743048157374 101.09493858183824
- en 1.8504034777956467E7 -2899491.9312505145
- ll2 -25.863743020101044 101.09493859671785
+ en 1.8504034777956467E7 -2899491.9312505154
+ ll2 -25.863743020101055 101.09493859671785
EPSG:2046
ll 71.2215016445048 8.154621872671813
- en -245578.46297040963 7919172.453135018
- ll2 71.22150164120224 8.154621900609053
+ en -245578.46297040972 7919172.453135018
+ ll2 71.22150164120224 8.154621900609051
EPSG:2047
ll -64.72294369591879 23.267125779936965
- en 298334.7022610551 -7195224.087221241
- ll2 -64.72294369216256 23.267125768862137
+ en 298334.7022610554 -7195224.087221241
+ ll2 -64.72294369216254 23.267125768862144
EPSG:2048
ll 50.903604038639145 11.027596300079997
- en -560429.1015794892 5671710.062430273
- ll2 50.90360401567574 11.027596358246434
+ en -560429.1015794897 5671710.062430273
+ ll2 50.90360401567573 11.027596358246425
EPSG:2049
ll -51.300564671595765 27.46607154554075
- en 450754.52947193047 -5705411.877411298
- ll2 -51.30056466477214 27.46607153738255
+ en 450754.52947193035 -5705411.877411299
+ ll2 -51.30056466477215 27.46607153738255
EPSG:20499
ll 43.683766504381 52.120446713801066
en 590344.4228624069 4837345.853093243
- ll2 43.683766502322435 52.12044671467946
+ ll2 43.68376650232244 52.12044671467947
EPSG:2050
ll -19.454404804791636 22.19554176912138
- en -84472.62357006388 -2152165.887200093
- ll2 -19.45440480479159 22.195541769121405
+ en -84472.62357006426 -2152165.887200093
+ ll2 -19.45440480479159 22.1955417691214
EPSG:2051
ll 5.794099591114943 27.78912175650718
en 309028.315715376 641460.0466514268
ll2 5.794099591112938 27.789121756444207
EPSG:2052
ll 2.8005188723632557 25.188403506195407
- en -201460.39294390546 309823.472260436
- ll2 2.8005188723631855 25.188403506202626
+ en -201460.39294390468 309823.472260436
+ ll2 2.8005188723631855 25.18840350620263
EPSG:2053
ll -80.79525405647907 36.69998984828272
- en 137170.37973796314 -8983052.87474482
- ll2 -80.79525405585034 36.69998975717662
+ en 137170.37973796317 -8983052.87474482
+ ll2 -80.79525405585034 36.699989757176624
EPSG:20538
ll 0.5135537806914812 39.548158413771915
en -107464.41540506657 56977.28396232296
@@ -438,123 +438,123 @@ EPSG:20539
ll2 -19.945242530287263 56.0492358107303
EPSG:2054
ll -42.30154932749861 26.34420119277835
- en -383950.1435744687 -4695643.140024151
- ll2 -42.301549326724505 26.344201192539803
+ en -383950.14357446897 -4695643.140024151
+ ll2 -42.301549326724505 26.3442011925398
EPSG:2055
ll 59.65082113842806 25.06098600890632
- en -446952.9495322511 6641957.799683637
- ll2 59.6508211189191 25.06098609119899
+ en -446952.9495322506 6641957.799683639
+ ll2 59.650821118919104 25.060986091199002
EPSG:2056
ll 3.512498244537653 71.1550276706904
- en 1.0254645160071291E7 -624490.2110000339
- ll2 3.512498519373898 71.15502723883546
+ en 1.0254645160071293E7 -624490.211000033
+ ll2 3.5124985193738985 71.15502723883549
EPSG:2057
ll 27.60828909555638 52.41351751537352
- en 639610.8985708778 3055015.9360113344
- ll2 27.608289091312784 52.41351751576185
+ en 639610.8985708768 3055015.9360113344
+ ll2 27.60828909131278 52.41351751576183
EPSG:2058
ll -58.898978048218936 42.608537972557706
- en 362226.96575101826 -6531261.744862148
- ll2 -58.89897799754523 42.608537983942234
+ en 362226.9657510186 -6531261.744862148
+ ll2 -58.89897799754523 42.60853798394225
EPSG:2059
ll 2.1440813549810116 59.32733767920666
- en 1429272.230956068 239695.02825896651
- ll2 2.1440813706098463 59.32733762614616
+ en 1429272.230956065 239695.02825896651
+ ll2 2.1440813706098463 59.32733762614615
EPSG:2060
ll -7.361249000181971 51.66632387558896
- en -89510.08581549395 -817053.659748853
- ll2 -7.361248977845842 51.66632387646533
+ en -89510.08581549255 -817053.659748853
+ ll2 -7.361248977845844 51.66632387646534
EPSG:2061
ll -15.146434067980906 63.114495735626676
- en 512256.6697158242 -1674388.5061513786
- ll2 -15.146434040482989 63.114495727620465
+ en 512256.66971582343 -1674388.5061513793
+ ll2 -15.146434040482996 63.114495727620465
EPSG:2062
ll 14.701654738347571 54.01458641292707
en 6926462.06342142 -165024.540649525
ll2 14.701654738347592 54.01458641292709
EPSG:2066
ll 13.975131874937176 -60.37243636427039
- en 355923.1447930759 1677456.1903349552
- ll2 13.975131874938855 -60.37243636426834
+ en 355923.1447930759 1677456.190334956
+ ll2 13.975131874938857 -60.37243636426834
EPSG:2067
ll 55.60864303624845 -70.280895468024
- en 41598.549556628626 6186452.145505988
- ll2 55.60864296667903 -70.28089547713053
+ en 41598.549556628685 6186452.145505989
+ ll2 55.608642966679035 -70.28089547713054
EPSG:2068
ll -22.10077480814968 3.9236025424921603
- en -324205.93281130376 -2453373.6068469845
- ll2 -22.100774775777705 3.9236025672022605
+ en -324205.9328113038 -2453373.6068469845
+ ll2 -22.10077477577771 3.923602567202261
EPSG:2069
ll 69.34293862451958 1.489598332273542
en -173170.50112809334 7724173.01219631
- ll2 69.34293860030637 1.489598861574864
+ ll2 69.34293860030635 1.4895988615748643
EPSG:2070
ll 65.9587268750775 15.612061859412078
- en 318822.3274709916 7320169.817535177
- ll2 65.95872687494311 15.612061854834813
+ en 318822.32747099164 7320169.817535178
+ ll2 65.95872687494312 15.612061854834819
EPSG:2071
ll -43.88695620703719 22.632041906797046
- en 813391.9757966821 -4889154.301321624
- ll2 -43.88695615667251 22.63204190512666
+ en 813391.9757966814 -4889154.301321624
+ ll2 -43.886956156672504 22.632041905126652
EPSG:2072
ll -15.95797836535425 16.97848445216086
en 197757.64417102624 -1764701.064619654
- ll2 -15.957978335771198 16.97848446568754
+ ll2 -15.9579783357712 16.978484465687544
EPSG:2073
ll -78.05550131226424 13.693858341817796
- en 77580.56067471109 -8672835.400773808
- ll2 -78.0555012612333 13.693858477257747
+ en 77580.56067471103 -8672835.400773808
+ ll2 -78.0555012612333 13.693858477257745
EPSG:2074
ll -58.32917693712442 20.91661242542807
en 195165.6508519957 -6467329.9688983215
- ll2 -58.329176896578566 20.916612458107245
+ ll2 -58.329176896578566 20.91661245810724
EPSG:2075
ll 62.7361418995022 28.099912428928448
- en 460575.5503132461 6968779.729805368
- ll2 62.736141897813305 28.099912424815393
+ en 460575.5503132462 6968779.729805366
+ ll2 62.7361418978133 28.099912424815393
EPSG:2076
ll 87.05090443895097 28.47997325771215
- en 220024.10909626278 9672386.944000246
- ll2 87.0509044389613 28.479973257590725
+ en 220024.1090962628 9672386.944000246
+ ll2 87.05090443896133 28.47997325759072
EPSG:2077
ll -88.06370186422528 -0.2057043318657361
- en 465499.02880077297 -9784743.981333118
- ll2 -88.06370181547886 -0.20570259474738173
+ en 465499.02880077343 -9784743.981333122
+ ll2 -88.0637018154789 -0.20570259474738212
EPSG:2078
ll 49.04165127477208 20.728598483740104
- en 918621.5638962942 5448106.8461974375
- ll2 49.04165127031154 20.72859848070636
+ en 918621.5638962942 5448106.846197439
+ ll2 49.04165127031154 20.728598480706363
EPSG:2079
ll -72.119926076537 14.091939401992112
- en 263779.03698471526 -8015972.5884670075
- ll2 -72.11992602658992 14.09193951668158
+ en 263779.0369847155 -8015972.588467008
+ ll2 -72.11992602658992 14.091939516681586
EPSG:20790
ll 46.83636134143734 -9.98616513482922
- en 58645.27844966925 1098038.293429098
- ll2 46.83636131980918 -9.986165116295433
+ en 58645.27844966925 1098038.2934290988
+ ll2 46.836361319809185 -9.986165116295435
EPSG:20791
ll -87.52215007105136 -15.611943206866615
- en -35915.137293793 -1.4120180239288647E7
- ll2 -87.52215005477363 -15.611942935805558
+ en -35915.137293792985 -1.4120180239288647E7
+ ll2 -87.52215005477363 -15.611942935805555
EPSG:2080
ll 88.42812460227549 26.226760409225005
- en 497667.566863522 9822656.730021324
- ll2 88.42812460164751 26.22676041545449
+ en 497667.56686352193 9822656.730021324
+ ll2 88.4281246016475 26.22676041545447
EPSG:2081
ll -60.629197364773695 -69.27055811450896
en 2485189.7335425317 3277922.7427831823
- ll2 -60.62919736477369 -69.27055811450896
+ ll2 -60.62919736477368 -69.27055811450896
EPSG:2082
ll 3.174363528152554 -78.04437112855676
en 1490444.5642166582 1.0357560528001124E7
ll2 3.174363461337229 -78.04437105211662
EPSG:20822
ll -63.27993512652394 -42.51592644046377
- en 924638.8529800043 2955168.6284486977
- ll2 -63.27993503862707 -42.51592666521266
+ en 924638.8529800042 2955168.6284486996
+ ll2 -63.27993503862705 -42.51592666521267
EPSG:20823
ll -31.363531313063113 -49.37720039660361
- en 83434.708375532 6521973.866940262
+ en 83434.7083755313 6521973.866940262
ll2 -31.36353130312139 -49.37720040085235
EPSG:20824
ll 77.47198430299338 -47.71701713552125
@@ -562,52 +562,52 @@ EPSG:20824
ll2 77.47198431566372 -47.717016836956034
EPSG:2083
ll -42.64080807067252 -74.19855461527612
- en 2073509.2168477233 5266224.0509964125
- ll2 -42.640808069669035 -74.19855461685084
+ en 2073509.2168477243 5266224.0509964125
+ ll2 -42.64080806966904 -74.19855461685084
EPSG:2084
ll 18.242590465593707 -70.64929345205962
en 325534.32181674027 1.2017746113711445E7
ll2 18.242590452642826 -70.64929346398988
EPSG:2087
ll 25.367686001566113 2.2873738823845784
- en -480083.2413984927 2841673.920085059
- ll2 25.367685995912968 2.2873739012036727
+ en -480083.24139849294 2841673.9200850595
+ ll2 25.36768599591297 2.2873739012036713
EPSG:2088
ll 56.890311941632234 12.52816439270511
- en 593046.4719030213 6305783.611386452
+ en 593046.4719030213 6305783.611386451
ll2 56.89031192551144 12.528164378385542
EPSG:2089
ll 70.8985490828787 40.42119106736584
- en 332907.41560555075 7872395.127719313
- ll2 70.89854908255234 40.42119106810232
+ en 332907.41560555086 7872395.127719314
+ ll2 70.89854908255236 40.42119106810232
EPSG:2090
ll 28.396661645040112 57.02421802442275
- en 1090732.9929220486 3155948.2174078547
- ll2 28.396661643671013 57.02421802665558
+ en 1090732.9929220486 3155948.217407855
+ ll2 28.39666164367102 57.02421802665559
EPSG:2093
ll 29.24428306620075 110.44957916897627
- en 932720.4377146345 3244626.3067411524
- ll2 29.244283065924304 110.44957916985535
+ en 932720.4377146359 3244626.306741155
+ ll2 29.244283065924325 110.44957916985537
EPSG:20934
ll -51.14958871203945 16.03818667774553
en 153076.1391763579 4322110.783185449
- ll2 -51.149588711800796 16.038186681175155
+ ll2 -51.14958871180079 16.03818668117516
EPSG:20935
ll 77.57899394428642 24.445828021001642
en 438709.96470456617 1.861257165104955E7
- ll2 77.57899390845776 24.445827940439855
+ ll2 77.57899390845778 24.445827940439855
EPSG:20936
ll -11.868399084485205 27.939483088980033
- en -51812.359791578376 8683277.85267167
- ll2 -11.86839908613766 27.939483089909572
+ en -51812.35979157791 8683277.85267167
+ ll2 -11.868399086137659 27.93948308990957
EPSG:2094
ll -17.75353136794351 104.79804293225641
- en 372550.49509027426 -1963326.489757113
- ll2 -17.7535313676708 104.79804293234255
+ en 372550.49509027426 -1963326.4897571127
+ ll2 -17.7535313676708 104.79804293234254
EPSG:2095
ll 63.31745814074782 -23.008697543758977
- en 99326.69438676798 7046050.797615608
- ll2 63.31745810314024 -23.00869748907723
+ en 99326.6943867678 7046050.797615608
+ ll2 63.31745810314024 -23.008697489077232
EPSG:2096
ll -69.77011746963352 127.38673020588993
en 137730.7827913143 -1.1450407244311597E7
@@ -618,16 +618,16 @@ EPSG:2097
ll2 36.883089866570714 122.53109024946083
EPSG:2098
ll -13.614115984256799 131.3117539988306
- en 884166.2899764784 -5221481.485035512
- ll2 -13.614115983454221 131.31175399585865
+ en 884166.2899764784 -5221481.485035513
+ ll2 -13.614115983454228 131.31175399585865
EPSG:2099
ll 72.65644527894739 49.92631486699122
en 72204.2993182416 5357217.657226288
ll2 72.65644527910784 49.92631486710464
EPSG:2100
ll -3.5543672699074875 31.071285564907065
- en 1287182.6301388368 -396131.614891908
- ll2 -3.554367219174091 31.071285583962975
+ en 1287182.6301388363 -396131.6148919081
+ ll2 -3.554367219174092 31.071285583962975
EPSG:2101
ll 55.842606294740136 -34.274279574122076
en 3423093.22743142 5886556.16272145
@@ -642,16 +642,16 @@ EPSG:2103
ll2 -34.20335131057522 -66.09121358782043
EPSG:21035
ll 33.33049794708242 27.03904729061287
- en 503566.55298918247 1.3688143885304969E7
- ll2 33.33049775092124 27.039047322404887
+ en 503566.5529891822 1.3688143885304969E7
+ ll2 33.33049775092124 27.039047322404883
EPSG:21036
ll -80.92760842012919 39.599253236681754
en 615845.6681407184 1008520.0105644614
- ll2 -80.92760841537002 39.599253171524396
+ ll2 -80.92760841537003 39.59925317152439
EPSG:21037
ll 49.99708893336398 43.17312637123298
- en 798932.9749078767 1.5546783525367577E7
- ll2 49.997088680153894 43.1731264633264
+ en 798932.9749078762 1.5546783525367577E7
+ ll2 49.99708868015389 43.17312646332638
EPSG:2104
ll 3.2401415424205595 -59.52871694471334
en 1334689.1182682058 -765859.4254726486
@@ -659,107 +659,107 @@ EPSG:2104
EPSG:2105
ll 41.14350158797751 172.80374583049152
en 235429.96753273875 9440661.705521759
- ll2 41.14350158797342 172.80374583048686
+ ll2 41.14350158797344 172.8037458304869
EPSG:2106
ll -55.646580058526034 174.52866194752497
- en 278024.79894803965 -1189933.8276543426
- ll2 -55.646580058521415 174.52866194752383
+ en 278024.7989480486 -1189933.8276543438
+ ll2 -55.64658005852144 174.52866194752414
EPSG:2107
ll 71.08432031507832 175.38557473044435
en 309534.0545844746 1.296863728735255E7
- ll2 71.08432031507071 175.3855747304476
+ ll2 71.08432031507073 175.3855747304476
EPSG:2108
ll 13.82721152352049 175.12401901771736
en 232448.84029392307 6720530.793097781
- ll2 13.827211523520376 175.1240190177189
+ ll2 13.827211523520377 175.1240190177189
EPSG:2109
ll 32.726650551793085 168.02880816742578
- en -181567.4263578892 8773035.136036424
- ll2 32.726650549493876 168.0288081651615
+ en -181567.42635788932 8773035.136036422
+ ll2 32.72665054949385 168.02880816516156
EPSG:21095
ll 1.450984606709497 34.04331332012951
- en 1285414.309641235 161908.32566396677
- ll2 1.4509845921897335 34.043313307510836
+ en 1285414.309641236 161908.32566396683
+ ll2 1.4509845921897344 34.04331330751084
EPSG:21096
ll 3.0964272578471395 37.024963821907214
en 947511.7677370433 343402.7530746762
ll2 3.096427240603284 37.024963826072636
EPSG:21097
ll 53.705894919522535 34.96080175865666
- en 233357.87622986926 5958478.7754763
+ en 233357.8762298689 5958478.7754763
ll2 53.705894669887726 34.960801848695915
EPSG:2110
ll -34.27447906429903 177.5900452713099
- en 579585.7862803802 1379541.6414043368
- ll2 -34.274479064296514 177.59004527131478
+ en 579585.7862803828 1379541.6414043363
+ ll2 -34.2744790642965 177.59004527131475
EPSG:2111
ll -42.7167918134868 172.45582077357298
- en 151606.69845266241 520674.5131591365
- ll2 -42.71679181342624 172.45582077353416
+ en 151606.6984526648 520674.5131591358
+ ll2 -42.71679181342625 172.45582077353427
EPSG:2112
ll -41.1445994558153 178.78393790815477
- en 663348.4315017345 770897.7669840456
- ll2 -41.144599455746416 178.78393790820678
+ en 663348.4315017344 770897.7669840463
+ ll2 -41.14459945574641 178.7839379082068
EPSG:2113
ll -32.19616858532769 175.55419212067167
- en 473341.138977082 1810143.1998754833
- ll2 -32.196168585327676 175.55419212067162
+ en 473341.138977082 1810143.1998754826
+ ll2 -32.19616858532769 175.55419212067162
EPSG:2114
ll -12.661260861081004 163.07669751747773
- en -646791.3912350918 3889310.666401396
- ll2 -12.661260847190935 163.07669758878924
+ en -646791.3912350918 3889310.6664013956
+ ll2 -12.661260847190942 163.07669758878924
EPSG:21148
ll -88.56216558546399 110.14474428699165
en 514204.6697160107 162260.64611133188
- ll2 -88.56216493935072 110.14474830732773
+ ll2 -88.56216493935075 110.14474830732776
EPSG:21149
ll -24.328711219338714 107.37469201812821
en 131937.8226328161 7304619.862068988
- ll2 -24.328711215185166 107.37469202123393
+ ll2 -24.32871121518517 107.37469202123394
EPSG:2115
ll 48.115899082610156 178.04212064218308
- en 753107.4366393909 1.071325948264577E7
- ll2 48.11589908156533 178.04212064205075
+ en 753107.4366393908 1.071325948264577E7
+ ll2 48.115899081565324 178.04212064205075
EPSG:21150
ll 39.762018794341 115.97037866704869
- en 411781.91089329595 1.4401880328640293E7
- ll2 39.76201869635284 115.97037867799793
+ en 411781.9108933008 1.4401880328640293E7
+ ll2 39.76201869635285 115.97037867799799
EPSG:2116
ll -56.986926368203974 165.61082059872203
- en 5304.866872855229 -964509.41870437
- ll2 -56.986926361548484 165.61082061065568
+ en 5304.866872853483 -964509.41870437
+ ll2 -56.986926361548484 165.6108206106557
EPSG:2117
ll 55.85032426155533 176.5383550256959
- en 710347.0831749919 1.163361511712484E7
- ll2 55.850324260184216 176.53835502481283
+ en 710347.0831750061 1.1633615117124842E7
+ ll2 55.85032426018424 176.5383550248133
EPSG:2118
ll 61.598336558359705 179.01081401709627
- en 795470.4522800705 1.2343558407817962E7
- ll2 61.598336545841754 179.01081396749848
+ en 795470.452280069 1.2343558407817962E7
+ ll2 61.598336545841754 179.0108139674985
EPSG:2119
ll -53.595069787182545 165.3958184459306
- en -103697.49226347473 -439693.24731801474
- ll2 -53.59506976953844 165.3958184898951
+ en -103697.49226347485 -439693.24731801404
+ ll2 -53.59506976953843 165.3958184898951
EPSG:2120
ll 62.781907585662395 168.80513681084676
- en 145098.8125466488 1.2375008065092487E7
- ll2 62.78190758454889 168.8051368121912
+ en 145098.81254665027 1.2375008065092487E7
+ ll2 62.7819075845489 168.80513681219114
EPSG:2121
ll 4.889831382313574 170.95036963295567
- en 396744.29770575167 6090770.580025774
- ll2 4.889831382313583 170.95036963295567
+ en 396744.29770576116 6090770.580025774
+ ll2 4.889831382313581 170.95036963295567
EPSG:2122
ll -65.44463946392008 177.07644059432172
- en 715686.6791996309 -1703079.6717977226
- ll2 -65.44463945811299 177.07644057025126
+ en 715686.6791996295 -1703079.6717977212
+ ll2 -65.44463945811296 177.07644057025126
EPSG:2123
ll 63.95846972497972 173.6758931159018
- en 648242.0004049257 1.2776454341100661E7
- ll2 63.95846972384999 173.6758931143114
+ en 648242.000404927 1.2776454341100661E7
+ ll2 63.95846972385 173.67589311431155
EPSG:2124
ll 17.008042465659656 179.94501348644653
en 1170290.4333063583 7523773.49966356
- ll2 17.00804246340575 179.94501348355
+ ll2 17.008042463405747 179.94501348354999
EPSG:2125
ll 74.93802421502005 172.40358214893055
en 430265.7361791898 1.3966176599280694E7
@@ -767,167 +767,167 @@ EPSG:2125
EPSG:2126
ll -51.28354586802785 168.91235310143406
en 250362.29584833235 32668.595397120458
- ll2 -51.28354586801867 168.91235310143094
+ ll2 -51.28354586801868 168.91235310143097
EPSG:2127
ll -69.60839037116776 167.49616902826
- en 323322.43093236716 -1971034.3767978423
- ll2 -69.60839037116621 167.49616902826025
+ en 323322.4309323684 -1971034.3767978451
+ ll2 -69.60839037116624 167.49616902826034
EPSG:2128
ll 74.24158443414649 168.2723606070067
- en 396171.2645990686 1.4041991781303655E7
- ll2 74.24158443414743 168.2723606070067
+ en 396171.264599066 1.404199178130366E7
+ ll2 74.24158443414744 168.27236060700662
EPSG:2129
ll 46.096821986297215 164.54143362887532
- en 152773.19671263942 1.095940298255045E7
- ll2 46.096821986203196 164.54143362883985
+ en 152773.19671263947 1.0959402982550452E7
+ ll2 46.09682198620322 164.54143362883985
EPSG:21291
ll -17.167525533580147 -57.57549152267329
- en 870690.4285109183 -1903629.9887998328
- ll2 -17.167525331895227 -57.575491448333054
+ en 870690.4285109176 -1903629.9887998328
+ ll2 -17.167525331895238 -57.57549144833306
EPSG:21292
ll -56.04507570879993 -64.78643148361736
- en -295707.4351332237 -7608048.258228145
- ll2 -56.04507540667503 -64.78643123751249
+ en -295707.43513322284 -7608048.258228145
+ ll2 -56.04507540667503 -64.78643123751247
EPSG:2130
ll 11.422560860236857 161.92905276209717
- en -552744.2898746701 7153261.218944261
- ll2 11.422560853586942 161.92905280098785
+ en -552744.2898746703 7153261.218944261
+ ll2 11.42256085358694 161.92905280098785
EPSG:2131
ll 3.145798457571445 162.38053979970144
- en -481089.87890037487 6231660.445082667
- ll2 3.1457984564143233 162.3805398334438
+ en -481089.87890037487 6231660.445082668
+ ll2 3.1457984564143233 162.38053983344378
EPSG:2132
ll 78.61862924825746 162.93893368776168
- en 281069.4028216498 1.469918560984461E7
- ll2 78.61862924803722 162.93893369138019
+ en 281069.4028216492 1.469918560984461E7
+ ll2 78.61862924803725 162.93893369138016
EPSG:2133
ll -6.730603331701161 158.28539060006943
en -243721.22763029905 9250906.580711395
- ll2 -6.7306033309582425 158.28539060983118
+ ll2 -6.730603330958243 158.28539060983124
EPSG:2134
ll 40.62045405122839 178.3249280151784
en 1119815.0845624015 1.4522495972440533E7
ll2 40.620454040903454 178.32492800757498
EPSG:2135
ll -9.7345752064695 170.0118889627176
- en -268288.76299254294 8915982.093769375
- ll2 -9.734575205163775 170.01188897274
+ en -268288.7629925399 8915982.093769375
+ ll2 -9.734575205163779 170.01188897273997
EPSG:2136
ll -25.127428701916017 -8.40883739425627
en -1555091.618690547 -1.088010860186649E7
- ll2 -25.127428610569076 -8.408837398354905
+ ll2 -25.12742861056908 -8.408837398354907
EPSG:2137
ll -16.421406670273996 -5.449245015383432
en 24555.956093894085 -1821074.6069596538
- ll2 -16.421406605149638 -5.449245012659325
+ ll2 -16.421406605149638 -5.4492450126593255
EPSG:2138
ll 85.12683790348767 4.291222888656279
- en 779000.6569912926 5284730.251673696
- ll2 85.12683790348768 4.291222888656293
+ en 779000.6569912934 5284730.251673696
+ ll2 85.12683790348768 4.2912228886562644
EPSG:21413
ll -88.66233574878926 84.05935685299889
en 1.3523579436880482E7 -9854442.360313961
- ll2 -88.66233570834878 84.05935679220605
+ ll2 -88.66233570834876 84.05935679220606
EPSG:21414
ll -21.40438346293068 86.48623659850205
- en 1.5069538182247182E7 -2377730.1767649427
- ll2 -21.404383463269703 86.4862365988884
+ en 1.5069538182247182E7 -2377730.176764943
+ ll2 -21.404383463269706 86.48623659888837
EPSG:21415
ll 49.242251901437555 96.27828625102049
en 1.6175183968012005E7 5498177.184701368
- ll2 49.24225185400064 96.27828603236495
+ ll2 49.24225185400065 96.27828603236493
EPSG:21416
ll -40.49382150414046 89.55738589958837
- en 1.620812835862368E7 -4489973.728160766
- ll2 -40.493821493426736 89.55738590092243
+ en 1.6208128358623678E7 -4489973.728160766
+ ll2 -40.49382149342672 89.55738590092244
EPSG:21417
ll 8.402119849781627 93.25369608151294
- en 1.6866117131914094E7 933856.135463215
- ll2 8.402119844730738 93.25369608416558
+ en 1.6866117131914098E7 933856.1354632152
+ ll2 8.402119844730741 93.25369608416561
EPSG:21418
ll 6.945276710674875 100.15237871674944
en 1.7963653010098763E7 770831.5359949233
- ll2 6.945276705650382 100.15237871895215
+ ll2 6.9452767056503815 100.15237871895214
EPSG:21419
ll 87.54950522183046 115.80584596855108
en 1.9522883379716355E7 9729243.875594266
- ll2 87.5495052173987 115.8058459286995
+ ll2 87.54950521739872 115.80584592869951
EPSG:21420
ll 60.10221903099361 112.14961425835192
- en 2.0230291507969208E7 6675394.577175508
- ll2 60.102219034453036 112.1496142636335
+ en 2.0230291507969208E7 6675394.577175506
+ ll2 60.10221903445303 112.1496142636335
EPSG:21421
ll -44.154189212176 125.70251330563285
- en 2.1716130096622188E7 -4894436.334481824
- ll2 -44.15418919674156 125.7025132950588
+ en 2.1716130096622188E7 -4894436.334481823
+ ll2 -44.154189196741555 125.7025132950588
EPSG:21422
ll -21.152773632380374 127.90675337708339
- en 2.2386360454035018E7 -2340298.8845437425
- ll2 -21.152773629620622 127.9067533751714
+ en 2.238636045403502E7 -2340298.8845437425
+ ll2 -21.152773629620615 127.90675337517146
EPSG:21423
ll -86.07025812995336 129.77098771244863
- en 2.3459929748617128E7 -9564903.62545449
- ll2 -86.07025809533184 129.77098738999456
+ en 2.3459929748617128E7 -9564903.625454491
+ ll2 -86.07025809533185 129.77098738999456
EPSG:21453
ll -76.2874706046286 82.63325336878519
- en 701597.9094328965 -8483699.840072857
+ en 701597.9094328962 -8483699.840072857
ll2 -76.28747056581996 82.63325332060214
EPSG:21454
ll 52.904721100675744 74.48637592165011
- en 62032.45793328178 5883943.378049347
- ll2 52.9047210976973 74.48637592577275
+ en 62032.4579332819 5883943.378049348
+ ll2 52.90472109769731 74.48637592577276
EPSG:21455
ll -79.90519449048868 77.64430135586285
- en 317640.8913905613 -8889235.305794489
- ll2 -79.90519445231794 77.64430195048291
+ en 317640.89139056177 -8889235.305794494
+ ll2 -79.90519445231797 77.6443019504829
EPSG:21456
ll -56.36064984060495 102.12471115184516
- en 1063090.768037804 -6286108.098009768
- ll2 -56.360649770595025 102.1247108857824
+ en 1063090.768037804 -6286108.098009769
+ ll2 -56.36064977059504 102.12471088578243
EPSG:21457
ll -35.625068589012024 101.34440645527656
- en 712388.0434537593 -3946383.973387883
- ll2 -35.625068581934094 101.34440645448517
+ en 712388.0434537593 -3946383.9733878835
+ ll2 -35.62506858193411 101.34440645448517
EPSG:21458
ll -57.94477819437305 98.74515529904656
- en 129855.55889397819 -6442217.450012584
- ll2 -57.94477816486056 98.74515530578238
+ en 129855.5588939765 -6442217.450012584
+ ll2 -57.944778164860566 98.74515530578236
EPSG:21459
ll -9.235805134167649 109.77721059481624
- en 365582.9999898745 -1021473.1146570529
- ll2 -9.23580513832302 109.77721059627848
+ en 365582.99998987606 -1021473.1146570528
+ ll2 -9.235805138323022 109.7772105962785
EPSG:21460
ll 10.002400240292644 120.06635402611064
- en 836283.9607794895 1107759.5020427578
- ll2 10.002400236673397 120.06635403018369
+ en 836283.9607794895 1107759.502042758
+ ll2 10.002400236673395 120.06635403018366
EPSG:21461
ll 89.42452051332748 122.19133426376135
- en 499021.99404728477 9937727.952004928
- ll2 89.42452050810164 122.19133400460876
+ en 499021.9940472847 9937727.952004924
+ ll2 89.42452050810162 122.19133400460876
EPSG:21462
ll 45.87354087294196 137.72778921505778
en 1177447.5527156615 5119264.528281562
- ll2 45.8735408394297 137.7277891246093
+ ll2 45.8735408394297 137.72778912460933
EPSG:21463
ll -31.226603944896084 137.31037666812708
en 720058.7912220571 -3458326.310026255
- ll2 -31.226603935076913 137.31037665936242
+ ll2 -31.226603935076913 137.31037665936245
EPSG:21500
ll -7.15602974968796 8.4289057727581
en 845931.0862798668 -7312003.512369068
ll2 -7.156029749687918 8.4289057727581
EPSG:2154
ll 50.02689509732728 -4.49984483215602
- en 162883.97727507062 7017576.164756147
- ll2 50.0268950973273 -4.499844832156021
+ en 162883.97727507039 7017576.164756145
+ ll2 50.02689509732727 -4.499844832156022
EPSG:2157
ll -12.127381217545178 -6.141543441972114
- en 802291.4677321664 -6520822.160937092
- ll2 -12.127381217544878 -6.1415434419769666
+ en 802291.4677321666 -6520822.160937092
+ ll2 -12.127381217544881 -6.141543441976966
EPSG:2158
ll -20.058640528286347 -3.4946243484862674
en 1076360.4357878393 -2227488.304125059
- ll2 -20.058640527849725 -3.4946243482002544
+ ll2 -20.058640527849725 -3.494624348200255
EPSG:2159
ll -71.58685580081378 -20.619029096040926
en -494347.4918034371 -2.8559447256243E7
@@ -938,43 +938,43 @@ EPSG:2160
ll2 -52.7297461780726 -11.565184032833063
EPSG:2161
ll -29.953330187829543 -10.48647869928834
- en 935761.8051303441 -3322282.82766875
- ll2 -29.95333013803572 -10.486478700767384
+ en 935761.8051303443 -3322282.82766875
+ ll2 -29.953330138035724 -10.486478700767384
EPSG:2162
ll -55.6243327457123 -8.574280644441549
- en 526816.7954149537 -6164357.90894286
- ll2 -55.62433263256851 -8.5742806503242
+ en 526816.7954149537 -6164357.908942861
+ ll2 -55.624332632568525 -8.574280650324198
EPSG:2163
ll 12.526637770006957 -147.98080061150574
- en -5141128.167378954 -2188265.6514135734
- ll2 12.526637770006953 -147.98080061150574
+ en -5141128.167378955 -2188265.6514135725
+ ll2 12.526637770006962 -147.98080061150574
EPSG:2164
ll -62.32215364049232 -1.4097532551364758
- en 685929.1875478416 -6915338.174268204
- ll2 -62.322153290098626 -1.4097531597690787
+ en 685929.1875478415 -6915338.174268206
+ ll2 -62.32215329009864 -1.4097531597690807
EPSG:2165
ll 27.64557544721073 -5.625442931260142
- en 438260.8837284929 3057666.7165792556
- ll2 27.645575410282188 -5.625442940207451
+ en 438260.8837284929 3057666.7165792566
+ ll2 27.645575410282195 -5.62544294020745
EPSG:2169
ll 24.819267021926976 13.01274461879352
- en 773080.9716932138 -2658974.998239887
- ll2 24.819267021284194 13.012744617112071
+ en 773080.9716932137 -2658974.9982398865
+ ll2 24.819267021284208 13.012744617112071
EPSG:2172
ll -18.234085696981055 68.37369094014814
en 1.2340812832182305E7 -2039478.7002361491
ll2 -18.234085695157166 68.37369094166633
EPSG:2173
ll 62.52222075620068 -48.62699797035016
- en 559121.5585078234 8611536.768666623
- ll2 62.52222077646539 -48.62699794808662
+ en 559121.5585078229 8611536.768666623
+ ll2 62.52222077646538 -48.62699794808661
EPSG:2174
ll -71.96696153692008 73.18609631090214
- en 1.2889767427872071E7 -1.9921823937874343E7
- ll2 -71.96696150812419 73.18609635833086
+ en 1.2889767427872065E7 -1.992182393787436E7
+ ll2 -71.96696150812424 73.18609635833089
EPSG:2175
ll 25.7544084450238 15.223705058389976
- en -137718.8374875635 -1844996.237286585
+ en -137718.83748756337 -1844996.237286585
ll2 25.75440845074688 15.22370507360353
EPSG:2176
ll 49.64490220491846 16.279713636209475
@@ -983,15 +983,15 @@ EPSG:2176
EPSG:2177
ll 53.90237086111341 17.70353103400919
en 6480514.884490048 5974630.160070014
- ll2 53.90237086111341 17.703531034009192
+ ll2 53.902370861113404 17.703531034009192
EPSG:2178
ll 51.28025609515727 21.516295219859636
- en 7536021.072707665 5682953.495861567
- ll2 51.28025609515728 21.51629521985964
+ en 7536021.072707665 5682953.495861566
+ ll2 51.28025609515727 21.51629521985964
EPSG:21780
ll -44.70775489436065 -118.61699310140912
- en -1.6051496664269127E7 -1097635.5340433235
- ll2 -44.707754920455834 -118.61699167922754
+ en -1.6051496664269127E7 -1097635.5340433249
+ ll2 -44.70775492045585 -118.61699167922754
EPSG:21781
ll 46.582471410091934 8.159223152110604
en 655230.9360561728 159275.55116362066
@@ -999,7 +999,7 @@ EPSG:21781
EPSG:21782
ll 34.74535187788922 167.90219295117086
en 1.2532343845140036E7 1.2044444239338348E7
- ll2 34.74535299797321 167.90219267704495
+ ll2 34.74535299797321 167.90219267704492
EPSG:2179
ll 51.812974050704796 24.579389794413864
en 8539953.715775384 5742250.607423828
@@ -1010,56 +1010,56 @@ EPSG:2180
ll2 49.52724731520734 18.276541360153264
EPSG:21818
ll 38.136635784402756 -80.02811715546076
- en 58865.14090154343 4233212.793131323
- ll2 38.13663573743102 -80.02811704584663
+ en 58865.14090154343 4233212.7931313235
+ ll2 38.13663573743103 -80.02811704584661
EPSG:2188
ll -77.50087734087943 -31.914212668964147
en 526604.2081455451 -8602957.72376191
- ll2 -77.50087733325509 -31.91421260686296
+ ll2 -77.50087733325509 -31.914212606862964
EPSG:2189
ll 70.49637897118399 -21.209292861111667
en 715388.5915655501 7831625.72840022
- ll2 70.49637896089699 -21.209292907507056
+ ll2 70.496378960897 -21.209292907507056
EPSG:21896
ll -38.11520059643185 -72.0939253366292
en 1437114.837167611 -3740373.737979265
- ll2 -38.11520049203183 -72.09392551449213
+ ll2 -38.115200492031825 -72.0939255144921
EPSG:21897
ll 22.031877221532156 -77.52835813249685
- en 643559.4979658595 2933111.03638094
- ll2 22.031877184835615 -77.52835807994046
+ en 643559.4979658581 2933111.03638094
+ ll2 22.031877184835608 -77.5283580799405
EPSG:21898
ll 58.74857364473556 -67.55294941478049
- en 1203792.750691288 7011720.905525401
- ll2 58.74857361880619 -67.55294922846686
+ en 1203792.7506912872 7011720.905525401
+ ll2 58.74857361880619 -67.55294922846689
EPSG:21899
ll 71.33967040886287 -68.79347473587714
- en 974146.8757754928 8410257.99831377
+ en 974146.8757754928 8410257.998313772
ll2 71.33967041044382 -68.79347441098989
EPSG:2190
ll 64.61551838226487 -24.41386404683196
- en 623645.9020232278 7168133.604087349
- ll2 64.61551835332777 -24.413864064295236
+ en 623645.9020232279 7168133.604087349
+ ll2 64.61551835332776 -24.413864064295232
EPSG:2193
ll -73.61450420863451 164.81463355228576
- en 1342999.4208316794 1813321.4667470902
- ll2 -73.61450420257061 164.81463369874368
+ en 1342999.4208316777 1813321.4667470902
+ ll2 -73.61450420257061 164.81463369874365
EPSG:2195
ll 3.112777167828696 -164.4544588193225
- en 1228875.8449782887 1.0346327092666885E7
- ll2 3.112777167521979 -164.45445882898275
+ en 1228875.8449782855 1.0346327092666885E7
+ ll2 3.1127771675219793 -164.45445882898278
EPSG:2196
ll 13.25191764500039 3.9713531819081664
- en -399972.47532752855 1472158.255318093
- ll2 13.251917644674359 3.9713531833022184
+ en -399972.47532752855 1472158.2553180938
+ ll2 13.251917644674366 3.9713531833022166
EPSG:2197
ll 57.42888274183025 9.704980067798093
- en 362157.37735710794 6369684.465599736
- ll2 57.428882741817475 9.704980067796955
+ en 362157.3773571078 6369684.465599738
+ ll2 57.428882741817496 9.704980067796951
EPSG:2198
ll -62.01666572027415 10.87941485372176
- en 684310.676085712 -6885641.658960098
- ll2 -62.01666571990704 10.879414853943713
+ en 684310.676085712 -6885641.6589601
+ ll2 -62.01666571990705 10.879414853943711
EPSG:2200
ll 83.27736391716013 -135.81377486649967
en -500615.70211117156 5573969.802413607
@@ -1070,56 +1070,56 @@ EPSG:2201
ll2 -26.508090167974434 -75.73876919650628
EPSG:2202
ll -10.362158756356493 -61.593814022714355
- en 1312903.7417065385 -1154944.0574434113
- ll2 -10.362158754318381 -61.59381403662304
+ en 1312903.7417065375 -1154944.0574434113
+ ll2 -10.362158754318381 -61.593814036623044
EPSG:2203
ll 28.663657167817192 -67.54873696445412
- en 55272.81204122474 3179201.9053517105
+ en 55272.81204122334 3179201.9053517105
ll2 28.663657167560277 -67.54873696493966
EPSG:22032
ll -33.663611872314526 7.060216636317232
en 320482.76885970274 6273659.303454462
- ll2 -33.6636118784569 7.060216668024305
+ ll2 -33.6636118784569 7.060216668024306
EPSG:22033
ll -77.39519710449734 19.357649370739008
en 606385.1118733323 1405420.2830986269
- ll2 -77.39519710702032 19.357649308675843
+ ll2 -77.39519710702032 19.357649308675846
EPSG:2205
ll 35.90688046081484 -132.8337839268003
en -3689031.8014313946 954291.8430346603
- ll2 35.90688046081498 -132.83378392680032
+ ll2 35.90688046081498 -132.8337839268003
EPSG:2206
ll 73.39423185705186 22.96308397448659
- en 9371311.965612717 8152258.812571839
+ en 9371311.965612717 8152258.81257184
ll2 73.39423185624642 22.96308397951307
EPSG:2207
ll -13.024380008369448 27.600380354959135
- en 1.0239669576455262E7 -1441547.984628065
- ll2 -13.024379985157466 27.600380365351924
+ en 1.023966957645526E7 -1441547.9846280648
+ ll2 -13.024379985157465 27.60038036535191
EPSG:2208
ll 17.758625456005632 36.44165656185645
en 1.1865200906683639E7 1967768.6897096059
- ll2 17.758625471346136 36.44165656518096
+ ll2 17.75862547134614 36.44165656518096
EPSG:2209
ll 59.95921117640435 32.94775060416021
en 1.232954287249561E7 6653645.38198452
- ll2 59.959211176965404 32.94775060559751
+ ll2 59.95921117696541 32.94775060559751
EPSG:22091
ll -14.237223446719355 11.698894072887946
en 521787.00041414076 8426255.55975935
ll2 -14.237223442826991 11.698894087866993
EPSG:22092
ll 42.58397958930675 10.93941934800408
- en 413305.74751449557 1.4715291262211302E7
- ll2 42.58397940936101 10.939419165062484
+ en 413305.7475144957 1.4715291262211302E7
+ ll2 42.583979409361014 10.939419165062484
EPSG:2210
ll -17.09183308589799 31.818043110771292
- en 1.27339279191659E7 -1904554.8658643246
- ll2 -17.091833060781447 31.81804312217569
+ en 1.2733927919165898E7 -1904554.8658643248
+ ll2 -17.091833060781454 31.818043122175673
EPSG:2211
ll 22.04709157310701 45.24679933073587
- en 1.4835308831713896E7 2442741.979242886
- ll2 22.047091585952238 45.24679933154156
+ en 1.4835308831713898E7 2442741.9792428855
+ ll2 22.047091585952238 45.24679933154157
EPSG:2212
ll 0.9588589591247114 47.69640459845439
en 1.5800245505465947E7 106266.65853958568
@@ -1127,11 +1127,11 @@ EPSG:2212
EPSG:2213
ll 33.87168023722262 32.780476868743776
en 757194.9997673729 3751408.051404337
- ll2 33.87168023720194 32.78047686877713
+ ll2 33.87168023720194 32.780476868777136
EPSG:2215
ll 68.36441130760471 -0.4186859640937204
en 113882.64742215519 7613003.561229685
- ll2 68.36441121336844 -0.4186856310009053
+ ll2 68.36441121336844 -0.4186856310009052
EPSG:2216
ll -8.843159206473757 -43.42580631135332
en 1335023.1846904536 -985886.547780726
@@ -1139,102 +1139,102 @@ EPSG:2216
EPSG:2217
ll 21.325354733542383 -44.733854827811626
en 527387.1834833873 2358454.0849050577
- ll2 21.32535479916911 -44.733854888514394
+ ll2 21.32535479916911 -44.7338548885144
EPSG:22171
ll -13.027075092145736 -70.8578546925757
en 1623899.3312313706 8560981.197495755
ll2 -13.02707509214571 -70.85785469257607
EPSG:22172
ll 7.347573932414704 -68.61750590493975
- en 2542232.031628856 1.0814481002713418E7
- ll2 7.347573932414773 -68.61750590493973
+ en 2542232.031628854 1.0814481002713418E7
+ ll2 7.347573932414774 -68.61750590493975
EPSG:22173
ll -66.36677233797636 -67.43198141579153
en 3435920.9260000205 2637494.0772573696
- ll2 -66.36677233797667 -67.43198141579155
+ ll2 -66.36677233797667 -67.43198141579154
EPSG:22174
ll 44.55762899249592 -56.474519651482446
en 5018474.189480709 1.4958511422928832E7
- ll2 44.5576289862209 -56.47451965555911
+ ll2 44.5576289862209 -56.474519655559114
EPSG:22175
ll -8.188574465225457 -53.302527358541056
- en 6239636.702158357 9090280.01774717
- ll2 -8.18857446436937 -53.302527367221074
+ en 6239636.702158358 9090280.01774717
+ ll2 -8.188574464369372 -53.30252736722107
EPSG:22176
ll -7.89804872524256 -47.125113218179564
- en 7594167.768951699 9115535.509530472
+ en 7594167.7689517 9115535.509530472
ll2 -7.898048712446253 -47.12511335248339
EPSG:22177
ll 22.337427934794874 -45.455951106587904
- en 8382515.550127268 1.2498266962133091E7
- ll2 22.337427926820038 -45.45595110464941
+ en 8382515.550127267 1.2498266962133091E7
+ ll2 22.33742792682003 -45.45595110464941
EPSG:22181
ll -40.3714515312531 -68.97435972056786
en 1756985.1070630406 5526794.014522409
- ll2 -40.371451531199796 -68.97435972052314
+ ll2 -40.371451531199796 -68.97435972052313
EPSG:22182
ll -36.007496584441604 -62.61822733645461
- en 3075719.0854437537 5996696.392904252
- ll2 -36.007496580959256 -62.618227335003546
+ en 3075719.085443755 5996696.392904252
+ ll2 -36.007496580959256 -62.61822733500353
EPSG:22183
ll -2.849373506004426 -67.08308838212794
en 3379572.0343433484 9686839.122245835
- ll2 -2.849373506004419 -67.08308838212741
+ ll2 -2.8493735060044196 -67.08308838212741
EPSG:22184
ll -78.26201922491194 -62.01399652989265
- en 4522400.441576405 1310689.2320827758
- ll2 -78.26201922491282 -62.01399652989266
+ en 4522400.4415764045 1310689.2320827772
+ ll2 -78.2620192249128 -62.013996529892694
EPSG:22185
ll -79.4825727450578 -55.45009976197324
- en 5592662.0417445935 1170981.4398659652
- ll2 -79.48257274499348 -55.45009976274511
+ en 5592662.041744593 1170981.4398659652
+ ll2 -79.48257274499348 -55.45009976274516
EPSG:22186
ll 1.5499200723704263 -58.90264745244629
- en 6288236.097539392 1.0173442567609692E7
- ll2 1.5499200723703725 -58.90264745243678
+ en 6288236.09753939 1.0173442567609692E7
+ ll2 1.5499200723703725 -58.90264745243681
EPSG:22187
ll -57.7318005704219 -56.389849767483845
- en 7357644.018188184 3598042.904086068
- ll2 -57.731800570405674 -56.389849767484876
+ en 7357644.018188183 3598042.904086068
+ ll2 -57.73180057040568 -56.389849767484876
EPSG:2219
ll -29.60443563616426 -71.57821511451661
- en 250313.5042684002 -3277730.293756545
- ll2 -29.604435636155205 -71.57821511453594
+ en 250313.5042684002 -3277730.293756546
+ ll2 -29.60443563615522 -71.57821511453594
EPSG:22191
ll 32.821100919812494 -70.8389796924872
en 1608823.488551501 1.3635760939314347E7
ll2 32.82110090421687 -70.83897967271488
EPSG:22192
ll -7.124384577216574 -74.65670506960824
- en 1874218.8003723961 9210534.224846177
- ll2 -7.12438458595149 -74.65670505585945
+ en 1874218.8003723978 9210534.224846177
+ ll2 -7.124384585951489 -74.65670505585943
EPSG:22193
ll -7.25032141027107 -66.74928221187959
en 3417329.6719863447 9200380.42188905
- ll2 -7.250321417413807 -66.74928220530506
+ ll2 -7.250321417413804 -66.74928220530508
EPSG:22194
ll 59.669659204060025 -72.98616995563543
en 3938687.31825492 1.6661971610562364E7
- ll2 59.66965910798943 -72.98616924010079
+ ll2 59.669659107989425 -72.9861692401008
EPSG:22195
ll -66.67486597898369 -55.423916561637405
en 5702183.653897792 2596661.069801415
- ll2 -66.67486597697892 -55.42391656013933
+ ll2 -66.67486597697892 -55.42391656013935
EPSG:22196
ll 57.16036180476033 -55.40158820499511
- en 6596768.037247865 1.634120721370394E7
- ll2 57.16036177621662 -55.40158818702129
+ en 6596768.037247865 1.6341207213703943E7
+ ll2 57.16036177621665 -55.40158818702128
EPSG:22197
ll -20.4463723475219 -55.72790424375649
- en 7319713.33167955 7739451.630327829
- ll2 -20.446372350218237 -55.72790424203664
+ en 7319713.33167955 7739451.630327831
+ ll2 -20.446372350218226 -55.727904242036615
EPSG:2220
ll -27.524702906004684 -71.80830190956024
- en -371801.8623167658 -3075680.502100811
- ll2 -27.52470289379135 -71.8083019122453
+ en -371801.86231676594 -3075680.5021008104
+ ll2 -27.524702893791346 -71.8083019122453
EPSG:2222
ll -32.38657311701003 -118.71981707951602
- en -1944372.1972757007 -2.312127113315948E7
+ en -1944372.1972757012 -2.312127113315948E7
ll2 -32.38657310256282 -118.7198170739388
EPSG:2223
ll 23.673603244559516 -102.63117170191403
@@ -1242,16 +1242,16 @@ EPSG:2223
ll2 23.673603230688606 -102.63117170391286
EPSG:22234
ll 26.897689184488883 29.25753738775162
- en 1321723.9702715813 1.3002242674707737E7
- ll2 26.897689015027606 29.25753738336327
+ en 1321723.9702715816 1.3002242674707735E7
+ ll2 26.89768901502759 29.25753738336327
EPSG:22235
ll -49.08204506044316 23.655019106816475
- en 255795.0016041286 4558320.107971904
- ll2 -49.082045061239604 23.6550191090279
+ en 255795.00160412854 4558320.107971904
+ ll2 -49.08204506123961 23.6550191090279
EPSG:2224
ll -44.205766631140634 -112.6262506123959
en 994664.5667239163 -2.7321913582169592E7
- ll2 -44.20576663114044 -112.6262506123957
+ ll2 -44.20576663114045 -112.6262506123957
EPSG:2225
ll 23.625559660028017 -57.4132946420757
en 2.712606129438945E7 3778469.5854625786
@@ -1262,7 +1262,7 @@ EPSG:2226
ll2 46.18419905860568 -107.78368356458361
EPSG:2227
ll 0.39233219532160035 -85.5336359595176
- en 2.173604014598538E7 -9552719.077591462
+ en 2.1736040145985384E7 -9552719.077591458
ll2 0.39233219532162705 -85.5336359595176
EPSG:22275
ll 41.420779071816895 5.48165011759947
@@ -1270,8 +1270,8 @@ EPSG:22275
ll2 41.420778797044846 5.481650207932152
EPSG:22277
ll 14.03423055565706 11.846240578323169
- en -557291.2622830254 1558495.143576067
- ll2 14.034230479628242 11.846240564476117
+ en -557291.2622830251 1558495.1435760672
+ ll2 14.03423047962824 11.846240564476123
EPSG:22279
ll 89.73718260745679 24.389009755718234
en 2814.5509610210365 9972480.93751769
@@ -1283,11 +1283,11 @@ EPSG:2228
EPSG:22281
ll 63.6845761446036 14.385511005119909
en -326782.054344657 7081610.336657213
- ll2 63.68457595225325 14.385510910667657
+ ll2 63.68457595225325 14.385510910667655
EPSG:22283
ll -14.35792420106587 15.66434861460777
en -793126.5832479732 -1600289.1065848742
- ll2 -14.357924196931089 15.66434862265247
+ ll2 -14.357924196931084 15.66434862265247
EPSG:22285
ll 19.219203371980242 20.098719245948967
en -515827.34253963275 2133463.1725911554
@@ -1295,43 +1295,43 @@ EPSG:22285
EPSG:22287
ll 20.714111476340804 22.049604432755807
en -516102.91328623664 2299574.6156137926
- ll2 20.714111355378034 22.049604418469144
+ ll2 20.71411135537803 22.049604418469148
EPSG:22289
ll 57.959571889423756 26.37405661359557
- en -155390.61835423988 6429824.953550128
- ll2 57.95957167106361 26.374056567856552
+ en -155390.61835424002 6429824.95355013
+ ll2 57.95957167106361 26.37405656785655
EPSG:2229
ll -21.008327731495015 -54.675807266669835
- en 3.83129608182614E7 -1.1259846196789324E7
- ll2 -21.008327731495 -54.67580726666982
+ en 3.831296081826141E7 -1.125984619678931E7
+ ll2 -21.00832773149501 -54.67580726666985
EPSG:22291
ll 15.822349333708473 39.66172821097081
- en 930958.7192241508 1769544.363801057
- ll2 15.822349230825402 39.66172819274487
+ en 930958.7192241508 1769544.3638010568
+ ll2 15.822349230825397 39.66172819274487
EPSG:22293
ll -7.469280137794215 38.45839551632448
- en 603406.442237649 -829403.2229962014
- ll2 -7.469280146468626 38.45839551373976
+ en 603406.442237649 -829403.2229962017
+ ll2 -7.46928014646863 38.45839551373976
EPSG:2230
ll 53.512984803001686 -141.77425749114798
- en 666672.6928963416 1.0313138336501665E7
- ll2 53.512984803001714 -141.77425749114798
+ en 666672.6928963431 1.031313833650166E7
+ ll2 53.512984803001686 -141.77425749114798
EPSG:2231
ll -8.661358886932234 -21.085206875146753
en 3.9415710550149344E7 151772.49955550287
- ll2 -8.661358886932199 -21.085206875146767
+ ll2 -8.661358886932197 -21.085206875146753
EPSG:2232
ll 0.6497343681842267 -152.08471408753286
- en -1.7006768789148822E7 -8292176.710630956
+ en -1.7006768789148856E7 -8292176.710630943
ll2 0.6497343681842688 -152.08471408753286
EPSG:2233
ll 57.75364530180653 -131.5590355525183
- en -2382651.11258933 9610281.690960724
+ en -2382651.112589337 9610281.690960724
ll2 57.75364530180651 -131.5590355525183
EPSG:22332
ll -67.70318692967427 2.382101140235285
- en 220226.9473471648 -7524653.074289669
- ll2 -67.70318676539631 2.382101202394205
+ en 220226.9473471649 -7524653.074289671
+ ll2 -67.70318676539632 2.382101202394201
EPSG:2234
ll 51.748469343156856 -110.79650962426274
en -7486841.189237773 6400409.461080862
@@ -1342,32 +1342,32 @@ EPSG:2235
ll2 -76.90573832391465 -75.31936248341945
EPSG:2236
ll 28.443291590032658 -89.63731221717923
- en -2125301.6601074496 1594216.6440448372
- ll2 28.44329157846401 -89.63731222008508
+ en -2125301.660107449 1594216.644044836
+ ll2 28.443291578464 -89.63731222008508
EPSG:2237
ll -37.60942250020157 -75.38430943582026
- en 2573613.6867483743 -2.2560965165680546E7
+ en 2573613.686748374 -2.2560965165680546E7
ll2 -37.609422495413206 -75.3843094354265
EPSG:2238
ll 66.21439189561556 -53.832405440819045
- en 7754428.8008604245 1.5464640777273584E7
+ en 7754428.800860426 1.5464640777273575E7
ll2 66.21439189561556 -53.83240544081904
EPSG:2239
ll -13.667136022185545 -79.4839715986578
- en 1608593.8890996813 -1.5855464412777321E7
+ en 1608593.8890996815 -1.5855464412777321E7
ll2 -13.667136022182337 -79.48397159868355
EPSG:22391
ll 57.3166038987268 -23.98571849818009
- en -1665156.5511903707 3110161.8684997573
- ll2 57.3166038825782 -23.985718472764976
+ en -1665156.5511903702 3110161.868499758
+ ll2 57.3166038825782 -23.985718472764972
EPSG:22392
ll 28.16280731715336 82.19775002521317
- en 7069493.091693307 2100952.0018266747
- ll2 28.162807285949253 82.1977499369369
+ en 7069493.091693305 2100952.001826676
+ ll2 28.162807285949278 82.19774993693686
EPSG:2240
ll -15.060011555006838 -81.26317209090911
- en 3321089.7555110063 -1.6362505824449917E7
- ll2 -15.060011555001143 -81.26317209093915
+ en 3321089.7555110063 -1.6362505824449914E7
+ ll2 -15.06001155500113 -81.26317209093915
EPSG:2241
ll 33.80922182170829 -111.55111285018134
en 843148.0658183321 -2860548.993116849
@@ -1387,11 +1387,11 @@ EPSG:2246
EPSG:2247
ll 37.31613825015898 -81.17617390645263
en 2969980.017928859 2030433.6743596187
- ll2 37.316138250159085 -81.17617390645263
+ ll2 37.31613825015909 -81.17617390645263
EPSG:2248
ll 23.8500437404617 -32.215070174706085
- en 1.6160351798104698E7 -1368726.7439618006
- ll2 23.850043740461714 -32.215070174706085
+ en 1.6160351798104696E7 -1368726.7439618006
+ ll2 23.850043740461714 -32.2150701747061
EPSG:2249
ll 52.12801218575889 -28.729910682785444
en 1.0015754243471086E7 8934987.858242678
@@ -1399,67 +1399,67 @@ EPSG:2249
EPSG:2250
ll -7.520136934677025 -134.59622270894664
en -2.782910023325489E7 -8379282.062199511
- ll2 -7.52013693467699 -134.59622270894664
+ ll2 -7.520136934676989 -134.59622270894664
EPSG:2251
ll 19.050081330787222 -49.763093254544515
- en 3.996298465978067E7 -6431261.656662712
- ll2 19.050081330787254 -49.763093254544515
+ en 3.996298465978066E7 -6431261.6566627165
+ ll2 19.050081330787254 -49.76309325454452
EPSG:2252
ll -1.2683269065310459 -141.1528540826788
en -5817528.218010531 -8676687.5322597
ll2 -1.2683269065309892 -141.1528540826788
EPSG:22521
ll -19.453398270581744 -60.22310650648848
- en 161638.1762758494 7845835.411787924
+ en 161638.17627584946 7845835.411787924
ll2 -19.453398270236804 -60.2231065053723
EPSG:22522
ll -77.57392983978998 -60.73706014251224
- en 267177.6900185294 1369771.8545654677
- ll2 -77.57392980326998 -60.73705932531865
+ en 267177.6900185289 1369771.8545654695
+ ll2 -77.57392980326998 -60.73705932531867
EPSG:22523
ll -40.53557488874597 -51.70350379248387
- en -67890.44591711147 5491158.453245356
- ll2 -40.53557488053469 -51.703503788621646
+ en -67890.44591711229 5491158.453245356
+ ll2 -40.53557488053469 -51.70350378862166
EPSG:22524
ll -78.94220473597757 -48.889801936091644
- en 289211.758831236 1218544.9541630335
- ll2 -78.94220469813663 -48.889801025844555
+ en 289211.7588312355 1218544.9541630354
+ ll2 -78.9422046981366 -48.88980102584456
EPSG:22525
ll -6.245941274073189 -24.966263183803818
en 1391527.0496708024 9302779.86734866
- ll2 -6.245941271716049 -24.966263216893253
+ ll2 -6.24594127171605 -24.96626321689325
EPSG:2253
ll 6.685751910657597 -136.10274213065983
- en -7957603.154274787 -6807274.902600907
- ll2 6.685751910657634 -136.10274213065983
+ en -7957603.15427478 -6807274.902600911
+ ll2 6.685751910657634 -136.1027421306598
EPSG:2254
ll -64.58842219211553 -86.23195902515462
en 1392953.046525869 -3.422622825889236E7
ll2 -64.58842219209546 -86.23195902515772
EPSG:2255
ll 15.083091153729498 -90.81910768799001
- en 2125248.462013746 -5237418.30117326
- ll2 15.0830911537295 -90.81910768799001
+ en 2125248.462013746 -5237418.301173262
+ ll2 15.083091153729498 -90.81910768799001
EPSG:2256
ll -7.594052743028356 -84.25069937921661
- en 1.5393579089778855E7 -1.965814878754853E7
- ll2 -7.5940527430283 -84.25069937921661
+ en 1.5393579089778872E7 -1.9658148787548542E7
+ ll2 -7.594052743028326 -84.25069937921661
EPSG:2257
ll 56.14349766463167 -110.80268905271095
- en -776844.0033961735 9226298.821651867
- ll2 56.14349765802608 -110.80268904169289
+ en -776844.0033961735 9226298.821651869
+ ll2 56.143497658026085 -110.80268904169289
EPSG:2258
ll 86.06767573077803 -98.44857062605789
en 1835847.5782140947 2.0128635566715676E7
ll2 86.06767573091153 -98.4485707319522
EPSG:2259
ll -50.95569833092357 -114.12118593612065
- en 1274301.118165811 -2.9843209230209958E7
+ en 1274301.1181658108 -2.9843209230209958E7
ll2 -50.95569832514565 -114.12118593007355
EPSG:2260
ll 43.07254804892369 -81.67756030742518
- en -1425915.665027556 1626658.4177938325
- ll2 43.07254803860425 -81.67756029794694
+ en -1425915.665027556 1626658.4177938302
+ ll2 43.07254803860426 -81.67756029794694
EPSG:2261
ll 85.32219838547309 -79.11879016002165
en 744467.5139608241 1.6568732278640214E7
@@ -1470,40 +1470,40 @@ EPSG:2262
ll2 -31.9134296057095 -71.8012798446085
EPSG:2263
ll 21.762721262934313 -92.4105892906049
- en -5546006.732715151 -6128650.337981834
- ll2 21.762721262934335 -92.4105892906049
+ en -5546006.732715153 -6128650.337981843
+ ll2 21.76272126293431 -92.4105892906049
EPSG:2264
ll 82.79870916949199 -5.179484458892773
- en 7953877.847262813 2.3709758478736684E7
- ll2 82.79870916949199 -5.1794844588927305
+ en 7953877.84726281 2.370975847873668E7
+ ll2 82.79870916949199 -5.179484458892787
EPSG:2265
ll 87.09091999869183 -61.94158688149484
- en 3169444.0196840675 1.70207277522125E7
- ll2 87.09091999869183 -61.94158688149483
+ en 3169444.019684075 1.7020727752212532E7
+ ll2 87.09091999869183 -61.94158688149485
EPSG:2266
ll -11.619188916046319 -29.982903031884007
en 3.690010235943341E7 -7765246.403433562
ll2 -11.619188916046296 -29.982903031883993
EPSG:2267
ll 69.94486721931695 -155.8461539942613
- en -6673614.651775032 1.633590168282352E7
- ll2 69.94486721931693 -155.8461539942613
+ en -6673614.651774974 1.6335901682823498E7
+ ll2 69.94486721931693 -155.84615399426127
EPSG:2268
ll 66.26452918668858 -101.91494979553471
en 1267127.238903356 1.2762599497392844E7
ll2 66.26452918668858 -101.91494979553471
EPSG:2269
ll 56.15992712282713 -64.29160953201678
- en 1.8969017795136705E7 8488918.292465767
- ll2 56.15992712282718 -64.29160953201678
+ en 1.8969017795136705E7 8488918.292465772
+ ll2 56.159927122827156 -64.29160953201676
EPSG:2270
ll 14.510014089599682 -97.41915359904621
en 1.3949217343196735E7 -9035814.328258816
ll2 14.510014089599704 -97.41915359904621
EPSG:22700
ll 84.85314364565485 -19.284056148251967
- en -919406.8306109917 7598643.349757434
- ll2 84.85314364824019 -19.284056159490632
+ en -919406.8306109912 7598643.349757434
+ ll2 84.85314364824019 -19.28405615949062
EPSG:2271
ll 0.714547320442751 -122.62870931494294
en -1.7725856618398774E7 -1.033280931108584E7
@@ -1514,8 +1514,8 @@ EPSG:2272
ll2 31.727384702322933 -77.80084948029699
EPSG:2273
ll -23.79843587422504 -18.772109086737373
- en 3.380301388295926E7 -1.4168274159268783E7
- ll2 -23.79843587422501 -18.77210908673736
+ en 3.380301388295928E7 -1.4168274159268774E7
+ ll2 -23.798435874225024 -18.772109086737373
EPSG:2274
ll 11.29525090915942 -81.28015582052532
en 3809578.3985591875 -8590110.222052468
@@ -1523,27 +1523,27 @@ EPSG:2274
EPSG:2275
ll 73.74076291337406 -69.02224607535723
en 5177887.4590716 1.9987367632256497E7
- ll2 73.74076291337406 -69.02224607535723
+ ll2 73.74076291337407 -69.02224607535723
EPSG:2276
ll 5.528252377857292 -133.3711421818349
en -1.1900396445565725E7 -983301.2003465457
- ll2 5.5282523778573225 -133.3711421818349
+ ll2 5.528252377857322 -133.3711421818349
EPSG:2277
ll -17.728395077217765 -128.8472422534969
- en -1.1595485988379527E7 -7825976.426477971
+ en -1.1595485988379527E7 -7825976.426477976
ll2 -17.72839507721774 -128.8472422534969
EPSG:22770
ll 88.33178839099645 25.89350541015238
- en 162851.1640392544 8337027.438099084
- ll2 88.33178839170985 25.893505424596178
+ en 162851.16403925442 8337027.438099084
+ ll2 88.33178839170985 25.89350542459618
EPSG:2278
ll -20.123440340862203 -114.28592116796294
en -5538361.036798961 -6176736.0538396705
- ll2 -20.12344034086218 -114.28592116796294
+ ll2 -20.123440340862178 -114.28592116796294
EPSG:22780
ll -15.408325446621546 58.84992478389369
en 2585725.2453020783 -5774744.557550252
- ll2 -15.408325411685734 58.84992479947495
+ ll2 -15.408325411685732 58.84992479947495
EPSG:2279
ll 22.320648478929378 -80.77995413064328
en 6973263.949061707 1.5607755695212543E7
@@ -1562,28 +1562,28 @@ EPSG:2282
ll2 5.221507931699994 -149.0973508806513
EPSG:2283
ll 7.292590229151756 -14.13719527568449
- en 3.609945460919948E7 3976731.908755049
- ll2 7.2925902291517675 -14.137195275684505
+ en 3.609945460919948E7 3976731.9087550445
+ ll2 7.292590229151768 -14.137195275684505
EPSG:2284
ll -9.15493726485668 -46.841595797734556
- en 2.669326068730991E7 -1.2551672217748148E7
- ll2 -9.154937264856654 -46.841595797734556
+ en 2.669326068730985E7 -1.2551672217748133E7
+ ll2 -9.154937264856642 -46.84159579773455
EPSG:2285
ll 86.66402887476126 -108.11533530494037
en 2095394.2471747291 1.6477310809813036E7
- ll2 86.66402887476133 -108.11533530494037
+ ll2 86.66402887476131 -108.11533530494037
EPSG:2286
ll -6.7796307806267535 -42.635499786647614
- en 3.671338594437072E7 -2872602.115592463
- ll2 -6.779630780626739 -42.635499786647586
+ en 3.671338594437069E7 -2872602.1155925076
+ ll2 -6.779630780626726 -42.635499786647614
EPSG:2287
ll 88.48952798535637 -63.20978614529072
- en 2534864.2779807732 1.8873610960365746E7
- ll2 88.48952798535629 -63.209786145290735
+ en 2534864.2779807677 1.8873610960365687E7
+ ll2 88.4895279853563 -63.209786145290735
EPSG:2288
ll 0.10286579759478265 -22.492922575868477
- en 3.0738685898113575E7 -4811578.491543421
- ll2 0.10286579759480842 -22.492922575868462
+ en 3.073868589811356E7 -4811578.491543435
+ ll2 0.10286579759480842 -22.492922575868477
EPSG:2289
ll 14.021491428416766 -126.14343485560835
en -1.2013335716211857E7 -7540482.112232506
@@ -1591,11 +1591,11 @@ EPSG:2289
EPSG:2290
ll 15.943687632905053 3.9781447873233446
en 8446507.70401607 -368044.91569497343
- ll2 15.943687632905062 3.9781447873233304
+ ll2 15.943687632905064 3.9781447873233304
EPSG:2294
ll 54.52935711510406 -61.713463879572416
en 4486181.530819821 6044253.2953086095
- ll2 54.52935711510407 -61.71346387957241
+ ll2 54.52935711510406 -61.71346387957241
EPSG:2295
ll 74.07052906444247 -68.23366833823962
en 5385654.275738144 8225955.013267175
@@ -1607,95 +1607,95 @@ EPSG:22991
EPSG:22992
ll 85.51115854242002 29.80924568502739
en 604430.3872684323 6990600.8161021825
- ll2 85.51115853854135 29.8092455467458
+ ll2 85.51115853854137 29.8092455467458
EPSG:22993
ll -57.952880485707304 17.932248518833
- en 163918.945570164 -9582248.768451735
- ll2 -57.95288043875419 17.93224877050294
+ en 163918.94557016378 -9582248.768451737
+ ll2 -57.952880438754235 17.932248770502934
EPSG:22994
ll -54.03968952448869 22.722407659690965
en 419682.62704006786 -8118953.443510242
- ll2 -54.039689520826315 22.722407649014013
+ ll2 -54.03968952082633 22.722407649014016
EPSG:23028
ll -36.77276487575185 -19.82507647570351
- en 69364.97065108275 -4080559.188550436
- ll2 -36.77276486131899 -19.825076422533037
+ en 69364.9706510824 -4080559.188550436
+ ll2 -36.772764861319 -19.825076422533034
EPSG:23029
ll -34.78856248829353 -2.3310070526161475
- en 1110733.949678464 -3869932.1099200775
- ll2 -34.78856246485725 -2.3310070120542843
+ en 1110733.949678464 -3869932.1099200766
+ ll2 -34.78856246485723 -2.331007012054285
EPSG:23030
ll 45.07173253587433 -7.508541529976422
en 145201.23198942625 5001027.30461471
- ll2 45.07173254710798 -7.508541515465938
+ ll2 45.07173254710797 -7.508541515465937
EPSG:23031
ll -18.012297032234684 5.909399445752248
en 808185.6721176627 -1993900.704733758
ll2 -18.0122970077821 5.909399470345997
EPSG:23032
ll -71.35663032823946 14.337975879392436
- en 690327.0560337785 -7925711.6731009325
- ll2 -71.35663029744137 14.337975956442909
+ en 690327.0560337784 -7925711.6731009325
+ ll2 -71.35663029744138 14.337975956442905
EPSG:23033
ll 70.1559139070934 13.840697315272458
- en 456152.99140367925 7783882.490379688
- ll2 70.15591390704067 13.840697321325575
+ en 456152.99140367896 7783882.490379688
+ ll2 70.15591390704067 13.840697321325571
EPSG:23034
ll 83.20594352166003 23.955852082894594
en 539083.3264723511 9240651.160743225
- ll2 83.20594351857848 23.955852099971366
+ ll2 83.2059435185785 23.95585209997137
EPSG:23035
ll 44.88202033829393 19.9033154834442
en -60434.06181914196 4994585.045535109
- ll2 44.882020333120686 19.903315499067475
+ ll2 44.882020333120686 19.90331549906747
EPSG:23036
ll 86.8710692665218 29.64120659821952
en 479577.5416943046 9649418.642731473
ll2 86.87106926167138 29.641206633175493
EPSG:23037
ll 65.09598106857533 36.8751096293454
- en 400192.9352891968 7221015.203782797
- ll2 65.09598106864543 36.87510963039617
+ en 400192.93528919684 7221015.203782798
+ ll2 65.09598106864544 36.87510963039617
EPSG:23038
ll 43.52290644927007 50.649635497148445
- en 956616.5953380017 4834590.614956143
- ll2 43.522906450380525 50.64963549653382
+ en 956616.5953380011 4834590.614956143
+ ll2 43.522906450380525 50.649635496533804
EPSG:2308
ll 47.247113443788805 110.06122870885802
- en 580169.968351386 1.5233169275765996E7
- ll2 47.24711327933997 110.06122876337089
+ en 580169.9683513892 1.5233169275765996E7
+ ll2 47.24711327933997 110.06122876337093
EPSG:2309
ll -49.457078090192915 106.22312337662474
- en -207994.20184390887 4475620.304395002
+ en -207994.201843909 4475620.304395002
ll2 -49.457078020568176 106.22312373820446
EPSG:23090
ll 74.56922855420919 6.001487291652786
en 678062.292565749 8284766.09113387
- ll2 74.56922855279358 6.001487293724816
+ ll2 74.56922855279358 6.001487293724818
EPSG:23095
ll 3.9075646767169587 13.15185751883088
- en 1408174.718137479 436467.6006213894
+ en 1408174.718137479 436467.6006213893
ll2 3.907564699273907 13.151857492195925
EPSG:2310
ll 45.938238076182586 141.05523162711617
en 1201844.8285024501 1.5127203913534332E7
- ll2 45.93823803355146 141.0552314881032
+ ll2 45.93823803355145 141.0552314881032
EPSG:2311
ll 79.90750853782885 5.8344440986379755
en 496761.21039730776 8871266.99159487
ll2 79.90750853782886 5.8344440986379755
EPSG:2312
ll -61.10686907261553 11.586960523978325
- en 316070.4526858834 -6779200.641300443
- ll2 -61.10686907248889 11.586960524012715
+ en 316070.4526858834 -6779200.6413004445
+ ll2 -61.1068690724889 11.586960524012714
EPSG:2313
ll -53.96207421733703 23.975808055820064
en 1088177.7637519222 -6016377.833098785
- ll2 -53.96207417199988 23.97580785140248
+ ll2 -53.96207417199989 23.97580785140248
EPSG:2314
ll 87.36558574017153 -60.530745646272344
- en 297048.2318615784 2.8275250029939026E7
- ll2 87.3655856161975 -60.5307464998997
+ en 297048.2318615783 2.827525002993902E7
+ ll2 87.3655856161975 -60.53074649989971
EPSG:2315
ll 22.50455506286906 -77.5357477446401
en -380158.59356544644 1.251384460075739E7
@@ -1706,64 +1706,64 @@ EPSG:2316
ll2 -12.465056902170055 -71.13716133201024
EPSG:2317
ll -2.324373884095273 -140.8609613953165
- en -7376731.916337178 651062.3137840985
- ll2 -2.324373687369843 -140.8609612257376
+ en -7376731.916337175 651062.3137840871
+ ll2 -2.324373687369957 -140.8609612257376
EPSG:2318
ll 72.05625067882613 1.9608423096745042
- en -2502026.5937269977 6441192.576379808
- ll2 72.05625066224367 1.9608424444934367
+ en -2502026.593726999 6441192.576379815
+ ll2 72.0562506622437 1.960842444493436
EPSG:2319
ll -36.474530045819435 31.251856579344242
- en 881215.9087502442 -4046597.201108042
- ll2 -36.474530022746634 31.251856592496846
+ en 881215.908750244 -4046597.201108042
+ ll2 -36.47453002274665 31.251856592496843
EPSG:2320
ll 58.40445149361702 34.60693221195932
en 769253.6334096878 6485744.739061837
ll2 58.40445149355663 34.60693221269527
EPSG:2321
ll 6.035454283304418 39.05589926187791
- en 1171706.5062681579 671267.6430046998
- ll2 6.035454302478213 39.05589925987869
+ en 1171706.5062681579 671267.6430047001
+ ll2 6.0354543024782155 39.05589925987869
EPSG:2322
ll 12.205107455014002 26.81424559759214
- en -503524.2961437383 1367035.780715129
- ll2 12.205107463859253 26.814245658408684
+ en -503524.29614373855 1367035.7807151293
+ ll2 12.205107463859255 26.81424565840869
EPSG:2323
ll -0.33112450793547055 40.45816117904329
en 662361.2348165733 -36505.460821274326
- ll2 -0.3311244869319617 40.458161182150704
+ ll2 -0.3311244869319618 40.458161182150704
EPSG:23239
ll -34.54779105189961 45.37770458615393
- en -16388.36602491571 -3837396.844189363
- ll2 -34.54779087356207 45.37770471331568
+ en -16388.366024915827 -3837396.844189363
+ ll2 -34.547790873562086 45.37770471331569
EPSG:2324
ll -41.73371190114088 38.82300924924518
- en 235680.30751350214 -4626936.323179203
- ll2 -41.733711877491864 38.82300925718209
+ en 235680.3075135022 -4626936.323179204
+ ll2 -41.73371187749187 38.82300925718209
EPSG:23240
ll 76.91582814377438 58.80276287681522
en 545273.5657491194 8537795.117394673
ll2 76.91582814729937 58.8027629363072
EPSG:2325
ll 47.29943582630469 36.43398452154631
- en -147644.0708421889 5276422.9411008535
- ll2 47.29943579646288 36.43398461320123
+ en -147644.07084218878 5276422.9411008535
+ ll2 47.29943579646287 36.43398461320123
EPSG:2326
ll -34.34253965979709 115.18396232323983
- en 929011.7207429266 -5451320.523261347
- ll2 -34.34253962952835 115.1839622533158
+ en 929011.7207429266 -5451320.523261349
+ ll2 -34.34253962952836 115.18396225331577
EPSG:2327
ll -50.40377474474187 70.36683462490393
en 1.3170679210282058E7 -5596032.910525473
ll2 -50.403774743803396 70.3668346251086
EPSG:2328
ll -70.58811932821659 72.4694346329554
- en 1.4184356176923327E7 -7856810.252411287
- ll2 -70.58811931627173 72.4694348364107
+ en 1.4184356176923325E7 -7856810.252411287
+ ll2 -70.58811931627173 72.46943483641064
EPSG:2329
ll 61.46507625506726 95.94535655333416
- en 1.5975860274030278E7 6850053.173002226
- ll2 61.46507622024344 95.94535629592733
+ en 1.5975860274030278E7 6850053.173002224
+ ll2 61.465076220243425 95.94535629592733
EPSG:2330
ll -13.254874405779475 83.33011858764975
en 1.5447537590978803E7 -1486415.2336737693
@@ -1782,28 +1782,28 @@ EPSG:2333
ll2 74.08973564855972 115.47651792080816
EPSG:2334
ll -80.41703573526203 113.2540757941062
- en 2.0430400420802798E7 -8933955.08173214
- ll2 -80.41703573524616 113.25407579424086
+ en 2.0430400420802798E7 -8933955.081732143
+ ll2 -80.41703573524619 113.25407579424086
EPSG:2335
ll 64.31738764482714 128.49352684750033
en 2.176550024926618E7 7146722.537191692
- ll2 64.3173876430497 128.49352684417488
+ ll2 64.31738764304968 128.49352684417488
EPSG:2336
ll 49.16376290558796 122.98989279460605
en 2.2061789902881198E7 5465260.956427629
- ll2 49.163762901244525 122.9898927978267
+ ll2 49.16376290124453 122.9898927978267
EPSG:2337
ll -43.799442596196656 132.05952860457523
en 2.3263358376292773E7 -4855745.419776901
ll2 -43.79944259614393 132.05952860454474
EPSG:2338
ll 76.35147330223845 84.93388875500222
- en 760602.0833113224 8499814.387775024
- ll2 76.3514732960636 84.93388786998283
+ en 760602.0833113221 8499814.387775024
+ ll2 76.3514732960636 84.93388786998281
EPSG:2339
ll -42.852592408183206 74.99397212293893
- en 9025.68962700991 -4763881.444300546
- ll2 -42.85259240458269 74.99397212373955
+ en 9025.689627010026 -4763881.444300547
+ ll2 -42.8525924045827 74.99397212373955
EPSG:2340
ll -8.996716512759832 86.5473004218259
en 450221.105090392 -994918.334769293
@@ -1830,7 +1830,7 @@ EPSG:2345
ll2 -34.265522031795754 126.53736316101953
EPSG:2346
ll 52.019292211779515 125.21695258846383
- en 652181.3335049888 5767814.010678593
+ en 652181.3335049888 5767814.010678594
ll2 52.019292211768054 125.21695258846702
EPSG:2347
ll -17.238642918195723 119.23596215697584
@@ -1846,7 +1846,7 @@ EPSG:2349
ll2 38.81708292044782 71.6369395666784
EPSG:2350
ll 82.7524974776752 76.65626033133982
- en 2.648106827238705E7 9192731.37983394
+ en 2.648106827238705E7 9192731.379833942
ll2 82.75249747767519 76.65626033133978
EPSG:2351
ll -2.3583998933273875 86.2871471699999
@@ -1859,15 +1859,15 @@ EPSG:2352
EPSG:2353
ll -3.3497720470412133 83.79336759077097
en 2.9143458812189337E7 -370986.4657043351
- ll2 -3.3497720470382957 83.79336759091603
+ ll2 -3.349772047038296 83.79336759091605
EPSG:2354
ll -30.91713141435808 88.13722230845346
en 3.032192812961983E7 -3423275.999659334
- ll2 -30.917131414356632 88.13722230845003
+ ll2 -30.91713141435663 88.13722230845003
EPSG:2355
ll 82.52372107249462 96.742303792351
en 3.1554347001004383E7 9168722.83520419
- ll2 82.52372107248699 96.74230379221545
+ ll2 82.52372107248698 96.74230379221545
EPSG:2356
ll 9.886153259198906 93.56655713809691
en 3.2233030351845615E7 1094236.858498699
@@ -1875,7 +1875,7 @@ EPSG:2356
EPSG:2357
ll 28.35857385464081 99.62208208906421
en 3.356098610290935E7 3138338.4671586403
- ll2 28.35857385464081 99.62208208906421
+ ll2 28.358573854640806 99.62208208906421
EPSG:2358
ll 59.81614065331584 108.33659217569281
en 3.4855182931653745E7 6650595.833627799
@@ -1891,30 +1891,30 @@ EPSG:2360
EPSG:2361
ll 44.631051396907736 113.69782766805459
en 3.7714077105445765E7 4947488.232354276
- ll2 44.631051396875286 113.6978276680731
+ ll2 44.63105139687528 113.6978276680731
EPSG:2362
ll -30.308120782212242 119.65155463360531
- en 3.904404088074706E7 -3367839.978920677
- ll2 -30.30812078112205 119.65155463524528
+ en 3.904404088074706E7 -3367839.9789206767
+ ll2 -30.308120781122042 119.65155463524528
EPSG:2363
ll -11.252340979555271 116.07520322376351
en 3.9399014033065036E7 -1244538.497496088
- ll2 -11.252340979555264 116.0752032237637
+ ll2 -11.252340979555266 116.0752032237637
EPSG:2364
ll -60.82712764220339 129.96716502551604
en 4.104078263093885E7 -6787458.182040984
ll2 -60.827127578769286 129.96716434709185
EPSG:2365
ll -64.62349927673337 119.2580480473466
- en 4.132107112613998E7 -7174648.158369269
- ll2 -64.62349927655684 119.25804804744818
+ en 4.132107112613998E7 -7174648.158369267
+ ll2 -64.62349927655683 119.25804804744818
EPSG:2366
ll 60.14976230502796 132.55869209228098
en 4.2863917446229406E7 6688856.653327488
- ll2 60.149762298692394 132.55869207759793
+ ll2 60.14976229869239 132.55869207759793
EPSG:2367
ll -33.323877725437214 126.90208057240629
- en 4.330464460121206E7 -3690635.552739776
+ en 4.330464460121206E7 -3690635.552739777
ll2 -33.32387772543357 126.9020805723992
EPSG:2368
ll -74.20949093167074 141.6919120964808
@@ -1930,16 +1930,16 @@ EPSG:2370
ll2 -13.506374392841892 81.73784485214215
EPSG:23700
ll 46.46561041539386 21.520339346245464
- en 839912.6237409572 127576.65601458694
- ll2 46.46561041643151 21.520339350984703
+ en 839912.6237409575 127576.65601458694
+ ll2 46.46561041643152 21.520339350984713
EPSG:2371
ll -61.633035743291245 72.57322974610227
- en 212468.75762403617 -6848033.405869394
- ll2 -61.63303574135605 72.57322974884825
+ en 212468.75762403623 -6848033.4058693955
+ ll2 -61.63303574135606 72.57322974884825
EPSG:2372
ll -61.72742793553628 75.64240576694468
en 216994.38329657365 -6858223.232216023
- ll2 -61.72742793375149 75.64240576939531
+ ll2 -61.727427933751486 75.64240576939531
EPSG:2373
ll 8.399368192405845 86.70491275606497
en 798007.9152343194 929849.1225883475
@@ -1966,7 +1966,7 @@ EPSG:2378
ll2 -69.23157639454395 105.37024744049249
EPSG:2379
ll -56.418793722302446 94.27380345276858
- en 23730.57014566689 -6282014.94614493
+ en 23730.57014566689 -6282014.946144931
ll2 -56.41879370385883 94.27380350994801
EPSG:2380
ll -4.4435278564484975 96.53953082074065
@@ -1978,132 +1978,132 @@ EPSG:2381
ll2 -3.1167778308248297 116.224586853065
EPSG:2382
ll -60.76568320048395 115.58519501517556
- en 749779.2354406907 -6748115.842478687
- ll2 -60.765683199744416 115.5851950146107
+ en 749779.2354406905 -6748115.842478687
+ ll2 -60.76568319974441 115.58519501461069
EPSG:2383
ll 10.701738314526239 105.68934263684011
- en -412154.7885034906 1195823.7221727646
+ en -412154.78850349074 1195823.7221727646
ll2 10.701738309878552 105.68934266696033
EPSG:23830
ll -60.965863141757 88.11293764769741
- en -145544.3129375574 -5277878.7341410285
- ll2 -60.965863136526615 88.112937659544
+ en -145544.31293755682 -5277878.734141028
+ ll2 -60.96586313652661 88.11293765954402
EPSG:23831
ll -74.1305008932288 92.36598521685463
- en 43428.41919132962 -6735818.971444969
- ll2 -74.13050089282139 92.3659852190203
+ en 43428.419191329216 -6735818.971444969
+ ll2 -74.13050089282139 92.36598521902027
EPSG:23832
ll -84.98190912174354 103.94752010004802
- en 233657.6960937777 -7941554.534665605
- ll2 -84.98190912174258 103.94752009998248
+ en 233657.69609377757 -7941554.534665605
+ ll2 -84.98190912174262 103.94752009998247
EPSG:23833
ll 8.203999848624619 104.53880434491424
- en 314458.162390752 2407270.7011395693
- ll2 8.203999848624756 104.5388043449139
+ en 314458.1623907535 2407270.701139569
+ ll2 8.203999848624752 104.5388043449139
EPSG:23834
ll 74.0695939771586 97.7395332246742
- en -67582.2435746381 9741984.312217943
- ll2 74.06959396944585 97.73953349792266
+ en -67582.24357463815 9741984.31221794
+ ll2 74.0695939694458 97.7395334979227
EPSG:23835
ll -89.45178829317967 107.66970628667012
- en 198044.52539056476 -8439770.962351603
- ll2 -89.45178829317206 107.66970628667033
+ en 198044.5253905648 -8439770.962351605
+ ll2 -89.4517882931721 107.6697062866703
EPSG:23836
ll 49.59305030694364 108.25123097417791
- en -107106.65664204443 7003712.3480205685
- ll2 49.59305030638919 108.25123097420924
+ en -107106.65664204449 7003712.3480205685
+ ll2 49.59305030638919 108.25123097420925
EPSG:23837
ll 27.202264175298012 110.41150563676077
- en -304489.3308474972 4519999.551047774
- ll2 27.202264174851713 110.41150563590386
+ en -304489.33084749716 4519999.551047776
+ ll2 27.20226417485173 110.41150563590386
EPSG:23838
ll -25.997214588932806 125.49195775108848
- en 901043.3510391942 -1395049.6655132617
- ll2 -25.99721458611861 125.49195775515923
+ en 901043.3510391939 -1395049.6655132622
+ ll2 -25.997214586118616 125.49195775515923
EPSG:23839
ll 73.46145171829585 121.28605543351753
- en 193200.2146669214 9654415.969132787
- ll2 73.46145171829683 121.28605543351755
+ en 193200.21466692095 9654415.969132785
+ ll2 73.4614517182968 121.28605543351753
EPSG:2384
ll 60.00758717915562 110.67449361347896
- en 147476.77293631254 6671800.653451488
- ll2 60.007587174002545 110.6744936239832
+ en 147476.77293631266 6671800.653451489
+ ll2 60.00758717400256 110.6744936239832
EPSG:23840
ll -60.28561651481987 127.38330687490905
en 359449.5234782468 -5188711.665091424
- ll2 -60.28561651477338 127.38330687490405
+ ll2 -60.28561651477338 127.38330687490406
EPSG:23841
ll -13.751816634582838 124.88939761960387
- en -82392.86622608308 -22265.11000575847
- ll2 -13.751816634580116 124.88939761962597
+ en -82392.86622608308 -22265.110005758703
+ ll2 -13.751816634580114 124.889397619626
EPSG:23842
ll 36.91825125832975 139.17564964012755
- en 973806.2227909695 5622375.401167308
- ll2 36.91825123681648 139.1756496104112
+ en 973806.2227909719 5622375.401167309
+ ll2 36.918251236816495 139.17564961041123
EPSG:23843
ll -76.97938369027464 127.94523980566629
- en 60449.9285387313 -7053633.29058397
- ll2 -76.97938368989607 127.94523981022931
+ en 60449.9285387306 -7053633.29058397
+ ll2 -76.97938368989608 127.9452398102293
EPSG:23844
ll -71.74348756168993 144.9051784092153
- en 493127.14825877134 -6483172.3590348065
- ll2 -71.74348755229038 144.90517822801388
+ en 493127.1482587708 -6483172.359034811
+ ll2 -71.74348755229043 144.9051782280139
EPSG:23845
ll -45.38064732663123 138.49837076678378
- en 121557.26169830006 -3527233.151021309
- ll2 -45.38064732663123 138.49837076678367
+ en 121557.26169830226 -3527233.1510213083
+ ll2 -45.38064732663121 138.4983707667837
EPSG:23846
ll -9.602423912823724 83.98980814981387
- en -492575.2993247685 -1074561.3889627217
+ en -492575.29932477 -1074561.3889627217
ll2 -9.602423905177545 83.98980820981387
EPSG:23847
ll -23.74024760152635 93.3966668066252
- en -71706.11518699 -2636756.9206967033
- ll2 -23.740247600908106 93.39666680524867
+ en -71706.11518699129 -2636756.920696704
+ ll2 -23.740247600908106 93.39666680524866
EPSG:23848
ll -72.9886457479094 97.50744275525791
en 255882.37710559837 -8114522.693136559
- ll2 -72.98864574348917 97.50744281864111
+ ll2 -72.98864574348917 97.5074428186411
EPSG:23849
ll 45.59023817877892 104.5874747574324
- en -196.85762506100582 5068568.526775028
- ll2 45.59023817266432 104.5874747603139
+ en -196.85762506199535 5068568.526775027
+ ll2 45.59023817266429 104.58747476031388
EPSG:2385
ll -52.936177882602124 116.05567913508803
- en 234856.04468325322 -5874808.191635884
+ en 234856.04468325328 -5874808.191635885
ll2 -52.936177882241026 116.05567913513342
EPSG:23850
ll -68.5196979887265 120.99075461050263
- en 662959.6199577418 -7606119.171578236
- ll2 -68.51969798858711 120.9907546084093
+ en 662959.619957743 -7606119.171578238
+ ll2 -68.51969798858714 120.99075460840936
EPSG:23851
ll -39.1020051559976 119.14781826889705
- en 166831.2049094978 -4335185.308520384
- ll2 -39.10200515588532 119.14781826778764
+ en 166831.20490950037 -4335185.308520385
+ ll2 -39.102005155885344 119.14781826778766
EPSG:23852
ll 6.071383023072229 136.41420447559366
- en 1322656.5504555553 676746.9557714462
- ll2 6.071383021539351 136.41420445487014
+ en 1322656.550455552 676746.9557714461
+ ll2 6.07138302153935 136.41420445487012
EPSG:2386
ll -81.77696205887067 117.79422772504891
en 416951.9164701832 -9087306.309480177
- ll2 -81.77696205880295 117.79422772770135
+ ll2 -81.77696205880297 117.79422772770135
EPSG:23866
ll -9.996802557510264 94.38792637019583
- en 652126.0589187065 -1105378.870327627
+ en 652126.058918705 -1105378.870327627
ll2 -9.996802557510224 94.38792637019449
EPSG:23867
ll -6.128509517765622 99.03138353930579
en 503472.3766921898 -677410.4239096983
- ll2 -6.1285095177656395 99.03138353930579
+ ll2 -6.12850951776564 99.03138353930579
EPSG:23868
ll 65.27914756782414 109.72198481467956
en 720184.3547698082 7247813.572290475
- ll2 65.27914756714912 109.72198481381393
+ ll2 65.27914756714911 109.72198481381395
EPSG:23869
ll -0.4521043343266058 102.89920867442146
- en -404425.71655915 -50478.20015504982
- ll2 -0.45210433412455747 102.89920871603422
+ en -404425.716559147 -50478.20015504982
+ ll2 -0.45210433412455747 102.89920871603424
EPSG:2387
ll -84.58997298452051 133.14097668534896
en 575006.8280449763 -9402380.312449528
@@ -2111,19 +2111,19 @@ EPSG:2387
EPSG:23870
ll -77.21969198728301 122.73058984391338
en 641299.7436311664 -8578186.77092324
- ll2 -77.21969198685343 122.73058983785036
+ ll2 -77.21969198685342 122.73058983785035
EPSG:23871
ll 78.27607445728682 123.52552687882638
- en 511920.6650293174 8689233.473484654
- ll2 78.27607445728769 123.52552687882638
+ en 511920.6650293174 8689233.473484652
+ ll2 78.27607445728768 123.52552687882638
EPSG:23872
ll -52.1003711805071 127.10525358813489
en 370221.52569380717 -5773895.4199895235
- ll2 -52.10037118050287 127.10525358813338
+ ll2 -52.100371180502876 127.10525358813338
EPSG:23877
ll 63.573279497466075 106.59139105935844
- en 876295.811806907 1.707183434986811E7
- ll2 63.57327948514298 106.5913909981856
+ en 876295.8118069076 1.707183434986811E7
+ ll2 63.57327948514298 106.59139099818563
EPSG:23878
ll 38.1097442236881 111.93345236146229
en 1108185.0875077988 1.424076525834154E7
@@ -2131,27 +2131,27 @@ EPSG:23878
EPSG:23879
ll 33.76050844471432 113.76264191207954
en 755875.9406690104 1.3739031892282229E7
- ll2 33.760508444694594 113.7626419121117
+ ll2 33.760508444694594 113.76264191211172
EPSG:2388
ll 32.5749824176295 122.8731931530942
en -75763.25301994919 3622227.9002285
ll2 32.574982415509844 122.87319315090326
EPSG:23880
ll -44.90011121085771 116.54618466976427
- en 464170.3156917127 5028045.719216703
- ll2 -44.90011121085779 116.54618466976426
+ en 464170.31569171493 5028045.719216703
+ ll2 -44.900111210857794 116.54618466976429
EPSG:23881
ll -22.060532327272696 127.64803452260927
en 979950.6606828248 7553150.105765432
ll2 -22.060532327102646 127.64803452285241
EPSG:23882
ll 53.683631238867434 127.89063592163133
- en 426732.8068223505 1.5948894811520675E7
- ll2 53.68363123886754 127.89063592163124
+ en 426732.8068223514 1.5948894811520675E7
+ ll2 53.68363123886755 127.89063592163126
EPSG:23883
ll -50.19362885016279 135.8207372874896
- en 558582.9053160582 4439518.0529155275
- ll2 -50.19362885016292 135.82073728748958
+ en 558582.9053160602 4439518.052915527
+ ll2 -50.19362885016293 135.82073728748964
EPSG:23884
ll -79.73373772056406 134.81338181637747
en 377132.9629337732 1141598.930292191
@@ -2159,67 +2159,67 @@ EPSG:23884
EPSG:23887
ll 6.443297467447536 104.1913593235159
en 1074791.0490718756 1.0715132769688316E7
- ll2 6.443297467200781 104.1913593209573
+ ll2 6.4432974672007814 104.19135932095732
EPSG:23888
ll 37.27200256019627 112.00540624770252
- en 1121475.1511554257 1.4148128366308507E7
- ll2 37.27200255346491 112.00540624610068
+ en 1121475.1511554243 1.4148128366308508E7
+ ll2 37.27200255346494 112.00540624610065
EPSG:23889
ll 14.343302850401514 113.22664751737732
en 740122.4833292863 1.1586850443325803E7
- ll2 14.343302850242852 113.22664751655522
+ ll2 14.34330285024285 113.22664751655522
EPSG:2389
ll 51.52286159143546 132.17426523460227
en 512095.01408940554 5710272.854222626
ll2 51.52286159143545 132.17426523460227
EPSG:23890
ll 33.25934220821193 121.79087047552072
- en 946411.3670305437 1.3690296817660311E7
- ll2 33.25934220757022 121.79087047497937
+ en 946411.3670305425 1.3690296817660311E7
+ ll2 33.259342207570214 121.79087047497934
EPSG:23891
ll 47.033728771049994 119.56137183797729
- en 238722.48787983475 1.5214667895709842E7
- ll2 47.0337287707759 119.56137183645747
+ en 238722.48787983795 1.5214667895709842E7
+ ll2 47.0337287707759 119.56137183645751
EPSG:23892
ll 66.94325650740947 127.93651718930774
en 453495.0729699781 1.7425479162680037E7
- ll2 66.9432565074621 127.93651718648319
+ ll2 66.94325650746211 127.93651718648317
EPSG:23893
ll -76.35346345573299 136.37051648929133
en 536064.288033139 1524916.3996520154
- ll2 -76.35346345595707 136.37051648619584
+ ll2 -76.3534634559571 136.3705164861959
EPSG:23894
ll -64.94138507483018 150.62656246418905
en 953548.2670215362 2763413.6807289775
- ll2 -64.94138503490063 150.6265619149449
+ ll2 -64.94138503490065 150.62656191494486
EPSG:2390
ll 59.32643744120483 143.77035743610065
- en 998359.7140106797 6611940.24703337
- ll2 59.32643740669652 143.7703572341596
+ en 998359.7140106796 6611940.247033372
+ ll2 59.32643740669653 143.7703572341596
EPSG:2391
ll 41.60008404038277 12.99828712321163
- en 832827.0951135464 4638413.855920228
- ll2 41.600084045360944 12.998287160400329
+ en 832827.095113546 4638413.855920228
+ ll2 41.60008404536095 12.998287160400325
EPSG:2392
ll 66.61861534279987 32.68437231525584
- en 2883907.732216532 7418723.41348003
- ll2 66.61861532366066 32.6843721013649
+ en 2883907.7322165323 7418723.4134800285
+ ll2 66.61861532366065 32.6843721013649
EPSG:2393
ll -74.35973802987084 32.14191565286568
en 3654535.173515326 -8262347.852136741
- ll2 -74.35973800413232 32.141915699092095
+ ll2 -74.35973800413234 32.14191569909208
EPSG:2394
ll 87.06510545231188 21.75755643860249
en 4453183.15305566 9677670.253933838
ll2 87.06510543881382 21.757556647312185
EPSG:23946
ll 61.33810498747064 101.35562557635394
- en 946505.4261094532 6828780.868521266
- ll2 61.33810491618574 101.35562533845192
+ en 946505.4261094531 6828780.868521262
+ ll2 61.338104916185706 101.35562533845187
EPSG:23947
ll -78.69298246590763 95.68992929564008
- en 427939.18009786325 -8737508.961357556
- ll2 -78.69298158112416 95.68992755223665
+ en 427939.1800978639 -8737508.961357556
+ ll2 -78.69298158112416 95.68992755223668
EPSG:23948
ll -54.11844745903714 98.4517508846669
en 72736.70118166413 -6016543.984821118
@@ -2231,67 +2231,67 @@ EPSG:2395
EPSG:2396
ll -43.60001118789897 41.92729341704328
en 8767331.410155792 -4869582.427312222
- ll2 -43.60001115193081 41.92729352887951
+ ll2 -43.600011151930815 41.92729352887951
EPSG:2397
ll 13.030423587859076 8.753707588178797
en 3473407.384501462 1441191.6213126804
- ll2 13.03042359850382 8.75370760561241
+ ll2 13.030423598503821 8.75370760561241
EPSG:2398
ll -30.129304279472358 14.675134800653753
- en 4757955.086348384 -3337459.4392624954
- ll2 -30.129304264713618 14.67513482943517
+ en 4757955.086348384 -3337459.439262497
+ ll2 -30.129304264713628 14.67513482943517
EPSG:2399
ll -9.821706418602687 11.994555318622819
en 5170281.117989072 -1087551.490082796
- ll2 -9.821706405108946 11.99455534021332
+ ll2 -9.821706405108946 11.994555340213322
EPSG:2401
ll -56.34344223953492 74.40061786547695
en 2.546299012194845E7 -6246905.503261171
- ll2 -56.34344221623633 74.40061787958604
+ ll2 -56.34344221623633 74.40061787958605
EPSG:2402
ll -76.91736512947497 75.86261547827839
en 2.644602813570309E7 -8541933.682729792
- ll2 -76.91736509371628 75.86261552998937
+ ll2 -76.91736509371627 75.86261552998937
EPSG:2403
ll -71.44934281122184 78.02145733166867
- en 2.7394270036762007E7 -7933259.972542006
- ll2 -71.4493427779079 78.02145736124838
+ en 2.7394270036762007E7 -7933259.972542007
+ ll2 -71.44934277790792 78.02145736124838
EPSG:2404
ll 35.06111559959513 93.6268830994652
en 2.937959736956394E7 3924104.2150474684
ll2 35.06111556889372 93.62688302356274
EPSG:24047
ll -68.93334808160972 92.06720777035035
- en 222757.50493188645 -7662493.537943004
- ll2 -68.9333473776263 92.06720716575965
+ en 222757.50493188662 -7662493.537943005
+ ll2 -68.93334737762632 92.06720716575965
EPSG:24048
ll 63.295271864030894 109.35742710806859
- en 718765.9744331411 7025548.691699143
- ll2 63.29527179443255 109.357426900329
+ en 718765.9744331418 7025548.691699143
+ ll2 63.295271794432544 109.35742690032903
EPSG:2405
ll -22.79789984245076 88.45781183651937
- en 2.9649715358864054E7 -2522802.1848164513
- ll2 -22.79789984276367 88.45781183647078
+ en 2.9649715358864054E7 -2522802.1848164517
+ ll2 -22.797899842763673 88.4578118364708
EPSG:2406
ll 56.05144505605929 88.6639679021814
- en 3.04167712352561E7 6215120.41842597
- ll2 56.05144506132874 88.66396790001896
+ en 3.04167712352561E7 6215120.418425971
+ ll2 56.051445061328764 88.66396790001896
EPSG:2407
ll -3.9848307175890767 85.02902498692545
en 3.0611958754204243E7 -444854.51879215083
ll2 -3.9848307211434495 85.02902502028883
EPSG:2408
ll 3.7169537866866307 89.14990219635484
- en 3.1737233627414092E7 414051.5362310383
- ll2 3.7169537809476227 89.14990220780301
+ en 3.1737233627414092E7 414051.5362310384
+ ll2 3.7169537809476223 89.14990220780301
EPSG:2409
ll 78.0935301504779 98.78579293649283
- en 3.349505596129842E7 8672299.687319234
- ll2 78.09353015084396 98.78579293659662
+ en 3.349505596129842E7 8672299.687319236
+ ll2 78.09353015084397 98.78579293659661
EPSG:2410
ll 54.833664483771884 98.10385933550364
- en 3.4249689579563916E7 6085700.018131537
- ll2 54.833664488841414 98.10385933626392
+ en 3.4249689579563916E7 6085700.018131536
+ ll2 54.83366448884141 98.10385933626395
EPSG:24100
ll -14.428421661129427 -93.12495758652233
en -6124026.6070402125 -1.1722651728869563E7
@@ -2302,20 +2302,20 @@ EPSG:2411
ll2 8.487012241524374 113.00167631604923
EPSG:2412
ll 74.62685534933064 117.95584952242915
- en 3.679341998928373E7 8309959.981604453
- ll2 74.62685533974458 117.95584864272864
+ en 3.679341998928373E7 8309959.981604456
+ ll2 74.62685533974461 117.95584864272868
EPSG:2413
ll -24.790679738152264 107.06744040675638
en 3.710209286946464E7 -2748507.6988115865
- ll2 -24.790679737122215 107.06744040638469
+ ll2 -24.79067973712222 107.06744040638469
EPSG:2414
ll -82.00234048978693 115.75193354482633
- en 3.852717204566482E7 -9109144.691255035
+ en 3.852717204566482E7 -9109144.691255037
ll2 -82.00234045209852 115.75193345349047
EPSG:2415
ll 59.98194781461817 118.44304133012142
- en 3.95805048796903E7 6652969.804601499
- ll2 59.98194781856352 118.44304133562154
+ en 3.95805048796903E7 6652969.804601501
+ ll2 59.98194781856354 118.44304133562154
EPSG:2416
ll 38.306360321833125 125.44730694125647
en 4.0976552910895914E7 4255621.014899813
@@ -2326,32 +2326,32 @@ EPSG:2417
ll2 42.971709934536534 118.44145355717629
EPSG:2418
ll 87.83087826191729 132.37094174202255
- en 4.25268000733319E7 9761220.459100269
- ll2 87.83087825788648 132.37094164452068
+ en 4.25268000733319E7 9761220.45910027
+ ll2 87.8308782578865 132.37094164452074
EPSG:2419
ll 56.312688808490094 124.90974509903526
- en 4.3246861058269925E7 6250944.537734763
- ll2 56.31268881138151 124.90974510562253
+ en 4.3246861058269925E7 6250944.537734764
+ ll2 56.31268881138152 124.90974510562253
EPSG:2420
ll -5.14063479802968 128.54219062281078
en 4.411629462231608E7 -569391.7194383154
- ll2 -5.140634799996446 128.5421906247593
+ ll2 -5.1406347999964455 128.5421906247593
EPSG:24200
ll 17.030246048270214 7.180628613165027
en 8909119.168115692 2042585.532557765
- ll2 17.030245971585572 7.18062853956291
+ ll2 17.030245971585572 7.180628539562895
EPSG:2421
ll 65.8742738188239 141.255689437488
en 4.578495883071124E7 7323089.994465979
ll2 65.87427381631872 141.2556894298969
EPSG:2422
ll 52.25084380290659 79.67593120311821
- en 819299.8581533399 5801599.905041221
- ll2 52.25084380651638 79.67593119817022
+ en 819299.8581533399 5801599.9050412215
+ ll2 52.2508438065164 79.67593119817022
EPSG:2423
ll -19.163441249877238 68.32097275343355
- en -521917.5666494265 -2148196.0404286343
- ll2 -19.16344123248579 68.320972779829
+ en -521917.5666494265 -2148196.0404286347
+ ll2 -19.163441232485795 68.32097277982898
EPSG:2424
ll 74.96857036972975 86.4078677286028
en 656456.3271969744 8330583.754661813
@@ -2359,74 +2359,74 @@ EPSG:2424
EPSG:2425
ll 25.418291672963136 83.58241146139059
en 458020.27725996595 2812513.6871870076
- ll2 25.418291672314613 83.58241145811498
+ ll2 25.418291672314606 83.58241145811499
EPSG:2426
ll -1.3380210371072536 82.1613502763642
- en -39107.44111615175 -148399.87456431077
- ll2 -1.3380210420990484 82.16135027579668
+ en -39107.44111615338 -148399.8745643108
+ ll2 -1.338021042099048 82.16135027579666
EPSG:2427
ll -12.979758845814601 83.20836635955608
- en -238396.26285671385 -1445244.122841066
- ll2 -12.97975884797486 83.2083663639623
+ en -238396.26285671245 -1445244.122841066
+ ll2 -12.979758847974862 83.20836636396231
EPSG:2428
ll -41.203033006817805 83.20813594806592
- en -321826.7478233671 -4609536.767271803
- ll2 -41.20303294247736 83.20813614921217
+ en -321826.7478233661 -4609536.767271803
+ ll2 -41.203032942477364 83.20813614921217
EPSG:2429
ll 15.024254643564475 98.72672776874961
- en 793320.993418126 1663551.276432469
- ll2 15.024254640159402 98.72672776944304
+ en 793320.9934181229 1663551.2764324686
+ ll2 15.0242546401594 98.72672776944303
EPSG:2430
ll -79.4758494237986 101.19095932411854
- en 544674.9464482784 -8827438.29965204
- ll2 -79.47584938540625 101.1909593060191
+ en 544674.9464482786 -8827438.299652042
+ ll2 -79.47584938540625 101.19095930601914
EPSG:24305
ll -70.03147465126281 91.89729719944812
- en 686631.6819394246 -7776766.1044808
- ll2 -70.03147396397745 91.8972965291566
+ en 686631.6819394244 -7776766.104480803
+ ll2 -70.03147396397746 91.89729652915659
EPSG:24306
ll -63.49349770518401 90.49830518561713
en 375717.76329053484 -7042948.237241804
- ll2 -63.49349712765722 90.49830477249776
+ ll2 -63.49349712765723 90.49830477249773
EPSG:2431
ll -78.8028590862724 99.24974647097068
- en 440359.4183801233 -8752859.027899737
- ll2 -78.80285904811733 99.24974646026149
+ en 440359.41838012304 -8752859.027899737
+ ll2 -78.80285904811734 99.2497464602615
EPSG:24311
ll 78.6097467430362 66.7850429556438
- en 583330.8914628805 8728757.938640317
- ll2 78.60974649909753 66.78504297328891
+ en 583330.891462881 8728757.938640317
+ ll2 78.60974649909754 66.78504297328894
EPSG:24312
ll 18.023645541615466 66.47916933267794
- en 233125.40969040082 1994366.7389648238
- ll2 18.023645547920456 66.47916933352391
+ en 233125.40969040082 1994366.7389648245
+ ll2 18.023645547920463 66.47916933352391
EPSG:24313
ll 13.973732687822448 68.74695453087871
- en -176440.04306389834 1553510.9420314317
- ll2 13.973732697009366 68.74695453218943
+ en -176440.04306389834 1553510.9420314315
+ ll2 13.973732697009362 68.74695453218943
EPSG:2432
ll -64.43852821373525 110.87952651717903
- en 782846.3641277512 -7161799.032917581
- ll2 -64.43852818203626 110.87952649536102
+ en 782846.3641277526 -7161799.0329175815
+ ll2 -64.43852818203626 110.87952649536106
EPSG:2433
ll -15.091226664007593 105.05797345040307
- en 183565.29010048503 -1671109.4008445055
- ll2 -15.091226667152027 105.05797345109852
+ en 183565.29010048497 -1671109.4008445058
+ ll2 -15.091226667152034 105.05797345109852
EPSG:2434
ll -56.88745891673613 109.60855819272888
- en 415145.43900520774 -6308181.617203362
- ll2 -56.88745889314968 109.60855818358583
+ en 415145.4390052095 -6308181.617203363
+ ll2 -56.887458893149706 109.60855818358587
EPSG:24342
ll 41.61162538587914 61.8047245464057
en -99680.13151930994 4631480.752416615
- ll2 41.611625376769894 61.80472455354503
+ ll2 41.61162537676988 61.80472455354502
EPSG:24343
ll -19.631443245474415 73.81603016275892
- en 375955.55650971155 -2171350.477900914
+ en 375955.55650971155 -2171350.4779009144
ll2 -19.63144315612741 73.81603014402805
EPSG:24344
ll 46.87174415131898 77.80374152772835
- en 256606.93813990036 5195605.048641688
+ en 256606.93813990033 5195605.048641688
ll2 46.87174414578738 77.80374152273255
EPSG:24345
ll 54.66774232769782 89.53045135365552
@@ -2434,32 +2434,32 @@ EPSG:24345
ll2 54.66774229646135 89.53045129826097
EPSG:24346
ll -37.2609671655222 93.86252658634146
- en 576810.6551828692 -4124282.1947244178
- ll2 -37.260966932243754 93.86252636917546
+ en 576810.6551828703 -4124282.1947244178
+ ll2 -37.26096693224376 93.8625263691755
EPSG:24347
ll 11.163134942265131 95.68768470817709
- en 138575.39659626927 1235760.6649789093
- ll2 11.163134966452 95.68768466019566
+ en 138575.3965962723 1235760.6649789093
+ ll2 11.163134966451997 95.68768466019567
EPSG:2435
ll -59.449741940902726 118.34637665102633
en 746385.301295342 -6600769.194760193
ll2 -59.44974191487013 118.34637663302027
EPSG:2436
ll -23.00320498321338 114.79816262058657
- en 274172.2342378654 -2546499.3575850367
- ll2 -23.003204982163094 114.79816262016365
+ en 274172.2342378654 -2546499.357585036
+ ll2 -23.003204982163087 114.79816262016365
EPSG:2437
ll 67.7619336826258 122.33871044360492
en 598729.1117754307 7521225.678662644
- ll2 67.76193368518723 122.33871044832608
+ ll2 67.76193368518722 122.33871044832611
EPSG:24370
ll -14.15048601031441 80.6452793217699
en 4584598.616125907 -4725315.134154291
- ll2 -14.15048601031437 80.6452793217699
+ ll2 -14.150486010314372 80.6452793217699
EPSG:24371
ll -22.507708989401607 61.48379792461877
en 1857636.7720146142 -6726627.818457163
- ll2 -22.5077089894016 61.48379792461877
+ ll2 -22.507708989401603 61.48379792461877
EPSG:24372
ll 76.95217818070276 120.83538882768312
en 5384513.116573365 8924149.805067215
@@ -2470,48 +2470,48 @@ EPSG:24373
ll2 -33.170303850058865 95.07310978344242
EPSG:24374
ll -7.265551374757386 10.454094921370734
- en -5776097.594877819 -257671.58811813334
- ll2 -7.265551374757376 10.454094921370753
+ en -5776097.59487782 -257671.58811813334
+ ll2 -7.265551374757376 10.45409492137074
EPSG:24375
ll -2.6545480241339803 16.477932746254616
en -5985779.563765844 138413.80949614674
ll2 -2.654547854051084 16.477933186868754
EPSG:24376
ll 75.77239883654718 126.59162495400037
- en 5106245.1800052915 7065099.599781233
- ll2 75.77239872852606 126.5916237043118
+ en 5106245.1800052915 7065099.599781234
+ ll2 75.77239872852606 126.59162370431181
EPSG:24377
ll 77.96564976794167 89.36357899901135
en 3447127.41824508 8026006.282397377
- ll2 77.96564954485282 89.36357846035266
+ ll2 77.96564954485281 89.36357846035264
EPSG:24378
ll 52.49438537792538 100.0468028548608
- en 5034818.960818398 3529231.349342404
- ll2 52.494385347291576 100.04680275002036
+ en 5034818.960818399 3529231.3493424053
+ ll2 52.494385347291576 100.04680275002039
EPSG:24379
ll 22.20788906808415 40.295202171265764
en -696907.187493071 940610.1820605685
- ll2 22.20788907753173 40.295202208197516
+ ll2 22.207889077531725 40.29520220819751
EPSG:2438
ll 88.95524301037494 127.06181663527116
- en 508194.41511803056 9885599.015387114
- ll2 88.95524300559983 127.0618164745554
+ en 508194.4151180307 9885599.015387112
+ ll2 88.95524300559981 127.06181647455534
EPSG:24380
ll -17.388003235397687 109.77359218168408
- en 5508496.995508591 -4151825.6579026673
- ll2 -17.388003084703804 109.77359192330053
+ en 5508496.995508587 -4151825.65790267
+ ll2 -17.38800308470383 109.77359192330047
EPSG:24381
ll 75.98647239978091 112.03172549852148
en 4636389.889834007 9139749.877278829
- ll2 75.98647224217898 112.031724617793
+ ll2 75.98647224217898 112.03172461779302
EPSG:24382
ll 34.096422586959875 88.02098839876138
en 2798510.663155095 1985106.9202126756
ll2 34.09642258696003 88.02098839876138
EPSG:24383
ll 30.374802165331957 103.62758684866357
- en 5133075.859284567 3085038.314852033
- ll2 30.37480217347632 103.62758677072117
+ en 5133075.859284567 3085038.314852027
+ ll2 30.374802173476237 103.62758677072117
EPSG:2439
ll 79.6896116478323 116.84300563706178
en 317612.52690213075 8864882.384110704
@@ -2519,39 +2519,39 @@ EPSG:2439
EPSG:2440
ll -22.68849883921652 133.70713487291493
en 983989.4154071289 -2517639.4866370074
- ll2 -22.688498834199546 133.70713486928634
+ ll2 -22.688498834199546 133.70713486928636
EPSG:2441
ll 73.5707804340473 141.01822856610897
en 783733.2313227552 8188939.899562939
ll2 73.57078042433153 141.01822821370646
EPSG:2442
ll 48.27280553918837 126.05283034406229
- en -163937.99147974665 5387650.638646498
- ll2 48.272805499597496 126.05283049729978
+ en -163937.99147974455 5387650.638646496
+ ll2 48.272805499597474 126.0528304972998
EPSG:2443
ll 44.703996195951646 128.7027692572481
- en -63175.636081870754 1299481.0215605746
+ en -63175.636081870754 1299481.0215605737
ll2 44.70399619595171 128.70276925724806
EPSG:2444
ll -66.33182380547166 132.70730382888982
- en 76495.79862023267 -1.1012531538437348E7
+ en 76495.79862023267 -1.101253153843735E7
ll2 -66.33182380547107 132.70730382888982
EPSG:2445
ll 70.3158698675744 131.99541814729517
- en -6439.664136094047 3818304.9609345687
- ll2 70.31586986757536 131.99541814729514
+ en -6439.664136091911 3818304.9609345673
+ ll2 70.31586986757534 131.9954181472952
EPSG:2446
ll -30.138882082553877 125.88212261207227
en -735000.7768803992 -7012183.1411005175
- ll2 -30.138882076228423 125.88212260745966
+ ll2 -30.13888207622842 125.88212260745966
EPSG:2447
ll -89.00154574428629 141.0176000007451
- en 12978.910258150077 -1.3875357406775253E7
- ll2 -89.00154574429801 141.01759997450267
+ en 12978.910258150021 -1.3875357406775253E7
+ ll2 -89.00154574429801 141.01759997450264
EPSG:2448
ll 63.11236595104319 144.82196429243373
- en 444226.62127569603 3045652.377000583
- ll2 63.112365921729264 144.82196405561888
+ en 444226.6212756961 3045652.377000583
+ ll2 63.11236592172927 144.8219640556189
EPSG:2449
ll 80.38891279263387 127.86875776861821
en -172639.28342451373 4956372.720237562
@@ -2559,255 +2559,255 @@ EPSG:2449
EPSG:2450
ll -34.31784317733623 136.00365345647901
en -229765.64571125267 -7786505.5208910545
- ll2 -34.31784317732501 136.0036534564606
+ ll2 -34.317843177325 136.0036534564606
EPSG:24500
ll -31.12891929964168 103.17335368777829
- en -34627.59126877593 -3557826.2698627305
- ll2 -31.12891927090384 103.17335366483435
+ en -34627.59126877593 -3557826.269862731
+ ll2 -31.12891927090384 103.17335366483434
EPSG:2451
ll 15.2580235481866 134.41033672570933
- en -583237.9742987581 -2290493.4197199238
- ll2 15.258023547871792 134.41033672648777
+ en -583237.974298755 -2290493.4197199238
+ ll2 15.258023547871792 134.41033672648783
EPSG:2452
ll 75.94755059458583 143.8514371391819
en 81794.41434770258 4004867.005240674
ll2 75.94755059457412 143.85143713916344
EPSG:2453
ll -64.78295971649423 146.63614236434316
- en 303280.42522475886 -1.2075069958250383E7
- ll2 -64.78295971231846 146.63614235119323
+ en 303280.4252247574 -1.2075069958250383E7
+ ll2 -64.78295971231846 146.6361423511932
EPSG:2454
ll 16.4416930749788 145.69438233698068
en 367997.1883458254 -3051861.937010642
ll2 16.441693074960753 145.69438233693185
EPSG:24547
ll 83.30336130161135 101.31262510246249
- en 530219.976060972 9250675.278606003
- ll2 83.30336069605602 101.3126240731878
+ en 530219.9760609719 9250675.278606001
+ ll2 83.303360696056 101.3126240731878
EPSG:24548
ll -86.4148657877318 111.76336733637318
en 547314.8972349702 -9600170.538531927
- ll2 -86.41486513532806 111.7633631698473
+ ll2 -86.41486513532807 111.7633631698473
EPSG:2455
ll 61.38108851733722 149.37342724689714
en 273663.33326145005 1944694.4881077043
ll2 61.38108851594557 149.3734272452879
EPSG:2456
ll -76.6323577846555 135.72177596781876
- en -161790.52161860603 -1.1393480934935257E7
- ll2 -76.63235778383762 135.72177598156796
+ en -161790.52161860577 -1.1393480934935262E7
+ ll2 -76.63235778383768 135.72177598156793
EPSG:2457
ll 57.59349970920931 127.72830389825023
- en 13651.529419211596 3508846.5579441357
- ll2 57.59349970920975 127.72830389825022
+ en 13651.529419213291 3508846.5579441367
+ ll2 57.593499709209766 127.72830389825025
EPSG:2458
ll 58.35220828411295 129.54560813244572
- en 324440.85089012294 3606700.4320253944
+ en 324440.85089012294 3606700.432025394
ll2 58.35220828159998 129.54560812950572
EPSG:2459
ll -52.969923989873344 137.94731896353338
- en 466385.4236560421 -8769853.924498666
- ll2 -52.96992397947172 137.94731894546555
+ en 466385.4236560418 -8769853.92449867
+ ll2 -52.96992397947175 137.94731894546555
EPSG:2460
ll -66.88877387634852 134.51533220554765
- en -65045.23390554132 -9634127.776718305
- ll2 -66.88877387634878 134.51533220554765
+ en -65045.23390554007 -9634127.776718305
+ ll2 -66.88877387634878 134.51533220554768
EPSG:24600
ll 76.9109424624401 36.842786808298584
en 1169442.5423390698 6863241.253375286
ll2 76.91094237017863 36.84278678660094
EPSG:2461
ll -22.431883900205975 155.65342519602
- en 170214.27119484023 -5358860.441319691
- ll2 -22.431883900205545 155.65342519602027
+ en 170214.27119484317 -5358860.441319691
+ ll2 -22.431883900205538 155.6534251960203
EPSG:2462
ll -11.947194210760102 26.602531524559467
en 5111051.493189228 -1327459.3286604527
- ll2 -11.947194190730418 26.602531521040746
+ ll2 -11.947194190730416 26.602531521040742
EPSG:2463
ll -89.29404329687537 19.638159635561603
- en 498256.90796758933 -9923282.266058553
- ll2 -89.29404329100548 19.638162481452394
+ en 498256.9079675893 -9923282.266058553
+ ll2 -89.29404329100548 19.638162481452348
EPSG:2464
ll -53.317973275859835 28.106023234066264
- en 573834.428380879 -5910600.128707839
- ll2 -53.31797325823154 28.106023278729253
+ en 573834.4283808792 -5910600.128707839
+ ll2 -53.31797325823154 28.10602327872926
EPSG:2465
ll 40.71791886692867 23.54580953622074
- en -299228.5359390761 4552587.34395796
- ll2 40.71791882581035 23.54580967583211
+ en -299228.5359390755 4552587.343957961
+ ll2 40.71791882581037 23.545809675832107
EPSG:2466
ll -85.91532737215599 30.66800184559773
- en 434057.4464583978 -9550634.652335001
- ll2 -85.91532735887866 30.668002495087443
+ en 434057.4464583976 -9550634.652335001
+ ll2 -85.91532735887867 30.668002495087425
EPSG:2467
ll 81.91264329397777 47.13672656625667
- en 533674.9550501463 9099429.897736343
- ll2 81.9126432923292 47.136726584719234
+ en 533674.9550501464 9099429.897736343
+ ll2 81.91264329232921 47.13672658471924
EPSG:2468
ll 79.88624748294873 54.55213066210317
- en 569722.522831945 8874645.179553118
- ll2 79.88624748155247 54.55213067172343
+ en 569722.5228319451 8874645.179553118
+ ll2 79.88624748155247 54.55213067172345
EPSG:2469
ll 53.55093466377511 48.13902919273531
- en -86514.85053548368 5972619.13768499
- ll2 53.550934622356294 48.1390293694791
+ en -86514.8505354838 5972619.137684988
+ ll2 53.55093462235628 48.1390293694791
EPSG:2470
ll -0.5722358161757768 62.460290760116834
- en 439999.09910498094 -63195.87359547625
- ll2 -0.5722358158604203 62.4602907604341
+ en 439999.0991049778 -63195.87359547627
+ ll2 -0.5722358158604204 62.46029076043407
EPSG:2471
ll -68.72152405384509 76.34691079758173
- en 797140.1947111886 -7644135.737023478
- ll2 -68.72152401863664 76.34691077645468
+ en 797140.1947111886 -7644135.73702348
+ ll2 -68.72152401863666 76.34691077645468
EPSG:24718
ll 40.50671418138424 -66.65224069364764
en 1207874.974998511 4517938.750477166
- ll2 40.506714102230866 -66.65224079698473
+ ll2 40.50671410223087 -66.65224079698471
EPSG:24719
ll 17.93244695789035 -62.661124954782785
en 1172633.7959370129 1994555.6270831628
- ll2 17.932446919476696 -62.66112497828937
+ ll2 17.932446919476703 -62.66112497828937
EPSG:2472
ll -31.03754715533819 70.29562728014945
- en 50701.14922100614 -3444588.663745194
- ll2 -31.03754714544339 70.29562728514337
+ en 50701.149221004685 -3444588.663745194
+ ll2 -31.03754714544339 70.29562728514335
EPSG:24720
ll -12.761620491382587 -71.76552793150466
- en -454656.048053973 -1426655.4456085616
- ll2 -12.761620413824525 -71.76552785106988
+ en -454656.04805397324 -1426655.4456085619
+ ll2 -12.76162041382453 -71.76552785106989
EPSG:2473
ll 77.7258211710867 80.40005115746864
en 485800.38136638765 8631339.56776558
ll2 77.72582117065014 80.40005115835925
EPSG:2474
ll -48.723309188309685 82.14639367180726
- en 142968.9972165558 -5410177.426676586
- ll2 -48.723309168689994 82.14639367977003
+ en 142968.99721655593 -5410177.426676587
+ ll2 -48.72330916868999 82.14639367977003
EPSG:2475
ll -85.87145031352023 102.68871664998173
- en 577561.5046487969 -9547420.989984095
- ll2 -85.87145028009778 102.68871587270591
+ en 577561.5046487973 -9547420.989984093
+ ll2 -85.87145028009778 102.68871587270594
EPSG:2476
ll -69.41329726505253 105.8480757188614
- en 768367.5119868332 -7718543.510026962
- ll2 -69.41329723085605 105.84807568494152
+ en 768367.5119868342 -7718543.510026962
+ ll2 -69.41329723085603 105.84807568494155
EPSG:2477
ll -28.931326911348137 96.75066850312639
- en -305842.912222889 -3229764.236158933
- ll2 -28.931326896191873 96.75066849905686
+ en -305842.9122228904 -3229764.236158934
+ ll2 -28.93132689619188 96.75066849905683
EPSG:2478
ll -35.610710060576295 113.66522793194336
- en 741485.0835745237 -3945545.5573706855
- ll2 -35.61071005040301 113.66522792939736
+ en 741485.0835745251 -3945545.557370685
+ ll2 -35.61071005040299 113.66522792939737
EPSG:2479
ll 19.054173092285197 118.06644562710456
- en 612214.8409480237 2108077.074013549
- ll2 19.054173090353167 118.06644562948193
+ en 612214.8409480297 2108077.0740135494
+ ll2 19.054173090353174 118.06644562948198
EPSG:2480
ll 7.647411881740851 121.71298783117288
- en 357930.52077562246 845948.4608779737
- ll2 7.647411879259236 121.71298783304434
+ en 357930.5207756256 845948.4608779737
+ ll2 7.647411879259234 121.71298783304437
EPSG:2481
ll -31.802397037657897 131.95124324575715
en 779459.5420547742 -3523665.949215528
- ll2 -31.802397027585837 131.95124323965513
+ ll2 -31.802397027585833 131.95124323965513
EPSG:24817
ll 41.54724603097932 -81.66130056581929
en 445104.71449455636 4600028.903905393
- ll2 41.54724596624057 -81.66130066290887
+ ll2 41.54724596624057 -81.66130066290886
EPSG:24818
ll 81.91044501185516 -71.42539819007803
en 556353.8147360217 9096677.677564055
- ll2 81.91044507291431 -71.42539872385242
+ ll2 81.91044507291429 -71.42539872385242
EPSG:24819
ll -5.5291376127089364 -59.00643184753753
- en 1612691.1339392615 -620193.9970794617
- ll2 -5.52913760803389 -59.00643201643093
+ en 1612691.1339392608 -620193.9970794617
+ ll2 -5.529137608033891 -59.00643201643093
EPSG:2482
ll -42.65341691497631 136.69590239276914
- en 638985.5213473625 -4725559.094574447
- ll2 -42.653416898860684 136.69590238019904
+ en 638985.5213473602 -4725559.094574447
+ ll2 -42.653416898860684 136.69590238019902
EPSG:24820
ll -88.3554470758002 -57.2552513531902
en 518555.2006921236 -9815294.60398304
- ll2 -88.35544684852064 -57.255247570399256
+ ll2 -88.35544684852064 -57.25524757039926
EPSG:24821
ll 41.570133880682306 -60.4442617886673
- en 212979.91775137465 4608032.918276129
- ll2 41.57013381585071 -60.44426186851409
+ en 212979.91775137524 4608032.918276129
+ ll2 41.57013381585071 -60.444261868514076
EPSG:2483
ll 83.38537577453181 141.25269134359027
- en 503164.22138845193 9263259.905719394
- ll2 83.38537577240074 141.25269132608648
+ en 503164.2213884516 9263259.905719394
+ ll2 83.38537577240075 141.25269132608645
EPSG:2484
ll 86.97364398271031 140.78899931648968
- en 463349.0676669086 9666002.197098464
+ en 463349.0676669088 9666002.197098466
ll2 86.97364397964752 140.78899927903453
EPSG:2485
ll -15.768327507322681 157.27686070251792
- en 958554.8306809968 -1748593.9643649037
- ll2 -15.768327498917088 157.27686069281262
+ en 958554.8306809968 -1748593.9643649033
+ ll2 -15.768327498917087 157.27686069281262
EPSG:2486
ll 64.64839070803941 157.27630332494704
en 417509.0270140717 7173352.89238335
ll2 64.64839070785266 157.27630332357586
EPSG:2487
ll 8.231589418483694 162.63621227644336
- en 239360.40498731035 911122.4911130797
- ll2 8.231589421843767 162.6362122709183
+ en 239360.4049873072 911122.4911130798
+ ll2 8.23158942184377 162.63621227091826
EPSG:24877
ll -29.790563745893145 -90.4738252068637
- en -417542.6477064439 6666815.160714177
- ll2 -29.79056359904185 -90.47382506467538
+ en -417542.6477064438 6666815.1607141765
+ ll2 -29.790563599041857 -90.4738250646754
EPSG:24878
ll 49.27690057425525 -70.96089348703833
- en 793974.6817847517 1.546635107958281E7
- ll2 49.27690052366924 -70.9608936052862
+ en 793974.6817847529 1.546635107958281E7
+ ll2 49.27690052366923 -70.96089360528617
EPSG:24879
ll 53.003669188384634 -77.51883584223509
- en -70837.43121392257 1.5906917875142824E7
- ll2 53.003669110099956 -77.51883586244031
+ en -70837.43121392245 1.5906917875142824E7
+ ll2 53.00366911009995 -77.51883586244031
EPSG:2488
ll -30.39214137475227 165.09507831958507
- en -68123.22325472662 -3378389.3982126447
- ll2 -30.392141358996163 165.09507829814083
+ en -68123.2232547293 -3378389.3982126457
+ ll2 -30.39214135899617 165.09507829814083
EPSG:24880
ll -43.31992659069036 -53.43312511514002
en 1276134.409637087 5159291.615351637
- ll2 -43.3199264045316 -53.43312524795141
+ ll2 -43.31992640453161 -53.43312524795141
EPSG:24881
ll 44.47778336425415 -66.71658482544456
- en -272618.2443995038 1.4971313757011972E7
- ll2 44.477783245166734 -66.7165846785684
+ en -272618.244399506 1.4971313757011972E7
+ ll2 44.47778324516672 -66.71658467856841
EPSG:24882
ll -83.22298476180224 -57.64635081840024
- en 412734.4819165531 753665.8842383344
- ll2 -83.22298453650572 -57.646349909705705
+ en 412734.48191655276 753665.8842383362
+ ll2 -83.22298453650568 -57.646349909705705
EPSG:2489
ll -53.54524489425106 172.8382473741321
- en 224056.83545780636 -5943392.39213667
- ll2 -53.54524487607215 172.83824732940633
+ en 224056.8354578063 -5943392.39213667
+ ll2 -53.545244876072154 172.83824732940633
EPSG:24891
ll 79.28235695544478 -77.1235531570544
- en 292328.8744441897 1.0895888246938232E7
- ll2 79.2823570000279 -77.12355361242115
+ en 292328.8744441896 1.0895888246938234E7
+ ll2 79.28235700002791 -77.1235536124211
EPSG:24892
ll 38.9507078170665 -81.28278720522677
- en 262475.67566522403 6413572.3795690555
- ll2 38.95070774967024 -81.28278729439126
+ en 262475.6756652228 6413572.3795690555
+ ll2 38.95070774967023 -81.28278729439127
EPSG:24893
ll 23.047764509392536 -63.04077100868052
- en 2089814.6845801922 4658714.09337254
- ll2 23.047764431755578 -63.040771052218886
+ en 2089814.6845801906 4658714.09337254
+ ll2 23.047764431755578 -63.040771052218915
EPSG:2490
ll -34.69322366458222 -170.03932887631734
- en 1138223.4573966148 -3862682.969876436
- ll2 -34.69322364405646 -170.03932890927626
+ en 1138223.4573966148 -3862682.969876435
+ ll2 -34.693223644056445 -170.03932890927612
EPSG:2491
ll 68.48952051629615 -174.94985591767013
- en 338265.1789413237 7605824.963609023
- ll2 68.48952051675163 -174.9498559318221
+ en 338265.1789413227 7605824.963609026
+ ll2 68.48952051675164 -174.94985593182207
EPSG:2494
ll 47.12680904577968 29.00954237916383
en 1107709.8257999173 5252697.938988944
@@ -2815,23 +2815,23 @@ EPSG:2494
EPSG:2495
ll 15.183853397963716 27.250971009920384
en 527082.6559600339 1679453.4529377392
- ll2 15.183853401708012 27.250971018610773
+ ll2 15.183853401708014 27.250971018610773
EPSG:2496
ll -16.460554665432127 33.14498233865824
en 515587.77510081395 -1820542.5246484801
- ll2 -16.46055465512762 33.14498235326975
+ ll2 -16.460554655127623 33.14498235326975
EPSG:2497
ll -88.23439369635472 47.45774274142575
en 529118.9393652071 -9806989.279080506
- ll2 -88.23439367247391 47.457743487424516
+ ll2 -88.23439367247394 47.45774348742451
EPSG:2498
ll -28.317736721813276 45.823799461342276
- en 580884.8677169875 -3133864.6803632346
- ll2 -28.317736710046386 45.82379947468253
+ en 580884.8677169882 -3133864.6803632355
+ ll2 -28.317736710046393 45.82379947468254
EPSG:2499
ll 2.964818308835646 60.71487962100618
- en 1585320.920414863 332717.075145749
- ll2 2.964818302791269 60.71487947380769
+ en 1585320.9204148632 332717.075145749
+ ll2 2.9648183027912696 60.714879473807706
EPSG:2500
ll 67.93988719746375 57.1177671886928
en 505033.8040705063 7539250.356397282
@@ -2839,11 +2839,11 @@ EPSG:2500
EPSG:25000
ll -59.333369156057636 -3.7948407089160128
en 115297.04378707739 -7097431.142894438
- ll2 -59.333368874990335 -3.7948406795038983
+ ll2 -59.333368874990335 -3.7948406795038987
EPSG:2501
ll 19.331185801801908 67.7052030335409
- en 994931.7684210511 2145143.83935221
- ll2 19.331185799453728 67.70520302965242
+ en 994931.7684210526 2145143.83935221
+ ll2 19.331185799453724 67.70520302965241
EPSG:2502
ll 68.55563639249448 67.73326060188558
en 448372.11537918984 7608439.293928779
@@ -2854,84 +2854,84 @@ EPSG:2503
ll2 -25.070987696954337 65.90650268137864
EPSG:2504
ll 13.206635843671833 77.7940864704729
- en 152359.3969641892 1462870.368474252
- ll2 13.206635840419068 77.79408646738706
+ en 152359.3969641892 1462870.3684742518
+ ll2 13.206635840419063 77.79408646738706
EPSG:2505
ll -1.690855211253961 96.15112439004173
- en 1522637.4034129 -189309.21550581467
+ en 1522637.4034128967 -189309.21550581465
ll2 -1.6908552138808504 96.15112429275047
EPSG:2506
ll 18.409510677566473 83.74422347303428
- en -481383.60632924445 2061565.9820129555
- ll2 18.409510662648305 83.74422348911435
+ en -481383.6063292428 2061565.9820129555
+ ll2 18.4095106626483 83.74422348911439
EPSG:2507
ll -16.236555295151987 106.51334656843335
- en 1305167.8151594428 -1810557.0648860934
- ll2 -16.236555293483967 106.51334656334038
+ en 1305167.815159441 -1810557.0648860934
+ ll2 -16.23655529348397 106.51334656334035
EPSG:2508
ll -75.9332658416258 95.75488253753754
- en 249993.37294115487 -8450712.190335825
- ll2 -75.93326580061058 95.75488300337224
+ en 249993.3729411557 -8450712.190335829
+ ll2 -75.93326580061063 95.75488300337226
EPSG:2509
ll -88.62449359019467 107.19240849124711
- en 489759.36354181595 -9848699.8971998
- ll2 -88.6244935520319 107.19240828149705
+ en 489759.363541816 -9848699.897199802
+ ll2 -88.62449355203191 107.19240828149707
EPSG:2510
ll -83.82225120838983 107.27545303754307
- en 383607.1540623109 -9321835.426905822
- ll2 -83.82225117308558 107.27545377422875
+ en 383607.15406231047 -9321835.42690582
+ ll2 -83.82225117308555 107.2754537742287
EPSG:2511
ll 19.045300533617265 122.67593390721133
- en 465809.84306315274 2106777.70819834
- ll2 19.04530053115396 122.67593391101684
+ en 465809.84306315123 2106777.7081983406
+ ll2 19.045300531153966 122.67593391101681
EPSG:2512
ll -19.774663397310533 130.4125676949528
en 647945.3448637233 -2187964.0415397417
- ll2 -19.774663394024877 130.41256769288148
+ ll2 -19.774663394024873 130.41256769288142
EPSG:2513
ll -16.837301428514053 133.81379958286198
en 373460.55754434917 -1862608.817093211
ll2 -16.837301425693997 133.81379958082644
EPSG:2514
ll -3.2951846044912543 136.9303743061221
- en 47213.662319603434 -365218.9961895874
+ en 47213.66231960332 -365218.9961895874
ll2 -3.2951846049188407 136.93037430699187
EPSG:2515
ll 83.86795839934476 138.14290938655807
- en 394636.9060681175 9325249.31299703
- ll2 83.86795839750863 138.14290970364272
+ en 394636.90606811736 9325249.31299703
+ ll2 83.86795839750863 138.1429097036427
EPSG:2516
ll 4.587619945517062 146.50348250941877
- en -222569.44447686337 510644.244059177
- ll2 4.587619945154026 146.50348251785545
+ en -222569.44447686337 510644.2440591771
+ ll2 4.587619945154027 146.5034825178555
EPSG:2517
ll -74.29946507538024 153.54160970125852
en 335133.16459980875 -8256368.008021508
ll2 -74.29946505028404 153.54160960526633
EPSG:2518
ll 46.1867732378509 163.404833289598
- en 376704.1581517369 5118173.938233108
- ll2 46.18677323748743 163.40483328835666
+ en 376704.1581517391 5118173.938233108
+ ll2 46.18677323748744 163.40483328835674
EPSG:2519
ll 29.925955056482337 176.82296927989503
en 1062588.3206493906 3326294.5225962657
- ll2 29.925955057783256 176.82296927296755
+ ll2 29.92595505778324 176.82296927296753
EPSG:2520
ll -64.80761706437306 177.39124245729104
- en 518438.9483188683 -7190018.688810519
- ll2 -64.8076170487472 177.3912423783075
+ en 518438.9483188669 -7190018.68881052
+ ll2 -64.8076170487472 177.39124237830754
EPSG:2521
ll -9.056336320433005 -179.65761618374867
- en 207546.87050473463 -1002494.259125301
- ll2 -9.056336308581104 -179.65761620334817
+ en 207546.87050473772 -1002494.2591253011
+ ll2 -9.056336308581105 -179.65761620334817
EPSG:2522
ll -1.4288861704790747 -169.4431994992241
en 673104.5046939866 -157989.46929779567
- ll2 -1.428886157487686 -169.44319952176696
+ ll2 -1.4288861574876857 -169.44319952176696
EPSG:2523
ll -24.08291712799742 26.465055230987502
- en 8056414.302787153 -2675269.7981756707
- ll2 -24.082917113675748 26.465055253789014
+ en 8056414.302787152 -2675269.7981756707
+ ll2 -24.08291711367575 26.465055253789007
EPSG:25231
ll 12.574445920236812 -4.872901138443778
en -357659.0387322956 1402839.6971055996
@@ -2947,51 +2947,51 @@ EPSG:2525
EPSG:2526
ll 30.56489022226694 35.20927866643551
en 1.1000204756384999E7 3394426.178805838
- ll2 30.56489022177395 35.20927867011044
+ ll2 30.564890221773943 35.20927867011045
EPSG:2527
ll 32.86067786997812 25.93187123882756
- en 1.083784200035939E7 3659640.7650618367
- ll2 32.86067786634976 25.931871242597616
+ en 1.083784200035939E7 3659640.765061837
+ ll2 32.860677866349796 25.931871242597616
EPSG:2528
ll 76.8008867028654 42.586266766823385
en 1.2667742811392674E7 8537466.506976154
- ll2 76.80088670078554 42.58626675387202
+ ll2 76.80088670078553 42.58626675387202
EPSG:2529
ll -55.69155312440348 31.107524418536673
en 1.3004321767442817E7 -6202494.685737615
- ll2 -55.69155308399129 31.107524534845147
+ ll2 -55.691553083991295 31.107524534845147
EPSG:2530
ll 1.5896389411114313 46.98427764314668
- en 1.5055437932807064E7 176534.3905815974
- ll2 1.5896389427903792 46.98427764414051
+ en 1.5055437932807066E7 176534.39058159737
+ ll2 1.589638942790379 46.984277644140526
EPSG:2531
ll 69.17777820957133 39.01251602994325
en 1.5262813438274544E7 7688950.251547163
- ll2 69.17777820704082 39.01251604149566
+ ll2 69.17777820704082 39.01251604149565
EPSG:2532
ll -16.697115489146185 45.33023406749671
- en 1.6215252034697244E7 -1848616.3470126088
- ll2 -16.69711548172447 45.33023407618785
+ en 1.6215252034697244E7 -1848616.3470126095
+ ll2 -16.69711548172448 45.33023407618786
EPSG:2533
ll -64.1447608425608 50.52236458077951
en 1.7476837975593757E7 -7116073.664805962
- ll2 -64.14476081788989 50.52236463042255
+ ll2 -64.1447608178899 50.52236463042255
EPSG:2534
ll -3.044127127077701 55.43155207745188
en 1.865922976257577E7 -336624.35904764506
ll2 -3.0441271262573815 55.43155207866939
EPSG:2535
ll 68.94997639279902 57.95651349259722
- en 1.9538452247189973E7 7652211.339575334
- ll2 68.94997639321697 57.95651349037189
+ en 1.9538452247189973E7 7652211.339575335
+ ll2 68.94997639321699 57.95651349037189
EPSG:2536
ll 9.613189773670129 51.554267062104806
- en 1.95698036952015E7 1074670.7855435784
- ll2 9.613189768330933 51.55426709944959
+ en 1.95698036952015E7 1074670.785543579
+ ll2 9.613189768330939 51.55426709944959
EPSG:2537
ll 4.431903604296721 59.18613240761719
- en 2.1076453657421954E7 491240.9816460709
- ll2 4.431903603092952 59.18613240690384
+ en 2.1076453657421954E7 491240.981646071
+ ll2 4.431903603092952 59.18613240690385
EPSG:2538
ll -10.275245062766274 62.67345170452915
en 2.213544961043281E7 -1138102.5223465674
@@ -2999,39 +2999,39 @@ EPSG:2538
EPSG:2539
ll -80.33526495314251 62.28316462212984
en 2.3374388904233836E7 -8929860.870896729
- ll2 -80.33526492201605 62.28316477290523
+ ll2 -80.33526492201604 62.28316477290523
EPSG:25391
ll 28.302859762217736 113.08403817283646
- en 115601.86648926174 3138147.309327636
- ll2 28.30285975392922 113.08403817862197
+ en 115601.8664892618 3138147.309327637
+ ll2 28.30285975392923 113.08403817862198
EPSG:25392
ll -27.339281788646723 109.25225088436483
- en -467413.4191832697 -3063080.9572692066
- ll2 -27.339281770307878 109.25225089557027
+ en -467413.41918326693 -3063080.9572692066
+ ll2 -27.33928177030789 109.2522508955703
EPSG:25393
ll 62.839210082528695 122.9234261334879
en 597829.3290246729 6971597.447996172
ll2 62.83921003201825 122.92342620918109
EPSG:25394
ll 0.6845887792718486 125.06293369341127
- en 729516.1991990204 75795.53123479032
+ en 729516.1991990189 75795.53123479034
ll2 0.6845887859341726 125.06293367568533
EPSG:25395
ll -81.52563360920517 128.64556397095726
- en 559805.7218005056 -9056886.589142757
- ll2 -81.52563359620947 128.64556412885412
+ en 559805.7218005063 -9056886.58914276
+ ll2 -81.5256335962095 128.6455641288542
EPSG:2540
ll -55.2398949648245 67.50032949422553
en 2.421390992081475E7 -6133126.77471391
ll2 -55.23989494135363 67.50032951467196
EPSG:2541
ll 35.17012407198584 80.59944422626928
- en 2.6010419134714235E7 3907917.409896903
- ll2 35.170124070994966 80.59944422352085
+ en 2.6010419134714235E7 3907917.4098969037
+ ll2 35.170124070994966 80.59944422352088
EPSG:2542
ll -56.31672444900602 79.27824609980148
- en 2.6579128510054123E7 -6244511.545704885
- ll2 -56.316724425683304 79.27824611276357
+ en 2.6579128510054123E7 -6244511.545704886
+ ll2 -56.316724425683304 79.27824611276358
EPSG:2543
ll 74.49880973616874 76.60325853137343
en 2.7368943452154398E7 8275881.731361681
@@ -3039,71 +3039,71 @@ EPSG:2543
EPSG:2544
ll -81.1777980214813 86.40948441648244
en 2.8541285639864728E7 -9017519.35652391
- ll2 -81.17779798539141 86.40948446711303
+ ll2 -81.17779798539142 86.40948446711305
EPSG:2545
ll -84.84841414201381 86.76871833944176
- en 2.9497698721878007E7 -9426599.646392183
- ll2 -84.84841410500061 86.76871842832324
+ en 2.9497698721878007E7 -9426599.646392185
+ ll2 -84.84841410500063 86.76871842832324
EPSG:2546
ll 29.284229676956826 98.00386773366697
- en 3.1279073477527823E7 3267554.6405424415
- ll2 29.284229668670424 98.00386773823624
+ en 3.1279073477527823E7 3267554.6405424406
+ ll2 29.284229668670417 98.00386773823622
EPSG:2547
ll -27.618723101089643 99.81835285380639
en 3.217391509186744E7 -3074750.8520229785
- ll2 -27.61872309462265 99.8183528577178
+ ll2 -27.618723094622656 99.8183528577178
EPSG:2548
ll 35.956846072109315 88.46530501830193
- en 3.1819664016997933E7 4007160.1515101055
- ll2 35.956846063992764 88.46530501771227
+ en 3.1819664016997933E7 4007160.1515101045
+ ll2 35.956846063992764 88.46530501771225
EPSG:2549
ll -26.6665858996081 102.75184788282775
- en 3.3873616789030425E7 -2956098.318967189
- ll2 -26.666585896263555 102.75184788279198
+ en 3.3873616789030425E7 -2956098.31896719
+ ll2 -26.666585896263562 102.75184788279196
EPSG:2551
ll -27.5203865257283 93.48498567092848
en 3.365694459105808E7 -3074292.9831261076
- ll2 -27.520386511849974 93.48498566672893
+ ll2 -27.520386511849974 93.48498566672896
EPSG:2552
ll 87.58253211199207 98.95579856705686
en 3.547157261737917E7 9733475.313824262
ll2 87.5825321078303 98.95579857994368
EPSG:2553
ll 21.380154996597497 106.27858390667761
- en 3.632142160499102E7 2366206.5865568216
+ en 3.632142160499102E7 2366206.586556822
ll2 21.38015499439486 106.27858390815719
EPSG:2554
ll -9.820978700469126 119.71451281665753
- en 3.8459427262160234E7 -1098490.418253228
- ll2 -9.820978696205625 119.71451277131966
+ en 3.8459427262160234E7 -1098490.4182532283
+ ll2 -9.820978696205628 119.71451277131972
EPSG:2555
ll -25.59201253525407 110.19112310964255
- en 3.811711456435516E7 -2837057.2883888795
- ll2 -25.592012532090585 110.19112310888835
+ en 3.8117114564355165E7 -2837057.2883888795
+ ll2 -25.592012532090585 110.1911231088884
EPSG:2556
ll 83.12509860838207 110.56778285001751
- en 3.941414437232984E7 9238933.365030034
- ll2 83.12509860621164 110.56778286523807
+ en 3.941414437232984E7 9238933.365030035
+ ll2 83.12509860621168 110.567782865238
EPSG:2557
ll 17.525829885410246 117.09394546492187
- en 4.019124401504253E7 1940925.888929342
- ll2 17.525829882587086 117.09394546808284
+ en 4.019124401504253E7 1940925.8889293426
+ ll2 17.52582988258709 117.09394546808284
EPSG:2558
ll -19.563231072893004 115.07484241903377
en 4.066622958814527E7 -2183330.3686933797
- ll2 -19.56323106760213 115.074842419991
+ ll2 -19.563231067602143 115.074842419991
EPSG:2559
ll -36.931258833377406 134.9240060899168
en 4.3295867146571204E7 -4126233.3051938023
- ll2 -36.93125879562349 134.92400603868214
+ ll2 -36.931258795623485 134.92400603868217
EPSG:2560
ll -88.18808587067481 130.28197889538893
- en 4.350444768583711E7 -9799684.833479272
- ll2 -88.18808583741675 130.2819782839704
+ en 4.350444768583711E7 -9799684.833479274
+ ll2 -88.18808583741678 130.28197828397043
EPSG:2561
ll 14.257252157816183 122.26648581889813
- en 4.344504049139246E7 1599102.38092994
- ll2 14.257252138726344 122.26648588781994
+ en 4.344504049139246E7 1599102.3809299406
+ ll2 14.257252138726347 122.26648588781993
EPSG:2562
ll 60.41294078671763 130.5545811537176
en 4.525508125862914E7 6708392.8936525285
@@ -3111,86 +3111,86 @@ EPSG:2562
EPSG:2563
ll 10.551420592041453 143.05751420010364
en 4.705410438910463E7 1171405.0988584429
- ll2 10.551420590698758 143.0575142004315
+ ll2 10.55142059069876 143.05751420043148
EPSG:2564
ll 81.38566215928253 149.42266048888567
en 4.7640323198079646E7 9050144.524260981
- ll2 81.38566215708842 149.42266026929468
+ ll2 81.38566215708842 149.42266026929465
EPSG:2565
ll -13.74144222736544 150.28455871036502
- en 4.9180794840946406E7 -1528567.319201905
- ll2 -13.741442220992328 150.2845587013929
+ en 4.9180794840946406E7 -1528567.3192019053
+ ll2 -13.741442220992333 150.2845587013929
EPSG:2566
ll 49.4744490951673 152.70217980124053
- en 4.991303646282842E7 5498106.248091986
- ll2 49.47444909177136 152.702179801929
+ en 4.991303646282842E7 5498106.248091988
+ ll2 49.474449091771376 152.702179801929
EPSG:2567
ll -80.64191612714568 143.98783056139877
en 5.0390884164647415E7 -8962525.629530026
- ll2 -80.64191609868084 143.98783042027617
+ ll2 -80.64191609868085 143.98783042027617
EPSG:2568
ll 76.4568709152183 150.39280041052706
en 5.1431722812485956E7 8491141.418541618
ll2 76.45687091421718 150.39280040539555
EPSG:2569
ll 12.68281395497597 165.91682812024163
- en 5.358195624502289E7 1423408.4869413231
- ll2 12.68281394034121 165.91682802180267
+ en 5.358195624502289E7 1423408.4869413234
+ ll2 12.68281394034121 165.9168280218027
EPSG:2570
ll -17.890606189263394 159.7159335343415
- en 5.357572127229332E7 -1978964.267373732
- ll2 -17.890606179889943 159.71593352248368
+ en 5.3575721272293314E7 -1978964.267373732
+ ll2 -17.890606179889947 159.71593352248365
EPSG:2571
ll -24.6032258073636 170.87192821317143
- en 5.540070267707606E7 -2751251.3348347056
- ll2 -24.603225782708176 170.8719281952613
+ en 5.540070267707605E7 -2751251.334834706
+ ll2 -24.60322578270819 170.87192819526123
EPSG:2572
ll -83.97102796979175 167.14527988969508
en 5.552502539319128E7 -9329162.016784878
- ll2 -83.97102795317943 167.14527956068036
+ ll2 -83.97102795317943 167.14527956068045
EPSG:2573
ll 59.13533024163792 173.06171422154958
en 5.678945872332412E7 6568832.8272906635
- ll2 59.13533023996373 173.0617142138452
+ ll2 59.13533023996372 173.06171421384522
EPSG:2574
ll 51.87361786279013 163.2755310535014
en 5.6968240626444735E7 5777650.375873885
- ll2 51.87361784309776 163.27553109818126
+ ll2 51.87361784309777 163.2755310981813
EPSG:2575
ll 50.22429375060233 164.58600571845764
en 5.78286040254852E7 5608460.585275011
- ll2 50.224293692640664 164.58600598222796
+ ll2 50.224293692640664 164.586005982228
EPSG:2576
ll -29.55161720413713 176.7963694479557
- en 5.94801021451605E7 -3270408.9049474173
- ll2 -29.551617188673625 176.79636942065034
+ en 5.94801021451605E7 -3270408.9049474183
+ ll2 -29.551617188673642 176.79636942065034
EPSG:2578
ll 47.070391171187765 -170.97971857527511
en 6.19570585487351E7 5232811.943945706
- ll2 47.07039117005541 -170.97971859163846
+ ll2 47.070391170055395 -170.97971859163843
EPSG:2579
ll -6.448630578849091 -174.36120858836497
en 6.245987415707603E7 -713038.5013550952
ll2 -6.448630566232371 -174.36120860996832
EPSG:2580
ll 40.11632904323787 -168.5928623575982
- en 6.3705053908513814E7 4445349.91798435
+ en 6.3705053908513814E7 4445349.917984349
ll2 40.11632904805051 -168.5928623729707
EPSG:2581
ll -33.39221889523619 -161.36562387641968
- en 6.511764520100705E7 -3715994.9767659544
- ll2 -33.392218877150256 -161.36562391495022
+ en 6.5117645201007046E7 -3715994.9767659544
+ ll2 -33.392218877150256 -161.36562391495028
EPSG:2582
ll -19.3206393430182 20.770216345167597
- en 475967.123945636 -2137117.650464625
- ll2 -19.32063932941813 20.770216367940783
+ en 475967.123945636 -2137117.6504646256
+ ll2 -19.320639329418135 20.770216367940783
EPSG:25828
ll 47.117782320935554 -16.503525409604464
en 385946.00340927154 5219349.635452863
- ll2 47.1177823209345 -16.503525409605253
+ ll2 47.117782320934495 -16.503525409605253
EPSG:25829
ll 65.82806470287636 -9.554928597345642
- en 474644.50820229325 7300857.887815192
+ en 474644.50820229325 7300857.887815191
ll2 65.82806470287636 -9.554928597345642
EPSG:2583
ll -65.14179552810657 18.18454310938735
@@ -3203,7 +3203,7 @@ EPSG:25830
EPSG:25831
ll 15.703714685419541 1.9029805492944067
en 382450.59362736467 1736467.0083671543
- ll2 15.70371468541952 1.90298054929462
+ ll2 15.703714685419522 1.90298054929462
EPSG:25832
ll 43.42381791085779 9.690565246887022
en 555898.5039359011 4808112.36517349
@@ -3219,14 +3219,14 @@ EPSG:25834
EPSG:25835
ll 42.57574419494572 31.562543802846626
en 874467.6530367588 4723802.227199722
- ll2 42.575744194251115 31.56254380306236
+ ll2 42.57574419425112 31.56254380306236
EPSG:25836
ll 28.15042601064217 29.551501695152517
en 161292.70745459135 3118678.7016910748
ll2 28.150426010596412 29.551501695058228
EPSG:25837
ll 36.3487499992021 40.79948792586663
- en 661474.4463378746 4024134.254394948
+ en 661474.4463378747 4024134.254394948
ll2 36.348749999200265 40.79948792586979
EPSG:25838
ll 31.188113573425966 46.337070725825676
@@ -3234,264 +3234,264 @@ EPSG:25838
ll2 31.18811357342576 46.33707072582627
EPSG:2584
ll -5.456855283031189 36.62236109008549
- en 1571446.699204973 -611937.7984803327
- ll2 -5.456855269083538 36.62236097324564
+ en 1571446.699204973 -611937.7984803328
+ ll2 -5.456855269083537 36.622360973245634
EPSG:2585
ll -44.76933219719004 39.07725636126218
- en 1218723.928716787 -4999550.122956486
- ll2 -44.769332137297866 39.077256260247175
+ en 1218723.928716787 -4999550.122956488
+ ll2 -44.769332137297894 39.077256260247175
EPSG:2586
ll -53.65157206520627 39.82045502067572
- en 950786.5812715198 -5968781.351065868
- ll2 -53.65157203531357 39.82045504370399
+ en 950786.5812715202 -5968781.3510658685
+ ll2 -53.651572035313585 39.820455043704
EPSG:2587
ll -65.98574977428578 32.81787519271253
- en 355594.22087102383 -7324943.2737523075
- ll2 -65.9857497543041 32.817875266153365
+ en 355594.22087102325 -7324943.273752309
+ ll2 -65.9857497543041 32.81787526615335
EPSG:2588
ll -48.371134567725804 41.662990230906175
en 697395.489109714 -5363100.150587193
- ll2 -48.371134548276274 41.66299026165756
+ ll2 -48.37113454827629 41.66299026165756
EPSG:25884
ll -60.934647934941054 24.531204866433722
en 528789.4482289458 -6755624.827708898
- ll2 -60.934647934941644 24.531204866433725
+ ll2 -60.93464793494165 24.53120486643373
EPSG:2589
ll 24.764029612885807 35.22219563634772
- en -186466.5578022179 2757077.319760711
- ll2 24.764029611400513 35.22219563645076
+ en -186466.55780221778 2757077.319760711
+ ll2 24.76402961140052 35.222195636450756
EPSG:2590
ll -35.484052126617314 47.21355234293444
- en 700984.8728841615 -3930494.4115501135
- ll2 -35.484052112139565 47.21355235952822
+ en 700984.8728841635 -3930494.4115501135
+ ll2 -35.48405211213955 47.21355235952825
EPSG:2591
ll 83.17257238029697 42.727870416612234
en 430212.4598757685 9242702.589078924
- ll2 83.17257237845344 42.72787044569773
+ ll2 83.17257237845344 42.727870445697754
EPSG:2592
ll -54.18350660300837 41.8544538278816
- en -96204.14289986459 -6045043.623814075
+ en -96204.14289986494 -6045043.623814075
ll2 -54.18350653290242 41.854454111045264
EPSG:2593
ll 20.744098357894714 55.31680777292215
en 637231.573374152 2295388.2088723546
- ll2 20.74409835647358 55.31680777022625
+ ll2 20.744098356473575 55.31680777022626
EPSG:25932
ll -6.565592715628142 5.901347999295151
- en 157245.10076296882 9273312.318018548
- ll2 -6.565592714140436 5.901347999118733
+ en 157245.10076296894 9273312.318018548
+ ll2 -6.565592714140436 5.901347999118734
EPSG:2594
ll -3.1907379444460844 63.03709298376319
- en 1172328.739949882 -354707.8718418142
- ll2 -3.190737944965305 63.03709297759418
+ en 1172328.739949882 -354707.87184181425
+ ll2 -3.1907379449653046 63.03709297759418
EPSG:2595
ll 34.642305029380935 55.528746107684384
- en 89988.45977959619 3844094.204070625
- ll2 34.64230502833044 55.528746103188624
+ en 89988.4597795973 3844094.2040706235
+ ll2 34.64230502833042 55.52874610318864
EPSG:2596
ll 40.873278691621096 54.79733268097264
- en -191714.960685594 4559096.062505595
- ll2 40.8732786714867 54.797332706745394
+ en -191714.96068559424 4559096.062505594
+ ll2 40.87327867148669 54.797332706745394
EPSG:2597
ll 24.568512279738954 60.78671997565759
- en -28521.425162067986 2728351.930479434
+ en -28521.425162067986 2728351.9304794334
ll2 24.568512277813852 60.78671997092873
EPSG:2598
ll 47.88883357609515 74.37666499862185
en 902098.6561407298 5320136.248514811
- ll2 47.88883357596197 74.3766649928355
+ ll2 47.88883357596197 74.37666499283549
EPSG:2599
ll -49.95441952811195 80.9418246570583
- en 1141292.6206247236 -5574166.2842938835
- ll2 -49.95441946566143 80.9418245041068
+ en 1141292.6206247238 -5574166.284293883
+ ll2 -49.95441946566141 80.94182450410682
EPSG:2601
ll -65.97977845993564 69.66217670685195
en 257715.31100896053 -7330875.88137654
- ll2 -65.97977843042945 69.6621767425401
+ ll2 -65.97977843042948 69.6621767425401
EPSG:2602
ll 22.780880912161052 70.1868434853352
- en -304028.71173068066 2541661.0584263024
- ll2 22.78088090564543 70.18684347746277
+ en -304028.71173068066 2541661.058426303
+ ll2 22.780880905645432 70.18684347746282
EPSG:2603
ll -1.3487821311642136 77.95613151381049
- en 161112.47704725259 -149269.05698810308
+ en 161112.47704725259 -149269.0569881031
ll2 -1.3487821344102822 77.9561315121323
EPSG:2604
ll -18.013393580672954 77.38403295803019
- en -201870.64379281516 -2004947.789479853
- ll2 -18.013393578365132 77.38403295927735
+ en -201870.64379281516 -2004947.7894798524
+ ll2 -18.01339357836513 77.38403295927735
EPSG:2605
ll -25.184916742357586 81.49619876543132
- en -55320.89319337276 -2797825.457656085
- ll2 -25.184916738119373 81.49619876563706
+ en -55320.89319337276 -2797825.457656084
+ ll2 -25.184916738119366 81.49619876563706
EPSG:2606
ll 40.8447831743741 98.61981402990463
en 1227328.5355187673 4559306.692577445
- ll2 40.844783150330976 98.61981397853026
+ ll2 40.844783150330976 98.61981397853025
EPSG:2607
ll -52.72422119841161 95.25765634442013
- en 652520.9572219893 -5846260.37678637
- ll2 -52.724221177719635 95.25765634663144
+ en 652520.9572219892 -5846260.376786372
+ ll2 -52.72422117771965 95.25765634663142
EPSG:2608
ll -43.95383465003912 91.08715409514825
- en 105615.3359528496 -4880369.966073804
+ en 105615.33595284953 -4880369.966073804
ll2 -43.95383463442552 91.08715409767008
EPSG:2609
ll -4.8346552087490124 101.65731136133937
- en 794844.0531111688 -535096.244117014
+ en 794844.0531111688 -535096.2441170141
ll2 -4.834655212860132 101.65731136154994
EPSG:2610
ll 15.13022651617635 109.17514883654675
- en 1272945.7340158317 1686145.5204761317
+ en 1272945.7340158331 1686145.5204761317
ll2 15.130226510790797 109.17514883329328
EPSG:2611
ll 34.383092873996404 96.95467956142511
- en -240818.6900905755 3835694.089944386
- ll2 34.38309286296314 96.95467956471968
+ en -240818.6900905742 3835694.089944385
+ ll2 34.38309286296313 96.9546795647197
EPSG:2612
ll -17.53332374237968 111.63360719525063
en 885981.5046139203 -1942938.911553342
- ll2 -17.533323742731064 111.63360719533205
+ ll2 -17.533323742731067 111.63360719533205
EPSG:2613
ll -26.111897811912208 104.9467284439791
- en -106216.96382572455 -2903277.622441005
- ll2 -26.111897807678854 104.94672844161474
+ en -106216.96382572316 -2903277.622441006
+ ll2 -26.111897807678876 104.94672844161478
EPSG:2614
ll 1.457227101660834 107.29371411285028
- en -248076.75708098698 162326.7958722028
- ll2 1.4572270970546966 107.29371412558633
+ en -248076.75708098698 162326.79587220278
+ ll2 1.4572270970546963 107.29371412558633
EPSG:2615
ll -20.432734287908275 124.97828487592332
en 1334583.9079023744 -2280571.1305069607
- ll2 -20.43273428050881 124.97828487485019
+ ll2 -20.432734280508807 124.97828487485016
EPSG:2616
ll -22.10033521293191 116.06413435293213
- en 93551.97889270209 -2450089.0667907894
+ en 93551.97889270209 -2450089.06679079
ll2 -22.100335210883774 116.06413435221538
EPSG:2617
ll -80.4630760046708 113.3409791509923
en 321993.3623538136 -8951692.543471335
- ll2 -80.4630759689451 113.34097981912339
+ ll2 -80.4630759689451 113.3409798191234
EPSG:2618
ll 47.444470481315165 121.78519920403095
- en 182058.8676645005 5265325.64273616
- ll2 47.44447048306646 121.78519920886706
+ en 182058.86766450258 5265325.642736161
+ ll2 47.44447048306647 121.78519920886708
EPSG:2619
ll 85.53687454431793 129.80938959862468
- en 506970.7171267053 9503559.364782939
- ll2 85.53687454132505 129.8093895763053
+ en 506970.71712670557 9503559.364782939
+ ll2 85.53687454132505 129.80938957630534
EPSG:26191
ll 68.87310352589634 -73.29718117210146
- en -2788816.079880812 5695674.228553689
- ll2 68.87310349947619 -73.29718111778953
+ en -2788816.0798808136 5695674.228553689
+ ll2 68.87310349947616 -73.29718111778952
EPSG:26192
ll 20.40343762220704 -10.807588430207261
- en -71410.72990018106 -720234.873429688
+ en -71410.72990018118 -720234.8734296852
ll2 20.40343764566362 -10.807588450171831
EPSG:26194
ll 41.220958185431535 -14.654224101868053
en 395727.9713862339 2125836.0119044185
- ll2 41.22095817956039 -14.654224098098783
+ ll2 41.220958179560384 -14.654224098098782
EPSG:26195
ll 17.461795708425328 -72.76336744454878
- en -5440315.012012493 1430121.885863461
- ll2 17.46179570359363 -72.76336744139545
+ en -5440315.012012496 1430121.885863461
+ ll2 17.4617957035936 -72.76336744139549
EPSG:2620
ll -10.491519805317708 123.19250524803388
- en -467853.7209542132 -1173769.4442779904
- ll2 -10.491519799621058 123.19250529565102
+ en -467853.7209542148 -1173769.4442779906
+ ll2 -10.49151979962106 123.192505295651
EPSG:2621
ll 9.457629277495258 134.67612525597895
en 464326.4658479281 1045952.7474066583
- ll2 9.457629275265592 134.67612525867779
+ ll2 9.457629275265594 134.67612525867779
EPSG:2622
ll -46.947827918510136 137.3625026249479
- en 451355.10577814863 -5201604.082636493
- ll2 -46.947827900099284 137.3625026084628
+ en 451355.1057781508 -5201604.082636493
+ ll2 -46.94782790009927 137.36250260846282
EPSG:2623
ll -30.02971535895452 138.52592904830962
- en 261197.74850729742 -3325928.8251866973
- ll2 -30.029715349265 138.5259290406636
+ en 261197.74850730013 -3325928.8251866964
+ ll2 -30.029715349265 138.52592904066367
EPSG:26237
ll 56.21062800813647 48.573918915961094
- en 1092855.495728069 6270722.529778585
+ en 1092855.495728069 6270722.529778586
ll2 56.21062777527564 48.57391838181316
EPSG:2624
ll 26.247404523477456 135.46202059956016
en -355059.52678547404 2932624.6118445713
- ll2 26.247404512645776 135.46202059886664
+ ll2 26.247404512645772 135.46202059886667
EPSG:2625
ll 10.538753713282759 153.95727932180876
en 1263135.5940100201 1174024.8195038077
- ll2 10.538753712581485 153.9572793112953
+ ll2 10.538753712581485 153.95727931129525
EPSG:2626
ll 39.775649207128424 140.47625100918947
- en -316726.97779827623 4448332.771993577
- ll2 39.77564916469675 140.4762511426054
+ en -316726.97779828124 4448332.771993577
+ ll2 39.775649164696745 140.47625114260535
EPSG:2627
ll 16.666907552299335 148.5613216599257
en 25979.678909551993 1848792.6298299101
- ll2 16.666907551400072 148.56132166120946
+ ll2 16.666907551400072 148.5613216612095
EPSG:2628
ll -15.73519586129892 150.18915137094638
en -123841.92976164259 -1748879.0489141017
- ll2 -15.735195854531394 150.18915136521122
+ ll2 -15.735195854531394 150.1891513652112
EPSG:2629
ll 74.83264908380073 151.89068568355225
- en 292622.1441399441 8320770.467937095
- ll2 74.83264908062377 151.89068572123367
+ en 292622.1441399451 8320770.467937097
+ ll2 74.8326490806238 151.8906857212337
EPSG:2630
ll 5.8419821647655965 152.77904657572083
- en -525707.1899196317 654526.8487662624
- ll2 5.841982159744379 152.7790466644097
+ en -525707.1899196317 654526.8487662623
+ ll2 5.8419821597443775 152.7790466644097
EPSG:2631
ll 28.47537847400379 157.5181140244732
- en -233974.40105258801 3174140.448303992
+ en -233974.40105258801 3174140.448303991
ll2 28.475378468634673 157.51811401904592
EPSG:2632
ll -69.57224985199848 167.32144004720018
- en 473413.3882483017 -7721473.252303103
- ll2 -69.57224983272633 167.32143995776107
+ en 473413.3882483006 -7721473.252303103
+ ll2 -69.57224983272633 167.32143995776102
EPSG:2633
ll 88.08204232923785 165.14353623753203
en 478010.293469913 9788974.003618883
ll2 88.08204232717162 165.14353610919926
EPSG:26331
ll -84.66429108854538 12.42013205910514
- en 597450.6604911748 -9410080.577676823
- ll2 -84.66429110686524 12.420131078712918
+ en 597450.660491175 -9410080.577676822
+ ll2 -84.66429110686524 12.4201310787129
EPSG:26332
ll -62.66478932246838 7.95534407222938
- en 446561.5148264497 -6948640.724526645
- ll2 -62.6647892105177 7.9553439948420355
+ en 446561.5148264497 -6948640.724526647
+ ll2 -62.66478921051771 7.9553439948420355
EPSG:2634
ll 49.81300161417016 164.44986126005142
- en -186969.7435401769 5564071.4101407295
- ll2 49.81300155191423 164.44986155516543
+ en -186969.74354017887 5564071.410140731
+ ll2 49.81300155191426 164.4498615551654
EPSG:2635
ll -50.896712079496886 179.61400965778003
- en 683739.627529159 -5643882.932293583
- ll2 -50.89671206295969 179.61400960841368
+ en 683739.627529159 -5643882.932293584
+ ll2 -50.89671206295972 179.61400960841564
EPSG:2636
ll -22.460077208691672 176.9028789361442
en 180945.16405783826 -2488010.989548092
- ll2 -22.460077194556227 176.902878912726
+ ll2 -22.460077194556238 176.90287891272604
EPSG:2637
ll 14.925729067893812 -171.73440894235344
- en 1067048.5996570964 1657589.6792933538
+ en 1067048.5996570964 1657589.679293354
ll2 14.925729076490468 -171.73440896035765
EPSG:2638
ll -36.967432421880275 -164.6346783184314
- en 1334863.1421920515 -4134155.32320932
- ll2 -36.96743237492715 -164.63467843475038
+ en 1334863.142192054 -4134155.32320932
+ ll2 -36.96743237492715 -164.63467843475033
EPSG:2639
ll 78.38458077674375 -169.77282061532986
en 527441.9713034007 8705214.312090052
- ll2 78.38458077724236 -169.77282064426134
+ ll2 78.38458077724236 -169.77282064426132
EPSG:26391
ll -86.5566724157377 8.323113713364929
- en 256443.93876501056 -1.0057798379282558E7
- ll2 -86.55667244372016 8.323113045675832
+ en 256443.93876501048 -1.005779837928256E7
+ ll2 -86.55667244372019 8.323113045675832
EPSG:26392
ll -19.883234682325536 -1.015442582279725
en -329161.0436453398 -2669579.489576796
@@ -3499,11 +3499,11 @@ EPSG:26392
EPSG:26393
ll -22.570291232330874 19.6793167631372
en 1849970.903759054 -2956437.144054372
- ll2 -22.570291187063617 19.679316757904278
+ ll2 -22.57029118706361 19.679316757904278
EPSG:2640
ll 50.2100095073084 -175.38403831481935
en -26993.68847637961 5590500.856726381
- ll2 50.21000949430915 -175.38403829945693
+ ll2 50.21000949430913 -175.38403829945693
EPSG:2641
ll -86.43717482869363 14.751661213672952
en 7456845.559967572 -9606518.619630426
@@ -3514,52 +3514,52 @@ EPSG:2642
ll2 22.338414724518827 22.94372517127119
EPSG:2643
ll 12.172645751260447 22.3388232035539
- en 8992316.342262827 1350640.6508244774
- ll2 12.172645757707189 22.33882321600528
+ en 8992316.342262825 1350640.6508244774
+ ll2 12.172645757707185 22.338823216005256
EPSG:2644
ll -66.76792357206386 38.99061444630655
en 1.0894917111082224E7 -7437066.239719851
- ll2 -66.76792352718726 38.990614205969166
+ ll2 -66.76792352718725 38.99061420596915
EPSG:2645
ll 26.577875775059624 33.10342826718332
en 1.1510423364604447E7 2940963.4078367525
- ll2 26.577875776757907 33.1034282720365
+ ll2 26.577875776757907 33.10342827203651
EPSG:2646
ll 30.938369281166047 34.91680973237209
en 1.2396597847706039E7 3424743.5694109215
- ll2 30.938369282178783 34.91680973602506
+ ll2 30.938369282178776 34.91680973602505
EPSG:2647
ll 62.32411602335293 38.62384381365643
en 1.3480615080804272E7 6913209.930702152
- ll2 62.32411602313799 38.62384381629547
+ ll2 62.324116023138 38.62384381629546
EPSG:2648
ll 25.82084376936035 49.71858797530396
en 1.5275511225191087E7 2879918.9599552816
- ll2 25.820843764084486 49.71858798021179
+ ll2 25.820843764084483 49.71858798021179
EPSG:2649
ll 66.35475348114304 45.47037489438358
- en 1.5521168251751503E7 7362566.844523662
- ll2 66.35475348093745 45.47037489576985
+ en 1.5521168251751505E7 7362566.844523662
+ ll2 66.35475348093749 45.470374895769886
EPSG:2650
ll -60.64509232081133 56.81352997659387
en 1.6981311292775106E7 -6758304.9133629
ll2 -60.64509226378218 56.8135297914289
EPSG:2651
ll -8.035168016314216 53.620925592802784
- en 1.778911109677013E7 -889387.8256065182
- ll2 -8.035168012535564 53.62092559665666
+ en 1.778911109677013E7 -889387.8256065181
+ ll2 -8.035168012535564 53.62092559665665
EPSG:2652
ll -62.48219015931901 62.71208243568647
- en 1.8948375675488085E7 -6960979.300333168
- ll2 -62.48219010602214 62.71208226027937
+ en 1.8948375675488085E7 -6960979.300333169
+ ll2 -62.48219010602215 62.71208226027936
EPSG:2653
ll 9.938807005311133 50.456970966734794
en 1.878109978786265E7 1106278.0640374857
- ll2 9.938807005252833 50.45697097435064
+ ll2 9.938807005252832 50.45697097435064
EPSG:2654
ll -2.0663229652988946 58.71358119826691
- en 2.0356959329954177E7 -228459.82290261937
- ll2 -2.0663229640253373 58.713581199585875
+ en 2.0356959329954177E7 -228459.8229026194
+ ll2 -2.0663229640253378 58.71358119958589
EPSG:2655
ll -88.55091175558908 56.13146629815237
en 2.1480726167760905E7 -9841334.222134262
@@ -3567,27 +3567,27 @@ EPSG:2655
EPSG:2656
ll -7.077358961917952 66.42813226866801
en 2.254737083928684E7 -782554.3535465861
- ll2 -7.077358960918024 66.42813226945502
+ ll2 -7.077358960918024 66.428132269455
EPSG:2657
ll 4.09286316394595 63.77610056228646
en 2.2919215629134245E7 454548.3023711384
- ll2 4.092863163278283 63.77610056396479
+ ll2 4.092863163278285 63.77610056396479
EPSG:2658
ll 14.21641551543783 63.414018394092786
en 2.3570276163436424E7 1589570.8296433885
- ll2 14.216415507501834 63.41401841619894
+ ll2 14.216415507501834 63.41401841619895
EPSG:2659
ll -81.12947671137046 66.3160810081921
en 2.535104284167755E7 -9022464.628339304
- ll2 -81.12947668131613 66.31608139714926
+ ll2 -81.12947668131612 66.31608139714926
EPSG:2660
ll 59.340899671068996 71.33359050572552
- en 2.6121102608486842E7 6599689.64897165
- ll2 59.34089966564789 71.33359051855362
+ en 2.612110260848684E7 6599689.648971651
+ ll2 59.34089966564789 71.33359051855358
EPSG:2661
ll 42.959919222696215 90.58642299672573
- en 2.828248308271501E7 4803148.22194726
- ll2 42.95991917305743 90.58642280555571
+ en 2.828248308271501E7 4803148.221947261
+ ll2 42.95991917305744 90.58642280555571
EPSG:2662
ll 64.52971987396737 75.76887418763894
en 2.8105775004017934E7 7184578.403740843
@@ -3598,92 +3598,92 @@ EPSG:2663
ll2 10.816226243971998 88.99448783991465
EPSG:26632
ll -55.479115890928476 3.201413063926558
- en 133859.2109841276 -6163369.104544123
- ll2 -55.47911580531215 3.2014130038823185
+ en 133859.21098412748 -6163369.104544123
+ ll2 -55.47911580531215 3.2014130038823154
EPSG:2664
ll -35.57179340441926 86.14931200596894
- en 3.015087342926075E7 -3944786.821887541
- ll2 -35.571793394026464 86.14931200865287
+ en 3.0150873429260746E7 -3944786.821887542
+ ll2 -35.57179339402647 86.14931200865283
EPSG:2665
ll 5.701981461641353 93.64914003630511
- en 3.1571921521530766E7 630632.5942553559
- ll2 5.7019814584597635 93.64914003556136
+ en 3.1571921521530766E7 630632.5942553558
+ ll2 5.701981458459761 93.64914003556137
EPSG:2666
ll -67.51269755570527 89.67903270374796
- en 3.2230488839305278E7 -7505261.795074811
- ll2 -67.51269752355861 89.67903272885461
+ en 3.2230488839305278E7 -7505261.795074808
+ ll2 -67.51269752355859 89.67903272885461
EPSG:2667
ll -24.192309624816986 99.06636552458468
en 3.3506742783832554E7 -2676507.11017496
- ll2 -24.19230962125844 99.06636552469664
+ ll2 -24.19230962125844 99.06636552469662
EPSG:2668
ll -82.22321586072061 102.88350386962946
- en 3.451334828044318E7 -9133515.283121003
- ll2 -82.2232158261414 102.88350386015411
+ en 3.451334828044317E7 -9133515.283121003
+ ll2 -82.22321582614141 102.88350386015364
EPSG:2669
ll 20.736609568634165 99.85123071555124
- en 3.496319162539092E7 2302540.0348779475
- ll2 20.73660956652119 99.85123071515456
+ en 3.496319162539092E7 2302540.034877947
+ ll2 20.73660956652118 99.85123071515456
EPSG:26692
ll 42.264033500492815 14.919987916538963
en 988440.7348675977 1.4696038715756565E7
- ll2 42.26403346412163 14.919987896963685
+ ll2 42.264033464121624 14.919987896963683
EPSG:2670
ll 57.04266131074863 103.6682803347299
- en 3.623713739110234E7 6333049.826085025
- ll2 57.04266131330471 103.66828033559231
+ en 3.623713739110234E7 6333049.826085026
+ ll2 57.04266131330473 103.66828033559234
EPSG:2671
ll 60.179750220452746 120.89556954397086
en 3.804775749937154E7 6715333.736237932
- ll2 60.17975015970209 120.89556892399665
+ ll2 60.1797501597021 120.8955689239967
EPSG:2672
ll -22.73027938099679 113.2820643784632
- en 3.8426213797723584E7 -2514764.32033239
- ll2 -22.73027937759969 113.28206437763662
+ en 3.8426213797723584E7 -2514764.3203323903
+ ll2 -22.730279377599693 113.28206437763662
EPSG:2673
ll -9.206309351484464 109.54073729458496
- en 3.867800312747903E7 -1026580.7699858483
- ll2 -9.206309350986352 109.54073731124076
+ en 3.867800312747904E7 -1026580.7699858481
+ ll2 -9.206309350986352 109.5407373112408
EPSG:2674
ll 44.53628281670626 123.2109867829451
- en 4.075516366236356E7 4938485.301441995
- ll2 44.536282818208 123.21098678671729
+ en 4.075516366236357E7 4938485.301441996
+ ll2 44.536282818208015 123.21098678671736
EPSG:2675
ll 84.64727069284498 130.0643482992016
en 4.157337137130839E7 9408674.494746681
- ll2 84.64727069020667 130.06434823981647
+ ll2 84.64727069020668 130.0643482398165
EPSG:2676
ll -77.35968314787218 128.74887387393838
- en 4.256709748437167E7 -8591932.02861878
- ll2 -77.3596831173646 128.74887380840602
+ en 4.256709748437167E7 -8591932.028618783
+ ll2 -77.35968311736461 128.74887380840602
EPSG:2677
ll -20.320748950682685 122.34098148420271
- en 4.2803307130515195E7 -2261898.4620813555
- ll2 -20.32074894584776 122.34098148195476
+ en 4.2803307130515195E7 -2261898.462081355
+ ll2 -20.320748945847754 122.34098148195476
EPSG:2678
ll 8.442734869632872 130.26503945388168
- en 4.4308843254370116E7 934121.669699712
- ll2 8.442734867855867 130.26503945574876
+ en 4.4308843254370116E7 934121.6696997117
+ ll2 8.442734867855867 130.26503945574873
EPSG:2679
ll -53.01856716315491 128.7574565886161
- en 4.508121771943574E7 -5894902.463512395
- ll2 -53.01856713650626 128.75745658015393
+ en 4.508121771943574E7 -5894902.4635123955
+ ll2 -53.01856713650627 128.75745658015393
EPSG:2680
ll -55.5988119952592 131.681884452788
en 4.610192370953891E7 -6182003.545663955
- ll2 -55.598811967075186 131.68188444242574
+ ll2 -55.598811967075186 131.68188444242577
EPSG:2681
ll 49.84700737235258 132.84608641389838
- en 4.691379615364071E7 5555875.818504628
- ll2 49.847007347845334 132.84608648546646
+ en 4.691379615364071E7 5555875.818504629
+ ll2 49.84700734784535 132.84608648546646
EPSG:2682
ll 70.86415011287713 134.64237183434216
- en 4.8158605099989176E7 7891864.255196658
- ll2 70.86415009525453 134.642372311083
+ en 4.8158605099989176E7 7891864.255196661
+ ll2 70.86415009525454 134.64237231108297
EPSG:2683
ll -35.67481188761849 137.25800502507803
- en 4.861656232479465E7 -3993451.7403613757
- ll2 -35.6748118383629 137.25800511101778
+ en 4.861656232479466E7 -3993451.740361377
+ ll2 -35.674811838362935 137.2580051110179
EPSG:2684
ll 10.098593152523947 147.1179739920731
en 5.018388078634053E7 1118238.7725280614
@@ -3694,44 +3694,44 @@ EPSG:26847
ll2 -85.32870774554941 -66.81930131868675
EPSG:26848
ll -82.98725117129958 -76.09566902066805
- en 2687968.461373411 -4.5822122600526586E7
- ll2 -82.98725117122062 -76.09566901199888
+ en 2687968.4613734107 -4.582212260052658E7
+ ll2 -82.9872511712206 -76.09566901199887
EPSG:26849
ll 6.3144542416563745 -59.27302180167858
en 1.760229203042994E7 -1.2213858916231697E7
- ll2 6.314454241656401 -59.27302180167858
+ ll2 6.3144542416564 -59.27302180167858
EPSG:2685
ll 85.14885564264338 152.27344654563424
- en 5.1493031689296186E7 9460266.897312103
- ll2 85.14885564041025 152.27344650928376
+ en 5.1493031689296186E7 9460266.897312101
+ ll2 85.14885564041023 152.2734465092838
EPSG:26850
ll -9.141125865861628 -16.519612455025964
- en 3.866198871571315E7 -3277329.156753802
- ll2 -9.141125865861586 -16.519612455025978
+ en 3.866198871571315E7 -3277329.1567537975
+ ll2 -9.141125865861586 -16.519612455025964
EPSG:26851
ll -9.253839573725601 -149.26796535669527
- en -2.4761066570514794E7 -1.193370375628515E7
- ll2 -9.253839573725564 -149.26796535669527
+ en -2.4761066570514806E7 -1.1933703756285159E7
+ ll2 -9.253839573725601 -149.26796535669527
EPSG:26852
ll -14.088257588346751 -142.47845973991411
en -2.0608911038660455E7 -1.7298122798202544E7
ll2 -14.088257588346707 -142.47845973991411
EPSG:26853
ll 17.687519165685764 -155.71065011802938
- en -2.313854562327792E7 3583603.6065869667
- ll2 17.687519165685785 -155.71065011802938
+ en -2.313854562327793E7 3583603.6065869154
+ ll2 17.687519165685774 -155.71065011802938
EPSG:26854
ll 10.012214606929511 -42.15505902517151
en 1.7137850054096933E7 -6978941.605485164
ll2 10.01221460692954 -42.1550590251715
EPSG:26855
ll -69.10644359774714 -64.65186211394418
- en 1486607.5714130106 -4.104204521611642E7
- ll2 -69.10644359760593 -64.65186211409285
+ en 1486607.5714130101 -4.104204521611643E7
+ ll2 -69.10644359760596 -64.65186211409285
EPSG:26856
ll 89.90032270796073 -79.3395858964756
- en 2946927.3112900346 1.7213204297344856E7
- ll2 89.90032270799006 -79.3395854311191
+ en 2946927.3112900336 1.721320429734485E7
+ ll2 89.90032270799003 -79.33958543111794
EPSG:26857
ll 29.360410373967355 -36.232424020280945
en 1.9953426493352547E7 655298.7027560339
@@ -3743,98 +3743,98 @@ EPSG:26858
EPSG:26859
ll 88.67043218354785 -101.91706848986271
en 2457579.8950815573 2.048206240832887E7
- ll2 88.67043218354809 -101.91706848986273
+ ll2 88.67043218354807 -101.91706848986271
EPSG:2686
ll -59.48779564684563 155.9674111662926
- en 5.249804179689735E7 -6597016.053455745
- ll2 -59.487795625313645 155.9674111238181
+ en 5.249804179689736E7 -6597016.053455745
+ ll2 -59.48779562531364 155.96741112381818
EPSG:26860
ll 31.407613199003066 -103.71686909484399
- en 464241.95034260675 -3059082.709529176
- ll2 31.407613199001215 -103.71686909484399
+ en 464241.95034260215 -3059082.709529176
+ ll2 31.40761319900121 -103.71686909484401
EPSG:26861
ll 17.69680786501833 -113.34806319007953
- en -1.0343887102247708E7 -5403087.501318931
- ll2 17.696807865018325 -113.34806319007953
+ en -1.0343887102247695E7 -5403087.501318935
+ ll2 17.696807865018336 -113.34806319007953
EPSG:26862
ll 32.53932295562807 -121.08670959251066
- en -1.0059897056139424E7 1015938.611952532
- ll2 32.53932295562831 -121.08670959251067
+ en -1.005989705613942E7 1015938.611952532
+ ll2 32.53932295562831 -121.08670959251066
EPSG:26863
ll -52.47206359974728 -74.94369769554923
- en -451401.8320991977 -3.501023827487497E7
- ll2 -52.4720635930474 -74.94369768695603
+ en -451401.8320991949 -3.501023827487497E7
+ ll2 -52.4720635930474 -74.94369768695601
EPSG:26864
ll 58.264073037187075 -71.53587442291274
en 2689095.167606773 5634010.748621871
- ll2 58.26407303718696 -71.53587442291285
+ ll2 58.264073037186954 -71.53587442291285
EPSG:26865
ll 39.308512699186274 -54.3268024479206
- en 1.325222817316483E7 418945.5671473134
- ll2 39.30851269918635 -54.32680244792059
+ en 1.3252228173164824E7 418945.56714732037
+ ll2 39.308512699186366 -54.326802447920606
EPSG:26866
ll 23.78217072222028 -120.65485886256991
en -6673537.638104352 -6029221.327891956
- ll2 23.78217072222008 -120.65485886256991
+ ll2 23.782170722220094 -120.65485886256991
EPSG:26867
ll 59.80697837513996 -85.95819788683309
- en 4163439.820687235 6611091.053169648
+ en 4163439.820687234 6611091.0531696575
ll2 59.80697837514045 -85.95819788683309
EPSG:26868
ll 72.43132404477116 -63.37771617225816
- en 6435756.627447494 1.3647583902830321E7
- ll2 72.43132404477211 -63.37771617225818
+ en 6435756.627447497 1.3647583902830323E7
+ ll2 72.43132404477211 -63.37771617225816
EPSG:26869
ll 65.23716358660737 -66.45108318239694
- en 4224097.076537177 1.0294835189514704E7
+ en 4224097.076537181 1.0294835189514708E7
ll2 65.2371635866081 -66.45108318239694
EPSG:2687
ll 88.39285957120404 158.43718504416165
en 5.349812341443236E7 9822568.177822083
- ll2 88.39285956872513 158.43718489915707
+ ll2 88.39285956872513 158.43718489915713
EPSG:26870
ll -10.616453457602102 -39.861068180248864
- en 2.1960977319693647E7 -1.497367247550601E7
- ll2 -10.616453457602086 -39.86106818024885
+ en 2.1960977319693644E7 -1.497367247550601E7
+ ll2 -10.616453457602075 -39.86106818024887
EPSG:2688
ll 39.36228342686394 169.41724351728735
en 5.5139470168492556E7 4385158.904183704
- ll2 39.36228341730893 169.4172435064668
+ ll2 39.36228341730893 169.41724350646692
EPSG:2689
ll 64.57792565219967 170.56427920276704
en 5.5766246185477E7 7176082.252590764
- ll2 64.57792565013288 170.56427919267668
+ ll2 64.57792565013288 170.56427919267657
EPSG:26891
ll 71.78707740597119 -74.4425928171114
- en 585216.0234297062 7986339.937078783
- ll2 71.78707739847289 -74.44259294064186
+ en 585216.0234297063 7986339.937078781
+ ll2 71.78707739847287 -74.44259294064187
EPSG:26892
ll 30.533299108121824 -81.78766622750425
en 229217.05545774486 3379159.342177681
- ll2 30.533299108120325 -81.78766622750429
+ ll2 30.533299108120325 -81.7876662275043
EPSG:26893
ll -15.320738628852709 -76.624049368832
en 1098713.8242093157 -1707866.6554059063
ll2 -15.32073862638178 -76.62404937479435
EPSG:26894
ll -25.27971200312693 -80.78871428768329
- en 931124.6737345979 -2811295.094931906
+ en 931124.673734598 -2811295.094931906
ll2 -25.279712001829836 -80.7887142854684
EPSG:26895
ll 52.99382231634226 -94.61276049835735
- en -4808.985175198119 5883307.37139452
- ll2 52.993822315422314 -94.61276049804076
+ en -4808.985175198293 5883307.371394519
+ ll2 52.99382231542231 -94.61276049804074
EPSG:26896
ll -55.33116119954047 -98.35604677987622
- en -34917.79831498698 -6146559.018694865
- ll2 -55.33116119734837 -98.35604677808638
+ en -34917.79831498716 -6146559.018694862
+ ll2 -55.33116119734835 -98.35604677808638
EPSG:26897
ll -4.945135755201079 -92.74169544938552
en 666328.8396087005 -547650.593861659
- ll2 -4.9451357551964135 -92.74169544953607
+ ll2 -4.945135755196414 -92.74169544953605
EPSG:26898
ll -59.070867114168855 -44.016932758138914
- en 818990.3172793577 -6584593.815730899
+ en 818990.3172793573 -6584593.815730899
ll2 -59.070867074434354 -44.016933007432975
EPSG:26899
ll 59.480820135430434 -48.309074089242614
@@ -3842,11 +3842,11 @@ EPSG:26899
ll2 59.48082011904262 -48.30907415052751
EPSG:2690
ll -64.83618374455195 169.14664553834348
- en 5.6554299063072644E7 -7193610.147775713
- ll2 -64.83618372616566 169.14664547223754
+ en 5.6554299063072644E7 -7193610.147775715
+ ll2 -64.83618372616569 169.14664547223757
EPSG:26901
ll 2.097627571428376 -175.2579436417712
- en 693748.2048922952 231959.74661132184
+ en 693748.2048922952 231959.7466113218
ll2 2.097627571428335 -175.25794364177716
EPSG:26902
ll -39.6645899678562 -161.24305492152484
@@ -3866,40 +3866,40 @@ EPSG:26905
ll2 26.570545465859134 -149.78560367586192
EPSG:26906
ll 58.20100911113667 -150.88647017446522
- en 271640.506281351 6457675.914377604
- ll2 58.201009110833674 -150.88647017436764
+ en 271640.50628135086 6457675.914377604
+ ll2 58.20100911083367 -150.88647017436764
EPSG:26907
ll -78.87243921420784 -150.32525976652732
en 299908.4433973277 -8771752.21088466
ll2 -78.8724392121903 -150.3252592554568
EPSG:26908
ll -13.441736596525146 -125.41091024074605
- en 1542359.971203046 -1506402.7974024166
- ll2 -13.441736582359031 -125.41091030527689
+ en 1542359.971203046 -1506402.7974024168
+ ll2 -13.441736582359033 -125.41091030527689
EPSG:26909
ll -52.009942092190315 -127.05294890414967
en 633630.2943316076 -5763933.75959318
- ll2 -52.009942092185035 -127.05294890414791
+ ll2 -52.00994209218504 -127.05294890414791
EPSG:2691
ll -25.777847177738565 169.00206061669223
- en 5.729943838372974E7 -2853699.0494147353
- ll2 -25.77784716416538 169.00206059765387
+ en 5.729943838372974E7 -2853699.049414736
+ ll2 -25.777847164165387 169.0020605976539
EPSG:26910
ll -59.4562577964843 -118.58672609933797
en 750070.6443771531 -6599159.224167232
ll2 -59.45625779586324 -118.58672609970719
EPSG:26911
ll 6.0398857475492065 -121.41652867681256
- en 10783.753116599692 669600.5548577502
- ll2 6.039885747509177 -121.41652867602707
+ en 10783.753116599692 669600.5548577501
+ ll2 6.039885747509176 -121.41652867602707
EPSG:26912
ll -11.74048724497554 -120.13370732938085
en -499141.5788842605 -1314164.681041729
- ll2 -11.740487235481247 -120.13370727529046
+ ll2 -11.740487235481249 -120.13370727529046
EPSG:26913
ll 4.6055620261999906 -107.1832470692168
en 257780.21388639722 509434.66923433775
- ll2 4.605562026199634 -107.18324706919866
+ ll2 4.605562026199635 -107.18324706919866
EPSG:26914
ll 16.976968885325334 -108.45377749898243
en -510244.826493826 1901502.6767404545
@@ -3907,19 +3907,19 @@ EPSG:26914
EPSG:26915
ll -30.53296609623851 -92.90034903082946
en 509559.33557842596 -3377848.9383088923
- ll2 -30.532966096238507 -92.90034903082946
+ ll2 -30.53296609623851 -92.90034903082946
EPSG:26916
ll -86.83484973200099 -89.12354198808872
en 486912.2688598228 -9644823.94856409
ll2 -86.83484973200099 -89.1235419880879
EPSG:26917
ll 24.995379875824696 -76.93436032813956
- en 910500.8493475029 2770597.169277376
- ll2 24.995379875730926 -76.93436032795297
+ en 910500.8493475029 2770597.1692773765
+ ll2 24.99537987573093 -76.93436032795297
EPSG:26918
ll 84.54393683152165 -82.56475456934153
en 419924.80506183044 9394087.883694446
- ll2 84.54393683154028 -82.5647544898115
+ ll2 84.54393683154026 -82.5647544898115
EPSG:26919
ll -47.72114776833773 -68.63899786739583
en 527073.9172303957 -5285370.81940891
@@ -3927,27 +3927,27 @@ EPSG:26919
EPSG:2692
ll 40.56276587554714 169.34945838666403
en 5.810595196579155E7 4502540.964237372
- ll2 40.56276587554217 169.34945838220128
+ ll2 40.56276587554217 169.3494583822013
EPSG:26920
ll 64.3291214799275 -62.317985224097576
en 532965.4053040731 7133866.748238198
ll2 64.32912147992748 -62.317985224097576
EPSG:26921
ll 37.97172039368772 -55.39053339233521
- en 641365.6763504896 4203899.161087848
+ en 641365.6763504895 4203899.161087848
ll2 37.971720393686674 -55.39053339233348
EPSG:26922
ll -31.561758415950273 -59.32826507447432
- en -291633.12427068944 -3522107.992177864
- ll2 -31.56175840423302 -59.32826507417481
+ en -291633.12427068944 -3522107.9921778636
+ ll2 -31.561758404233018 -59.32826507417481
EPSG:26923
ll -10.91681923963236 -40.403958303720295
en 1002733.5608048434 -1210606.8892034872
ll2 -10.916819239548373 -40.40395830438639
EPSG:26929
ll 84.70064004165377 -85.92780639499333
- en 199025.4836913367 6034293.8450900465
- ll2 84.70064004165376 -85.92780639499333
+ en 199025.4836913367 6034293.845090048
+ ll2 84.70064004165377 -85.92780639499333
EPSG:2693
ll -86.68933577663775 179.2628729128793
en 5.951446306573489E7 -9632605.764644256
@@ -3958,8 +3958,8 @@ EPSG:26930
ll2 -4.484789920164784 -92.62977430839794
EPSG:26931
ll 56.71085527271815 -129.52906729684838
- en 1071929.1802393221 550528.6203638706
- ll2 56.710855272715165 -129.52906729684835
+ en 1071929.1802393207 550528.6203638697
+ ll2 56.710855272715165 -129.52906729684838
EPSG:26932
ll -33.8153843551209 -132.88429669967564
en 1345245.3206457607 -9765737.337753976
@@ -3967,10 +3967,10 @@ EPSG:26932
EPSG:26933
ll 87.30833980073197 -150.85737026409913
en 474554.90366814623 3716116.194945843
- ll2 87.30833980073139 -150.85737026264118
+ ll2 87.30833980073137 -150.85737026264118
EPSG:26934
ll -15.716707587914144 -155.7516024750332
- en -117308.47528347757 -7731851.947603348
+ en -117308.47528347769 -7731851.947603348
ll2 -15.71670758744045 -155.7516024740709
EPSG:26935
ll -87.23052085687257 -152.10120296892003
@@ -3978,8 +3978,8 @@ EPSG:26935
ll2 -87.23052085687259 -152.10120296892032
EPSG:26936
ll 79.38013893020312 -163.23887810053213
- en 392324.4136021158 2834570.4915848626
- ll2 79.38013893005166 -163.2388780977779
+ en 392324.4136021159 2834570.491584864
+ ll2 79.38013893005167 -163.2388780977779
EPSG:26937
ll 89.56671121101888 -158.5636139906829
en 502900.53760233195 3967344.20102427
@@ -3991,11 +3991,11 @@ EPSG:26938
EPSG:26939
ll -0.18954589532349075 -175.43191737056318
en -105528.39263040945 -6006369.4158700835
- ll2 -0.1895458953181817 -175.43191736744274
+ ll2 -0.18954589531818172 -175.43191736744274
EPSG:26940
ll 62.00295669612082 -107.29817633001495
en 4118816.0022864775 2844580.9067138233
- ll2 62.0029566961208 -107.29817633001497
+ ll2 62.00295669612082 -107.29817633001495
EPSG:26941
ll -11.078619922560831 -140.35382212016626
en -899273.1805106932 -5581959.462717374
@@ -4003,7 +4003,7 @@ EPSG:26941
EPSG:26942
ll 45.98034463039458 -155.38250091509735
en -547847.586932214 1898523.654494837
- ll2 45.98034463039457 -155.38250091509735
+ ll2 45.98034463039456 -155.38250091509735
EPSG:26943
ll 26.213437294337453 -132.35768019305323
en 795150.0587651287 -572392.1189730661
@@ -4011,23 +4011,23 @@ EPSG:26943
EPSG:26944
ll 63.77487212954301 -179.63858703761193
en -1208301.65162462 4845816.563761177
- ll2 63.774872129543 -179.63858703761193
+ ll2 63.774872129543006 -179.63858703761193
EPSG:26945
ll -12.421433535284839 -134.38125476044414
- en -438963.8664825028 -4991211.630807972
+ en -438963.8664825037 -4991211.630807971
ll2 -12.421433535284816 -134.38125476044414
EPSG:26946
ll 61.534325948762785 -111.27453567632917
en 2306304.7479539486 3922056.638971626
- ll2 61.534325948762756 -111.27453567632917
+ ll2 61.534325948762785 -111.27453567632917
EPSG:26948
ll -74.9346504257601 -106.1805547492547
- en 328964.4419670195 -1.175332756675438E7
- ll2 -74.9346504256803 -106.18055474947818
+ en 328964.44196701946 -1.1753327566754384E7
+ ll2 -74.93465042568035 -106.18055474947816
EPSG:26949
ll -61.025391528301526 -113.15401370410932
- en 146473.16705437718 -1.0198909175369086E7
- ll2 -61.02539152830122 -113.15401370410937
+ en 146473.16705437715 -1.0198909175369086E7
+ ll2 -61.02539152830121 -113.15401370410937
EPSG:2695
ll 71.35980356234873 -172.0892989289031
en 6.167494886957421E7 7927954.3534685355
@@ -4038,8 +4038,8 @@ EPSG:26950
ll2 10.823183714392746 -123.2612879783909
EPSG:26951
ll 49.19862514596906 -59.15980081472868
- en 2821388.8630941315 2073661.4985840796
- ll2 49.19862514596907 -59.15980081472868
+ en 2821388.863094129 2073661.4985840796
+ ll2 49.19862514596909 -59.159800814728676
EPSG:26952
ll -3.5484595483900634 -153.67479495005045
en -7482515.8098954065 -1456485.6917524822
@@ -4050,15 +4050,15 @@ EPSG:26953
ll2 71.66034648886875 -175.46819568508147
EPSG:26954
ll 2.1737468777486164 -165.2515651465274
- en -6558428.613180297 -1370554.5224827982
- ll2 2.1737468777486626 -165.2515651465274
+ en -6558428.613180309 -1370554.5224827882
+ ll2 2.17374687774865 -165.2515651465274
EPSG:26955
ll 32.24604527892822 -125.93039495227096
- en -1004398.899441569 24167.894484477292
+ en -1004398.8994415683 24167.894484478747
ll2 32.24604527892848 -125.93039495227096
EPSG:26956
ll -4.577200206054897 -138.94975841457307
- en -8616100.014361704 -1830683.9662968314
+ en -8616100.014361704 -1830683.966296833
ll2 -4.577200206054861 -138.94975841457307
EPSG:26957
ll -68.61530757591294 -80.20612508800232
@@ -4070,12 +4070,12 @@ EPSG:26958
ll2 -75.79596335131866 -83.08115556687736
EPSG:26959
ll -59.18326195650074 -79.36821371874063
- en 350424.1756892359 -9257716.071026646
- ll2 -59.183261956472315 -79.36821371874126
+ en 350424.17568923585 -9257716.071026646
+ ll2 -59.18326195647232 -79.36821371874126
EPSG:2696
ll 7.232736366866604 -169.5849144111655
- en 6.298794117457495E7 802261.6114937764
- ll2 7.232736377798289 -169.58491443002842
+ en 6.298794117457496E7 802261.6114937764
+ ll2 7.232736377798287 -169.5849144300284
EPSG:26960
ll -9.593659864996212 -140.7820441445441
en -6858560.350604347 -2750528.7995763896
@@ -4083,7 +4083,7 @@ EPSG:26960
EPSG:26961
ll 77.58703323508749 -152.95760394773936
en 561011.5148282497 6533614.134984828
- ll2 77.58703323508423 -152.95760394774337
+ ll2 77.58703323508425 -152.95760394774337
EPSG:26962
ll -4.285747815593268 -161.4350829365882
en -29934.96522610821 -2724730.77568311
@@ -4095,31 +4095,31 @@ EPSG:26963
EPSG:26964
ll 53.29439740295561 -168.8039719158509
en -119592.25691218744 3532487.3998943516
- ll2 53.294397348551115 -168.80397163925508
+ ll2 53.29439734855111 -168.80397163925508
EPSG:26965
ll 86.20017129331305 -162.53641037067524
en 482464.2252635895 7181024.783867487
ll2 86.20017129331299 -162.536410370673
EPSG:26966
ll 37.24137003829277 -86.5454626022689
- en -188591.5861474134 812100.6897307583
- ll2 37.24137003788904 -86.54546260262293
+ en -188591.58614741336 812100.689730759
+ ll2 37.24137003788905 -86.54546260262293
EPSG:26967
ll 37.63632461827814 -92.23938698200914
en -13063.311277003493 877725.3862878481
ll2 37.636324603179155 -92.23938696833548
EPSG:26968
ll -32.1657510029379 -115.51144049838086
- en -115549.88688100019 -8179322.356297392
- ll2 -32.165751002883404 -115.51144049847309
+ en -115549.88688100019 -8179322.356297394
+ ll2 -32.16575100288342 -115.51144049847309
EPSG:26969
ll 50.875483167409385 -118.69434425334701
- en 169679.3791330412 1034074.4960309071
- ll2 50.87548316639083 -118.6943442530778
+ en 169679.3791330412 1034074.4960309078
+ ll2 50.875483166390836 -118.69434425307782
EPSG:2697
ll 69.6331549436677 -171.25462162762855
- en 6.3489971642361514E7 7728233.597126868
- ll2 69.63315494464425 -171.25462164423087
+ en 6.3489971642361514E7 7728233.5971268695
+ ll2 69.63315494464426 -171.25462164423087
EPSG:26970
ll 77.5440093405652 -109.20789707229306
en 957261.6356692486 4004823.3075328763
@@ -4142,48 +4142,48 @@ EPSG:26974
ll2 0.7949741159527451 -86.98849402255584
EPSG:26975
ll 31.179906665583466 -49.43537759564322
- en 5589711.555604171 937322.0661822892
- ll2 31.179906665583434 -49.43537759564321
+ en 5589711.555604172 937322.0661822949
+ ll2 31.179906665583463 -49.43537759564322
EPSG:26976
ll 34.72937576927341 -95.1321722954538
en 349604.6960674318 -584997.2107501025
- ll2 34.72937576927358 -95.1321722954538
+ ll2 34.72937576927359 -95.1321722954538
EPSG:26977
ll 11.867894805421493 -141.94334060699006
en -4712808.425320834 -1777590.446129273
- ll2 11.867894805421525 -141.94334060699006
+ ll2 11.867894805421523 -141.94334060699006
EPSG:26978
ll 3.548177188026841 -141.56624297415908
- en -5048819.632973912 -2208621.5918576326
+ en -5048819.632973906 -2208621.5918576373
ll2 3.548177188026875 -141.56624297415908
EPSG:2698
ll 75.44070329080978 -166.44032235277126
- en 6.454364441867433E7 8376873.188241241
- ll2 75.44070329196136 -166.4403223764006
+ en 6.454364441867433E7 8376873.1882412415
+ ll2 75.44070329196138 -166.44032237640056
EPSG:26980
ll 53.07586700213622 -5.191420182038144
en 5469316.651062123 4641304.658872435
- ll2 53.07586700213621 -5.191420182038144
+ ll2 53.075867002136214 -5.191420182038144
EPSG:26981
ll -1.6665107658548273 -65.39450080274463
en 4508986.267106425 -3329793.6772489888
ll2 -1.6665107658548093 -65.39450080274463
EPSG:26982
ll 12.826107748059918 -158.36508083111607
- en -6169885.289963588 396030.10127604293
- ll2 12.826107748059938 -158.36508083111607
+ en -6169885.289963594 396030.10127606697
+ ll2 12.826107748059925 -158.36508083111607
EPSG:26983
ll 60.03005994652534 -77.41953479972636
en -196197.508037213 1854014.0074019143
ll2 60.030059909768966 -77.41953455908691
EPSG:26984
ll 81.67836730876823 -63.882211488888956
- en 1001385.3971226912 4333713.678895479
- ll2 81.67836730857971 -63.8822115034395
+ en 1001385.397122691 4333713.67889548
+ ll2 81.67836730857972 -63.88221150343949
EPSG:26985
ll 4.40706366101551 -153.53185106337443
en -8494916.12868957 56157.375352982825
- ll2 4.40706366101554 -153.53185106337446
+ ll2 4.40706366101554 -153.53185106337443
EPSG:26986
ll 42.89151891027546 8.334385099359622
en 5810131.0627910355 3795642.597924164
@@ -4191,19 +4191,19 @@ EPSG:26986
EPSG:26987
ll 30.86683616600878 -79.92782204540754
en -414419.43767037103 -1080905.9882384117
- ll2 30.86683616600877 -79.92782204540754
+ ll2 30.866836166008767 -79.92782204540754
EPSG:26988
ll 62.1771492990046 -170.30974619300434
- en 4255537.512821019 4132110.2864184123
- ll2 62.177149299004576 -170.30974619300434
+ en 4255537.512821011 4132110.2864184096
+ ll2 62.17714929900458 -170.30974619300434
EPSG:26989
ll 50.82916199371181 -72.83332350593025
- en 6814215.757867114 894300.7384937044
- ll2 50.8291619937118 -72.83332350593025
+ en 6814215.757867114 894300.7384937052
+ ll2 50.82916199371183 -72.83332350593025
EPSG:2699
ll 80.19021036214212 17.642088022257557
en 436269.0443548116 8908366.455555988
- ll2 80.1902103620162 17.642088050611417
+ ll2 80.19021036201619 17.642088050611417
EPSG:26990
ll 78.50741235049085 -39.28712479357432
en 5295466.370647638 4847439.078810621
@@ -4222,12 +4222,12 @@ EPSG:26993
ll2 52.544678600874676 -42.04297795901483
EPSG:26994
ll 82.50348092506783 -80.73149663631554
- en 417669.6692556287 5907976.132843343
+ en 417669.6692556287 5907976.132843342
ll2 82.5034809248846 -80.73149678281153
EPSG:26995
ll -20.852630531461514 -81.2876077236539
- en 1644309.4500841103 -5597860.5592906745
- ll2 -20.852630520504974 -81.28760772911893
+ en 1644309.4500841103 -5597860.559290675
+ ll2 -20.85263052050498 -81.28760772911893
EPSG:26996
ll 16.79963516139796 -92.44440204717723
en 42710.43208457116 -2107759.143989991
@@ -4235,111 +4235,111 @@ EPSG:26996
EPSG:26997
ll -62.68890108741835 -90.296438872084
en 612823.6134582165 -1.0921959502838995E7
- ll2 -62.68890108740999 -90.29643887208418
+ ll2 -62.68890108740999 -90.2964388720842
EPSG:26998
ll 59.800500641981586 -98.37668345012638
en 632474.8330201057 2634019.678665593
ll2 59.80050064169918 -98.37668345001723
EPSG:2700
ll 7.252941044956287 29.653723902903323
- en 1125488.9999568672 806027.4859723154
- ll2 7.252941050383079 29.65372390923558
+ en 1125488.9999568674 806027.4859723152
+ ll2 7.252941050383077 29.65372390923558
EPSG:2701
ll 50.05904126280433 25.576145976687464
- en 398167.39997882064 5548504.029914202
- ll2 50.05904126356612 25.576145983313182
+ en 398167.39997882035 5548504.029914202
+ ll2 50.05904126356613 25.57614598331318
EPSG:2702
ll -54.36385995126954 39.30221810290735
en 1103944.2397526982 -6066420.817842556
- ll2 -54.36385987758745 39.30221785183716
+ ll2 -54.363859877587466 39.30221785183718
EPSG:2703
ll -18.972500141429876 24.7009402775841
en -376294.7725940251 -2119303.9947590763
- ll2 -18.972500122347228 24.700940301586552
+ ll2 -18.97250012234723 24.700940301586552
EPSG:27039
ll 81.45687621267797 49.69364797430911
- en 478240.6940519512 9044052.115935303
- ll2 81.45687617862532 49.693647885854716
+ en 478240.69405195146 9044052.115935303
+ ll2 81.45687617862534 49.69364788585472
EPSG:2704
ll -89.66548170361546 40.54187190838555
- en 503079.06828212674 -9964832.89114756
- ll2 -89.66548168575987 40.54187717299171
+ en 503079.0682821268 -9964832.89114756
+ ll2 -89.66548168575987 40.54187717299181
EPSG:27040
ll 35.97715443732338 47.64234868214987
- en -344913.40292394895 4021730.5469467468
- ll2 35.97715440909259 47.64234874537125
+ en -344913.4029239487 4021730.546946748
+ ll2 35.97715440909259 47.64234874537126
EPSG:2705
ll -79.60798956977563 40.50107025369477
- en 530353.6309376918 -8841832.79155877
+ en 530353.6309376917 -8841832.791558772
ll2 -79.60798954965259 40.50107041259277
EPSG:2706
ll 77.09058020074238 42.87283404013893
- en 521888.721362099 8560564.44003012
+ en 521888.72136209917 8560564.44003012
ll2 77.09058019972923 42.87283404986506
EPSG:2707
ll -76.85429442132349 49.62080142145661
- en 617356.8634013038 -8538588.455045776
- ll2 -76.85429439711078 49.62080152848793
+ en 617356.8634013041 -8538588.455045776
+ ll2 -76.85429439711079 49.62080152848795
EPSG:2708
ll -11.123943163399943 55.33075784777057
- en 1302974.6565061985 -1240050.2428784957
- ll2 -11.123943157100225 55.33075784000782
+ en 1302974.6565061985 -1240050.242878496
+ ll2 -11.123943157100227 55.33075784000782
EPSG:2709
ll 16.10250908348138 42.264270759074805
- en -437545.33756713464 1801009.4578947183
- ll2 16.102509076921237 42.264270781105445
+ en -437545.33756713395 1801009.4578947183
+ ll2 16.102509076921237 42.26427078110545
EPSG:2710
ll 26.53083979816104 48.58642617702494
- en -39927.604552440345 2947147.842583849
- ll2 26.53083979740898 48.586426175434866
+ en -39927.60455244116 2947147.842583849
+ ll2 26.530839797408984 48.586426175434845
EPSG:2711
ll 72.94372036583772 63.66635452633716
- en 718016.3484087761 8109647.269989736
- ll2 72.94372036361185 63.666354503661566
+ en 718016.3484087753 8109647.269989739
+ ll2 72.94372036361186 63.66635450366154
EPSG:2712
ll 43.02068873741419 58.98550901213132
- en 417388.8320111593 4765589.873660756
+ en 417388.8320111587 4765589.873660756
ll2 43.02068873772317 58.98550900864382
EPSG:27120
ll 17.048371078613854 -72.0245071963629
- en -463831.9106182095 1907103.7324305552
- ll2 17.048371084304797 -72.0245071674299
+ en -463831.91061820975 1907103.7324305552
+ ll2 17.048371084304797 -72.02450716742993
EPSG:2713
ll -57.35210866069295 71.93236645721139
en 1036875.2004220224 -6394446.40549728
- ll2 -57.35210859663378 71.93236625237274
+ ll2 -57.35210859663378 71.93236625237273
EPSG:2714
ll -9.141942960840169 69.81864377666547
- en 920095.1529619993 -1013094.7707566001
- ll2 -9.141942959868203 69.81864377703995
+ en 920095.1529620024 -1013094.7707566001
+ ll2 -9.141942959868205 69.81864377704
EPSG:2715
ll -54.79032301084454 67.8808241356441
- en 428074.0219381368 -6074427.513310948
- ll2 -54.79032298888299 67.88082415497632
+ en 428074.0219381386 -6074427.513310949
+ ll2 -54.790322988883 67.88082415497635
EPSG:2716
ll 78.3593363557712 74.00514238166147
- en 545237.8582504966 8702778.50379256
- ll2 78.35933635501777 74.00514238385291
+ en 545237.8582504969 8702778.50379256
+ ll2 78.35933635501777 74.00514238385293
EPSG:2717
ll 86.78277441497659 74.84550519072647
- en 499088.851316065 9642676.341314118
- ll2 86.78277441156123 74.84550522120368
+ en 499088.851316065 9642676.341314116
+ ll2 86.7827744115612 74.84550522120367
EPSG:2718
ll -86.86453478156264 71.0360869274373
- en 457609.45965009223 -9654373.75334002
- ll2 -86.86453475052825 71.03608727458628
+ en 457609.45965009206 -9654373.753340019
+ ll2 -86.86453475052824 71.0360872745863
EPSG:2719
ll -83.84183572102324 85.11011186999707
- en 549248.9432283517 -9315944.358036065
- ll2 -83.84183568718032 85.11011195153654
+ en 549248.9432283519 -9315944.358036065
+ ll2 -83.84183568718032 85.11011195153657
EPSG:2720
ll 40.23998789873667 78.76166730230855
- en 54182.824017004226 4469418.774737352
- ll2 40.239987898444696 78.76166729827433
+ en 54182.82401700434 4469418.7747373525
+ ll2 40.2399878984447 78.76166729827435
EPSG:27205
ll 29.563370920687774 177.94114992714276
- en 607880.8663327676 8058372.319702549
- ll2 29.563370881443888 177.941149927737
+ en 607880.8663327675 8058372.31970255
+ ll2 29.56337088144389 177.941149927737
EPSG:27206
ll -63.42942021027464 173.11780214918358
en 132879.55424700325 -2159826.7421356826
@@ -4347,131 +4347,131 @@ EPSG:27206
EPSG:27207
ll 80.54786270527495 178.2302710192764
en 306298.8366642462 1.3923456114435706E7
- ll2 80.54786267854494 178.23027101539702
+ ll2 80.54786267854494 178.23027101539697
EPSG:27208
ll 31.472269453624563 168.33531296703353
en -493748.16135357437 8604412.381286502
- ll2 31.472269403643107 168.33531297162196
+ ll2 31.472269403643093 168.3353129716219
EPSG:27209
ll 26.77051569210012 175.69260239261297
- en 445643.27026362595 7996612.008663574
- ll2 26.77051565166749 175.69260239403368
+ en 445643.2702636231 7996612.008663574
+ ll2 26.77051565166749 175.6926023940337
EPSG:2721
ll -73.02513093871985 81.90241091470446
- en 334026.981480672 -8113585.633146521
- ll2 -73.02513090751424 81.9024109474433
+ en 334026.9814806731 -8113585.633146523
+ ll2 -73.02513090751427 81.9024109474433
EPSG:27210
ll -29.083756356219418 166.77120373683297
- en -565335.4578956502 1823937.300436704
- ll2 -29.08375635863847 166.77120373918353
+ en -565335.4578956532 1823937.3004367044
+ ll2 -29.083756358638457 166.77120373918345
EPSG:27211
ll 75.37041466353861 165.6057499591686
- en 22443.57320798654 1.3548156768928848E7
+ en 22443.5732079866 1.3548156768928848E7
ll2 75.3704146288297 165.605750813764
EPSG:27212
ll 59.08229690678061 169.7437882137687
- en -38261.70161192393 1.1799275608274871E7
- ll2 59.08229687568232 169.74378822590916
+ en -38261.7016119241 1.179927560827487E7
+ ll2 59.082296875682296 169.74378822590916
EPSG:27213
ll 30.762022747309047 172.59631000700648
- en 91188.04065064696 8680680.229680125
- ll2 30.76202270871043 172.59631000973943
+ en 91188.04065064696 8680680.229680123
+ ll2 30.762022708710425 172.5963100097394
EPSG:27214
ll -43.28704842464522 164.62995005528163
- en -352839.3219961679 382567.8441542635
- ll2 -43.28704840594253 164.62995008935823
+ en -352839.32199616765 382567.84415426356
+ ll2 -43.287048405942535 164.6299500893582
EPSG:27215
ll -69.23362387351897 178.7132592420433
- en 514077.13261253305 -2422079.843970331
- ll2 -69.23362386721976 178.71325923972393
+ en 514077.1326125342 -2422079.843970331
+ ll2 -69.23362386721976 178.7132592397239
EPSG:27216
ll 29.524608775705417 173.87334471780207
- en 471027.3927079512 8541498.947961349
- ll2 29.524608736520747 173.8733447199868
+ en 471027.3927079319 8541498.947961347
+ ll2 29.524608736520726 173.87334471998662
EPSG:27217
ll -15.272022748440918 177.66240156465997
- en 954252.2218799036 3632215.4654125385
+ en 954252.2218799037 3632215.4654125385
ll2 -15.272022779694476 177.6624015638844
EPSG:27218
ll 14.851578494906732 172.04654846888025
en 353437.2231082297 7031281.478880935
- ll2 14.851578450693102 172.0465484713388
+ ll2 14.851578450693104 172.04654847133878
EPSG:27219
ll 85.60388378748783 178.34652716352684
en 345608.9480504032 1.4941581884069968E7
ll2 85.60388376043547 178.34652714934495
EPSG:2722
ll -22.543824713437985 80.74835701013878
- en -454588.95900038595 -2523661.785542876
- ll2 -22.543824696286027 80.74835701519609
+ en -454588.9590003857 -2523661.7855428765
+ ll2 -22.543824696286034 80.7483570151961
EPSG:27220
ll -35.89641940793086 168.10514166589883
- en -214614.33117331 1311777.1654002145
- ll2 -35.89641941480263 168.10514166593669
+ en -214614.33117331262 1311777.165400215
+ ll2 -35.89641941480264 168.10514166593669
EPSG:27221
ll -56.91506917302063 162.4574157502495
- en -218336.80686894292 -892954.7144659455
- ll2 -56.91506913476949 162.45741589261783
+ en -218336.80686894472 -892954.7144659464
+ ll2 -56.91506913476948 162.4574158926178
EPSG:27222
ll 5.71930834407361 164.3478013171362
en -356191.01652834925 6110684.386801521
- ll2 5.719308299329757 164.34780132597908
+ ll2 5.71930829932976 164.34780132597908
EPSG:27223
ll -67.08389650107274 163.21943827288916
- en 66086.64908640913 -1882679.6040940634
- ll2 -67.08389649371988 163.2194382733239
+ en 66086.64908640532 -1882679.6040940625
+ ll2 -67.08389649371986 163.21943827332385
EPSG:27224
ll -6.041890808734138 171.3995286801382
- en 152976.2287948466 4859939.05336036
- ll2 -6.041890848281559 171.39952868218873
+ en 152976.22879484345 4859939.05336036
+ ll2 -6.041890848281558 171.39952868218862
EPSG:27225
ll -57.46810001356919 178.56690776350467
en 731937.4852165945 -849276.0608097401
- ll2 -57.46809999513514 178.56690773296805
+ ll2 -57.468099995135155 178.56690773296802
EPSG:27226
ll 46.38737726858653 176.5653733712532
en 723649.8463452755 1.0772534495423159E7
- ll2 46.387377234628445 176.5653733716564
+ ll2 46.38737723462845 176.56537337165636
EPSG:27227
ll -19.83790201840749 166.93284136882562
- en 34367.11007091566 3458957.7485929863
- ll2 -19.837902045619543 166.9328413710757
+ en 34367.11007091566 3458957.7485929853
+ ll2 -19.837902045619554 166.9328413710757
EPSG:27228
ll 34.03177432428224 163.46803799738487
- en -155601.95791094296 9477934.922424406
- ll2 34.03177428677069 163.46803800349494
+ en -155601.95791093778 9477934.922424406
+ ll2 34.03177428677069 163.46803800349505
EPSG:27229
ll 0.6840778974904964 159.97796597017887
- en -566599.7766438626 5823846.698060055
- ll2 0.6840778538565059 159.97796600626353
+ en -566599.7766438561 5823846.698060055
+ ll2 0.684077853856506 159.97796600626359
EPSG:2723
ll -20.790063439085387 87.25359631531381
en -99031.20718645933 -2310436.8877878604
- ll2 -20.790063435874746 87.25359631544717
+ ll2 -20.790063435874753 87.25359631544718
EPSG:27230
ll 64.2275008393681 178.0783172705217
- en 660921.9022566268 1.2922252294560915E7
- ll2 64.22750080185284 178.07831721776648
+ en 660921.9022566269 1.2922252294560915E7
+ ll2 64.22750080185284 178.0783172177665
EPSG:27231
ll 12.075254764989197 173.33567580599905
en 632510.8730269945 7117654.103863358
ll2 12.075254720410243 173.33567580793792
EPSG:27232
ll -28.77978077811369 159.7704597562271
- en -538759.9553229965 2647400.505840277
+ en -538759.9553229965 2647400.5058402778
ll2 -28.779780783967098 159.77045975552605
EPSG:2724
ll -88.0741525906157 99.06125689239158
- en 511496.07211657637 -9787200.356326075
- ll2 -88.07415255517142 99.06125691992058
+ en 511496.0721165764 -9787200.356326075
+ ll2 -88.07415255517141 99.06125691992058
EPSG:2725
ll 19.325225887726347 90.6950981503235
- en -375131.10514695453 2158831.739351404
- ll2 19.325225879635234 90.69509815224852
+ en -375131.10514695593 2158831.739351404
+ ll2 19.32522587963523 90.69509815224849
EPSG:27258
ll 25.77447254778511 173.9849160625147
- en 1403226.9099974725 1.2881586503349569E7
- ll2 25.77447249443142 173.9849160671958
+ en 1403226.9099974756 1.288158650334957E7
+ ll2 25.77447249443144 173.9849160671959
EPSG:27259
ll -48.04328022748383 168.89519081344042
en 343119.35290702374 4676470.234533977
@@ -4479,103 +4479,103 @@ EPSG:27259
EPSG:2726
ll 63.72013979475349 102.4025208685475
en 519887.57179813477 7068757.106223803
- ll2 63.720139797537335 102.4025208688658
+ ll2 63.720139797537335 102.40252086886584
EPSG:27260
ll -17.073228460817546 176.12704970176694
- en 407083.6946689331 8111902.711786898
- ll2 -17.073228490891122 176.1270497028064
+ en 407083.6946689301 8111902.711786898
+ ll2 -17.07322849089112 176.12704970280618
EPSG:2727
ll 78.33867654782765 108.01837607951273
- en 568094.3853305883 8701439.367781281
- ll2 78.33867654739716 108.01837607918843
+ en 568094.3853305893 8701439.367781281
+ ll2 78.33867654739716 108.01837607918847
EPSG:2728
ll 67.26215787807558 107.44743221871296
en 476138.4452904307 7463734.330952141
- ll2 67.26215788032569 107.44743221972453
+ ll2 67.26215788032569 107.44743221972455
EPSG:2729
ll 43.61057524705171 109.44943404523627
- en 374797.5406271954 4831773.748917178
- ll2 43.61057524916164 109.4494340469783
+ en 374797.5406271966 4831773.748917179
+ ll2 43.610575249161656 109.44943404697831
EPSG:27291
ll -35.65561233470427 174.99180185702664
- en 249652.54637466773 805580.1404784148
- ll2 -35.655612343571654 174.99180185800236
+ en 249652.54637467052 805580.140478414
+ ll2 -35.655612343571654 174.99180185800233
EPSG:27292
ll 17.829993130259723 168.1081806632071
- en 106550.35448191321 7990412.416571206
- ll2 17.82999308667674 168.10818066706514
+ en 106550.3544819197 7990412.416571206
+ ll2 17.829993086676744 168.10818066706528
EPSG:2730
ll 66.26413120702654 114.24347726832843
- en 510908.006417472 7352353.78102523
- ll2 66.26413120921782 114.24347727029183
+ en 510908.0064174732 7352353.781025232
+ ll2 66.26413120921787 114.24347727029186
EPSG:2731
ll -55.51028469081585 108.95386058787514
- en -7795.555998052994 -6183458.463016438
- ll2 -55.51028464475727 108.95386066300641
+ en -7795.555998053227 -6183458.463016437
+ ll2 -55.51028464475727 108.95386066300642
EPSG:2732
ll 81.64455015278634 122.09202339547204
- en 533900.5321835666 9069435.283189345
- ll2 81.64455015113701 122.09202339052109
+ en 533900.5321835668 9069435.283189343
+ ll2 81.644550151137 122.09202339052112
EPSG:2733
ll 35.31256623860742 114.74565928519526
- en -251561.0382112231 3940751.270371056
- ll2 35.31256622463949 114.7456592975699
+ en -251561.0382112217 3940751.2703710557
+ ll2 35.31256622463948 114.74565929756992
EPSG:2734
ll -86.82360575792076 133.38498822745237
en 545523.3519200078 -9650163.355316466
- ll2 -86.8236057278915 133.38498782781278
+ ll2 -86.82360572789153 133.38498782781278
EPSG:2735
ll 30.40063584711126 126.11193781128668
- en 222344.60533675505 3368137.029424649
- ll2 30.400635846697 126.11193781477543
+ en 222344.60533674964 3368137.0294246487
+ ll2 30.400635846696986 126.11193781477539
EPSG:2736
ll -34.279158783573095 41.85814475409174
- en 1316579.6707994258 6171401.224217238
- ll2 -34.279158762227176 41.858144733638134
+ en 1316579.6707994263 6171401.224217238
+ ll2 -34.27915876222716 41.858144733638134
EPSG:2737
ll -38.10063027005515 42.544517174019575
en 810849.5132605365 5777314.728962472
- ll2 -38.100630269174445 42.54451717483957
+ ll2 -38.100630269174445 42.54451717483958
EPSG:2738
ll 71.07454098351323 129.96261010378572
- en 426160.1018509683 7890160.9481614195
- ll2 71.0745409841918 129.96261010542017
+ en 426160.1018509684 7890160.94816142
+ ll2 71.07454098419181 129.96261010542017
EPSG:2739
ll -20.37558807628413 136.35749540314958
- en 641649.8084910243 -2254454.6760132457
+ en 641649.8084910243 -2254454.6760132452
ll2 -20.375588070662058 136.3574953991805
EPSG:27391
ll 15.354420032607678 9.177714465111906
- en 335485.0377224103 -4730669.757157128
- ll2 15.354420212125966 9.17771450357719
+ en 335485.0377224103 -4730669.757157129
+ ll2 15.354420212125959 9.17771450357719
EPSG:27392
ll -30.225114594457395 14.588096776235197
- en 597241.0373266239 -9792362.827733079
- ll2 -30.225114162193925 14.588096830368809
+ en 597241.0373266246 -9792362.82773308
+ ll2 -30.225114162193933 14.588096830368817
EPSG:27393
ll 45.44825014244924 19.837385350274204
en 713236.4393500477 -1356039.689455975
- ll2 45.448250108679524 19.837385233836336
+ ll2 45.44825010867953 19.837385233836333
EPSG:27394
ll -48.842509422607364 12.385465009279915
en -61533.42632644932 -1.1843205038070666E7
- ll2 -48.842508961909395 12.38546508607369
+ ll2 -48.84250896190938 12.385465086073689
EPSG:27395
ll 32.09011067769565 25.06701544198264
- en 773378.7736948335 -2850117.7786006546
- ll2 32.0901107315787 25.067015469706348
+ en 773378.7736948333 -2850117.7786006555
+ ll2 32.09011073157868 25.067015469706355
EPSG:27396
ll -72.72828252534578 22.21288049243728
- en 43716.690363202266 -1.4504312111266812E7
- ll2 -72.72828209874883 22.212880487566775
+ en 43716.69036320239 -1.4504312111266812E7
+ ll2 -72.72828209874885 22.21288048756678
EPSG:27397
ll -81.14171221846802 31.905641690630816
- en 120205.1681643779 -1.5450221380683536E7
- ll2 -81.14171183028344 31.90564125049009
+ en 120205.16816437793 -1.5450221380683536E7
+ ll2 -81.14171183028346 31.90564125049009
EPSG:27398
ll 27.15708292799394 22.979247581665483
- en -602646.3578758165 -3411744.164601104
- ll2 27.15708302025545 22.979247609190807
+ en -602646.3578758166 -3411744.1646011025
+ ll2 27.157083020255467 22.979247609190804
EPSG:2740
ll -11.243658444046545 136.1723816666513
en 300312.93021853804 -1243959.8727685572
@@ -4583,82 +4583,82 @@ EPSG:2740
EPSG:2741
ll -76.92071540291835 143.51230834639958
en 563386.9461912469 -8542727.17443804
- ll2 -76.92071537617475 143.5123082530079
+ ll2 -76.92071537617475 143.51230825300792
EPSG:2742
ll -66.9736093886086 143.04517866800964
en 458212.9546277189 -7431736.884511868
- ll2 -66.97360936322298 143.04517862118783
+ ll2 -66.97360936322299 143.04517862118783
EPSG:27429
ll 28.93270233889939 -17.992339289579945
- en -378426.11926134606 3234026.8604081003
- ll2 28.932702320486452 -17.992339289337835
+ en -378426.11926134606 3234026.8604080994
+ ll2 28.932702320486445 -17.99233928933783
EPSG:2743
ll -9.5430219467124 154.35404026609774
- en 1309413.902540439 -1063880.1534681653
- ll2 -9.543021939145337 154.354040245202
+ en 1309413.9025404393 -1063880.1534681655
+ ll2 -9.543021939145339 154.354040245202
EPSG:2744
ll 19.662736685131065 149.93426776628206
en 493001.87556280766 2175116.5458154897
- ll2 19.662736684977602 149.9342677666276
+ ll2 19.662736684977606 149.9342677666276
EPSG:2745
ll 59.68608408436876 150.95004342516498
en 384435.04339510994 6620967.32345233
- ll2 59.68608408457995 150.9500434265026
+ ll2 59.68608408457996 150.9500434265026
EPSG:2746
ll -50.93803201209828 148.04875758420454
- en -58652.27203612705 -5675357.987447887
- ll2 -50.938031969372645 148.04875761608045
+ en -58652.27203612891 -5675357.987447886
+ ll2 -50.93803196937265 148.04875761608042
EPSG:2747
ll -48.13679652357388 151.6142713985422
en -49662.37147655431 -5360070.957573772
- ll2 -48.13679649023041 151.61427139700547
+ ll2 -48.1367964902304 151.61427139700547
EPSG:2748
ll 40.970174578687875 160.08618890897128
- en 338784.1736743093 4539122.878977443
- ll2 40.97017457874011 160.08618890828203
+ en 338784.1736743092 4539122.878977442
+ ll2 40.970174578740114 160.08618890828203
EPSG:2749
ll -73.47733824107723 156.84868987521457
- en 241746.99795155483 -8174692.116185769
- ll2 -73.4773382127073 156.84868992591956
+ en 241746.99795155504 -8174692.11618577
+ ll2 -73.47733821270731 156.84868992591962
EPSG:27493
ll 27.208793870154096 -2.579931338368027
- en 550650.202469239 -1369718.3279875831
- ll2 27.20879386529854 -2.5799313442356113
+ en 550650.2024692391 -1369718.327987583
+ ll2 27.20879386529854 -2.579931344235611
EPSG:2750
ll -80.36640135673974 173.65217969866228
- en 605356.2423409637 -8931275.454549532
- ll2 -80.36640134303104 173.6521794981462
+ en 605356.2423409641 -8931275.454549532
+ ll2 -80.36640134303104 173.65217949814615
EPSG:27500
ll 74.90767566529507 44.117455583216284
en 1663246.5766141848 3534533.840536346
ll2 74.90767566529506 44.117455583216284
EPSG:2751
ll 49.5303867817245 169.44341934248044
- en 387190.26709669526 5489891.982997866
- ll2 49.53038678200108 169.4434193384778
+ en 387190.26709669526 5489891.982997867
+ ll2 49.53038678200109 169.44341933847778
EPSG:2752
ll 82.22210270243943 167.12338883559107
- en 396171.81658656185 9139578.788569003
+ en 396171.8165865623 9139578.788569003
ll2 82.2221027009617 167.12338884211718
EPSG:2753
ll 33.79048532994845 170.95570633562625
en -60302.52123231022 3757006.0847999905
- ll2 33.79048532921244 170.95570632846855
+ ll2 33.790485329212444 170.95570632846866
EPSG:2754
ll -7.149081149849536 170.22055456270613
- en -585539.0804567563 -802087.1099006699
+ en -585539.0804567593 -802087.1099006699
ll2 -7.149081129956837 170.2205546808185
EPSG:2755
ll -31.884966668609046 -179.74706251271073
en 239912.5340054867 -3532371.845782806
- ll2 -31.884966653007265 -179.74706254095875
+ ll2 -31.884966653007265 -179.74706254095878
EPSG:2756
ll -81.90680586026245 -170.5141557763218
- en 554645.9941523074 -9099849.568006247
+ en 554645.9941523073 -9099849.568006247
ll2 -81.90680585633136 -170.51415602729836
EPSG:27561
ll 48.687023294540744 9.13470536591202
- en 1099861.4328694288 132165.3475888506
+ en 1099861.4328694288 132165.347588852
ll2 48.687023294540765 9.134705365912021
EPSG:27562
ll 47.083336187611536 -1.6746579886431774
@@ -4666,64 +4666,64 @@ EPSG:27562
ll2 47.08333618761155 -1.6746579886431774
EPSG:27563
ll 46.443136133672226 5.992820527372115
- en 881070.7805340262 466693.7656533603
+ en 881070.7805340262 466693.7656533589
ll2 46.44313613367226 5.992820527372113
EPSG:27564
ll 43.42400252536329 0.5163786716368639
en -147178.2200372536 327298.1840058803
- ll2 43.42400252536333 0.5163786716368636
+ ll2 43.42400252536332 0.5163786716368638
EPSG:2757
ll 66.88073356138369 -178.25217974653137
- en 182563.41380948544 7439709.89454834
- ll2 66.88073355440055 -178.25217971492853
+ en 182563.41380948684 7439709.894548341
+ ll2 66.88073355440056 -178.2521797149286
EPSG:27571
ll 63.95885471429971 -33.393138710163996
en -1148173.0908840483 3251269.8912363257
- ll2 63.958854718216806 -33.39313867802236
+ ll2 63.95885471821682 -33.39313867802237
EPSG:27572
ll 85.74660393900494 -71.5151361775664
- en -263764.94843291584 7567986.6758479
- ll2 85.74660394273924 -71.5151358949749
+ en -263764.9484329162 7567986.6758479
+ ll2 85.7466039427392 -71.51513589497486
EPSG:27573
ll 16.939439840024818 -26.857391519550994
- en -2771275.2637908086 686010.999402822
- ll2 16.939439827738408 -26.85739150842767
+ en -2771275.2637908077 686010.999402822
+ ll2 16.939439827738408 -26.85739150842766
EPSG:27574
ll 14.660095318298147 71.52257682024177
- en 7401625.187107387 4201012.316433659
- ll2 14.660095303005145 71.52257680711169
+ en 7401625.187107384 4201012.316433661
+ ll2 14.660095303005157 71.52257680711169
EPSG:2758
ll -89.49486462651444 -164.96901257368395
en 502850.19043303595 -9945797.439489562
- ll2 -89.4948646290571 -164.96901659637604
+ ll2 -89.49486462905709 -164.96901659637598
EPSG:2759
ll 12.153684846386682 -93.97669933407343
en -689042.6336966744 -2018006.93251166
- ll2 12.153684842047106 -93.97669931214624
+ ll2 12.153684842047108 -93.97669931214624
EPSG:2760
ll -67.5346373189763 -93.24547601250707
- en 355205.0204482082 -1.0824726601943009E7
- ll2 -67.53463731718303 -93.24547600713623
+ en 355205.02044820867 -1.0824726601943009E7
+ ll2 -67.53463731718303 -93.24547600713625
EPSG:2761
ll -22.24788858749926 -108.73131743533928
- en 361314.5912486866 -5892336.53280525
- ll2 -22.247888587499013 -108.7313174353392
+ en 361314.59124868654 -5892336.532805251
+ ll2 -22.247888587499023 -108.73131743533918
EPSG:2762
ll -57.200287631704064 -106.42639250544967
en 544978.119616596 -9785586.816060327
- ll2 -57.20028762925838 -106.42639250797964
+ ll2 -57.20028762925839 -106.42639250797964
EPSG:2763
ll -30.60257427615963 -104.70292938404073
- en 1082645.2406147518 -6852554.729244384
- ll2 -30.602574258835173 -104.7029293931721
+ en 1082645.2406147518 -6852554.729244386
+ ll2 -30.602574258835187 -104.7029293931721
EPSG:2764
ll -18.833692267939202 -146.37519699135308
- en -7947940.3342699995 -4485319.989278818
- ll2 -18.833692267939135 -146.37519699135305
+ en -7947940.334270024 -4485319.989278807
+ ll2 -18.833692267939167 -146.37519699135308
EPSG:2765
ll -21.98041935310271 -10.478346048500242
en 1.2355485613366675E7 -1692097.270074459
- ll2 -21.980419353102594 -10.478346048500255
+ ll2 -21.980419353102594 -10.478346048500242
EPSG:2766
ll 68.73145903388671 -51.25001843840454
en 4986221.429129152 5199098.077014223
@@ -4731,59 +4731,59 @@ EPSG:2766
EPSG:2767
ll 86.84453852721617 -93.45753970780292
en 2403460.75337873 7277704.2676486615
- ll2 86.84453852721653 -93.45753970780291
+ ll2 86.84453852721651 -93.45753970780291
EPSG:2768
ll 84.10313713225742 -101.18521673376671
- en 2425959.1549628456 6851281.722339991
- ll2 84.10313713225791 -101.18521673376671
+ en 2425959.1549628424 6851281.7223400045
+ ll2 84.10313713225797 -101.1852167337667
EPSG:2769
ll 26.03373392900413 -73.00028882513479
- en 6502935.717828292 562057.1246845822
- ll2 26.0337339290037 -73.00028882513479
+ en 6502935.717828293 562057.1246845836
+ ll2 26.033733929003724 -73.00028882513479
EPSG:2770
ll 17.705937395796298 -40.86308530773269
- en 9719114.235120796 1839708.1043965423
- ll2 17.705937395796287 -40.86308530773271
+ en 9719114.2351208 1839708.1043965481
+ ll2 17.705937395796287 -40.8630853077327
EPSG:27700
ll -64.56982588085273 -11.547460633941183
- en -55960.94063119864 -1.272202860552443E7
- ll2 -64.56982507157466 -11.547460225032133
+ en -55960.94063119881 -1.272202860552443E7
+ ll2 -64.56982507157464 -11.54746022503213
EPSG:2771
ll 9.767913033289098 -127.01228569537327
- en 723613.6025032008 -1985660.5254635233
- ll2 9.767913033289126 -127.01228569537327
+ en 723613.6025032003 -1985660.5254635247
+ ll2 9.767913033289114 -127.01228569537327
EPSG:2772
ll 16.17332229107201 -23.938658061426025
en 9098066.973961173 1716459.8538384568
ll2 16.17332229107201 -23.938658061426025
EPSG:2773
ll 52.77545816209953 -132.6688640912985
- en -948441.6262962358 2261413.0611691102
- ll2 52.77545816209979 -132.6688640912985
+ en -948441.6262962335 2261413.0611691084
+ ll2 52.77545816209979 -132.66886409129847
EPSG:2774
ll 85.5352631901499 -34.969724919608325
- en 2109876.483620997 7386509.882150853
- ll2 85.5352631901503 -34.96972491960832
+ en 2109876.483621006 7386509.882150869
+ ll2 85.53526319015032 -34.96972491960831
EPSG:2775
ll 13.537703927929556 -57.13641321324724
- en 2179491.23510165 -2820730.953482667
- ll2 13.537703927929591 -57.13641321324724
+ en 2179491.2351016505 -2820730.9534826684
+ ll2 13.537703927929565 -57.13641321324724
EPSG:2776
ll -44.46463435714092 -80.3384819291825
- en -191673.7047679061 -9144701.947891466
- ll2 -44.464634355963476 -80.33848192925146
+ en -191673.7047679072 -9144701.947891466
+ ll2 -44.46463435596348 -80.33848192925146
EPSG:2777
ll 65.61607255104423 -87.80941562110837
en -113314.52484485286 4604535.035218204
- ll2 65.61607254534411 -87.80941559714329
+ ll2 65.6160725453441 -87.80941559714329
EPSG:2778
ll -30.97587900442661 -88.1909140281358
en -391917.43370829057 -6136647.766919341
- ll2 -30.975879002439683 -88.19091403062302
+ ll2 -30.975879002439687 -88.19091403062303
EPSG:2779
ll 32.96414043464996 -133.21750606643474
en -3822379.30627185 1399069.0416148098
- ll2 32.9641404346502 -133.21750606643474
+ ll2 32.964140434650204 -133.21750606643474
EPSG:2780
ll -78.11140974266306 -83.89558422724747
en 160232.79411506993 -1.1993773862169849E7
@@ -4791,15 +4791,15 @@ EPSG:2780
EPSG:2781
ll -50.51615127785197 -81.7008265056156
en 874862.5372687846 -8920387.134427499
- ll2 -50.51615127783064 -81.70082650560926
+ ll2 -50.51615127783063 -81.70082650560926
EPSG:2782
ll -82.55261833992591 -156.3981794563093
- en 486998.48360035167 -1.1253130774541244E7
- ll2 -82.55261833992655 -156.39817945630932
+ en 486998.4836003517 -1.1253130774541248E7
+ ll2 -82.55261833992657 -156.39817945630935
EPSG:2783
ll 14.659724574590356 -160.28640859943278
- en 109871.32931865886 -624786.5109066605
- ll2 14.659724574568008 -160.28640859933284
+ en 109871.32931865886 -624786.5109066601
+ ll2 14.659724574568012 -160.28640859933284
EPSG:2784
ll -21.53748581402425 -149.02132574489326
en 1432932.0541182403 -4751058.498166357
@@ -4807,15 +4807,15 @@ EPSG:2784
EPSG:2785
ll 35.87642386603345 -153.7512726211668
en 1019403.1749508036 1571770.0950825207
- ll2 35.87642386417196 -153.75127261990292
+ ll2 35.87642386417195 -153.75127261990295
EPSG:2786
ll 89.79078741955809 -154.25118995775756
- en 502408.30719446385 7581831.243305383
- ll2 89.79078741955591 -154.2511899664431
+ en 502408.307194464 7581831.243305381
+ ll2 89.79078741955593 -154.25118996644298
EPSG:2787
ll 13.423013443106356 -104.01341086238159
- en 1085623.1201446718 -3115238.44777723
- ll2 13.423013438503165 -104.01341088079879
+ en 1085623.1201446732 -3115238.447777229
+ ll2 13.423013438503169 -104.0134108807988
EPSG:2788
ll 62.11198763155011 -118.57888610947059
en 261111.30443375107 2283121.759867448
@@ -4823,127 +4823,127 @@ EPSG:2788
EPSG:2789
ll 80.29437191998753 -113.79045262163922
en 836885.6263449399 4303731.078097861
- ll2 80.29437191998795 -113.79045262163963
+ ll2 80.29437191998797 -113.79045262163962
EPSG:2790
ll -61.195134511995306 -83.5900832347419
- en 554906.8564362054 -1.0855739298750913E7
+ en 554906.8564362056 -1.0855739298750913E7
ll2 -61.195134511108364 -83.59008323552908
EPSG:2791
ll -8.25887732528632 -100.03897224949317
en -392824.3849930628 -4986135.281782476
- ll2 -8.258877312086806 -100.03897211848324
+ ll2 -8.258877312086806 -100.03897211848323
EPSG:2792
ll -10.844943996478861 -80.2579267303808
- en 692218.34122047 -5106409.41536749
- ll2 -10.844943996232704 -80.2579267321288
+ en 692218.3412204701 -5106409.41536749
+ ll2 -10.844943996232702 -80.2579267321288
EPSG:2793
ll -29.29984700814198 -91.74833934281082
- en 446517.2804655266 -7153306.794157467
- ll2 -29.299847007825658 -91.74833934338416
+ en 446517.2804655252 -7153306.794157467
+ ll2 -29.299847007825655 -91.7483393433842
EPSG:2794
ll 61.12733136034019 -145.47290416506044
- en -1289512.2777636894 4108920.507754453
- ll2 61.12733136034073 -145.47290416506044
+ en -1289512.2777636829 4108920.507754456
+ ll2 61.12733136034076 -145.47290416506044
EPSG:2795
ll 69.61501533822705 -150.64781356000879
en -1925061.524942046 4284958.599485239
- ll2 69.61501533822795 -150.64781356000879
+ ll2 69.61501533822796 -150.64781356000876
EPSG:2796
ll -0.7397239267188702 -59.51573133109132
- en 5594598.620757434 -3560039.09920518
- ll2 -0.7397239267188396 -59.515731331091345
+ en 5594598.6207574345 -3560039.09920518
+ ll2 -0.7397239267188396 -59.51573133109133
EPSG:2797
ll -10.68796180174285 -112.88769673134975
- en -1788562.4500210118 -5333046.577861341
- ll2 -10.687961801742835 -112.88769673134973
+ en -1788562.4500210085 -5333046.577861335
+ ll2 -10.687961801742809 -112.88769673134978
EPSG:2798
ll -10.864311292221073 -58.40430058692665
en 4429889.069907032 -5489973.061077546
- ll2 -10.864311292221048 -58.404300586926645
+ ll2 -10.864311292221048 -58.40430058692663
EPSG:2799
ll 20.85532394296954 -74.75268558892188
- en 1687281.3310193685 -1170472.7625578907
- ll2 20.855323942969473 -74.75268558892189
+ en 1687281.3310193701 -1170472.7625578907
+ ll2 20.85532394296948 -74.75268558892188
EPSG:2800
ll 78.8568907795144 -118.43343516133177
- en 29828.380402473384 6429280.413545429
- ll2 78.85689077951527 -118.43343516133176
+ en 29828.380402472336 6429280.413545429
+ ll2 78.85689077951525 -118.43343516133181
EPSG:2801
ll 55.796812776920106 -136.07566762125916
- en -2075081.7655453514 3750511.419891985
- ll2 55.796812776920554 -136.0756676212592
+ en -2075081.765545336 3750511.4198919823
+ ll2 55.79681277692056 -136.07566762125916
EPSG:2802
ll -63.10970006827632 -78.35122366024517
- en -195810.91260163538 -1.1874362042638132E7
- ll2 -63.109700016149056 -78.35122301295817
+ en -195810.91260163608 -1.1874362042638132E7
+ ll2 -63.109700016149056 -78.3512230129582
EPSG:2803
ll -9.858284081845042 -74.7952469566628
- en 391799.888285623 -5837710.460246247
- ll2 -9.858284081763433 -74.79524695588499
+ en 391799.88828562293 -5837710.460246247
+ ll2 -9.858284081763435 -74.795246955885
EPSG:2804
ll -13.773751333439494 -57.81949972585696
- en 3445508.1665408053 -6225374.1808487605
- ll2 -13.773751333439447 -57.81949972585694
+ en 3445508.1665408066 -6225374.1808487605
+ ll2 -13.773751333439447 -57.81949972585695
EPSG:2805
ll -10.333573771157399 -61.02098811751573
- en 1878075.8224924966 -5662543.409376434
- ll2 -10.333573771157377 -61.020988117515735
+ en 1878075.8224924975 -5662543.409376431
+ ll2 -10.333573771157363 -61.02098811751573
EPSG:2806
ll 12.856038056325755 -25.305524259753525
- en 5748471.305053687 -1843571.7397938762
- ll2 12.85603805632578 -25.305524259753504
+ en 5748471.305053685 -1843571.7397938776
+ ll2 12.856038056325783 -25.305524259753525
EPSG:2807
ll 75.23394214595973 -116.32932558711201
- en 7022863.932653991 3755898.595686254
- ll2 75.23394214596067 -116.32932558711202
+ en 7022863.93265399 3755898.595686259
+ ll2 75.23394214596065 -116.32932558711201
EPSG:2808
ll 46.00910961425028 -74.36718727690669
- en 6772571.764134278 346886.6382694416
- ll2 46.009109614250356 -74.3671872769067
+ en 6772571.764134279 346886.6382694423
+ ll2 46.00910961425036 -74.36718727690668
EPSG:2809
ll -11.71698226696681 -122.17420883184334
en -2018364.0674585793 -5457811.446057936
- ll2 -11.71698226696678 -122.17420883184334
+ ll2 -11.716982266966781 -122.17420883184334
EPSG:2810
ll 3.807024014509265 -87.54024080648465
- en 1599609.634983512 -5063368.950650041
- ll2 3.807024014509291 -87.54024080648463
+ en 1599609.6349835102 -5063368.950650041
+ ll2 3.8070240145092904 -87.54024080648465
EPSG:2811
ll 46.96825011753176 -45.70324582923561
- en 4267384.395409654 1415964.2571504584
- ll2 46.96825011753187 -45.70324582923562
+ en 4267384.395409655 1415964.257150459
+ ll2 46.96825011753187 -45.7032458292356
EPSG:2812
ll 26.556853396981545 -136.6557925705461
- en -3447986.2086168397 -620756.2077403695
- ll2 26.55685339698105 -136.65579257054608
+ en -3447986.2086168416 -620756.2077403667
+ ll2 26.556853396981058 -136.6557925705461
EPSG:2813
ll 29.355332518635493 -85.6003471077788
- en 614006.6811984811 -11688.665562897037
- ll2 29.35533251859976 -85.6003471077093
+ en 614006.6811984811 -11688.665562897744
+ ll2 29.35533251859976 -85.60034710770928
EPSG:2814
ll 40.19478515355635 -80.4907438339569
- en 1538743.732732093 1233154.8156365948
- ll2 40.19478510219783 -80.49074402234972
+ en 1538743.732732093 1233154.8156365957
+ ll2 40.19478510219785 -80.4907440223497
EPSG:2815
ll 19.370635881882833 -84.19420099248845
- en 913474.2303450736 -1812088.6275912432
- ll2 19.370635880871 -84.19420099225766
+ en 913474.2303450736 -1812088.6275912423
+ ll2 19.370635880871014 -84.19420099225765
EPSG:2816
ll -68.85162687498956 -89.66724089835034
en 614060.9101960382 -1.160978067099279E7
- ll2 -68.85162687496711 -89.66724089835945
+ ll2 -68.85162687496711 -89.66724089835947
EPSG:2817
ll 44.634296554056675 -89.59520760007784
- en 1239162.9678924466 951930.4299354706
+ en 1239162.9678924466 951930.4299354713
ll2 44.634296552896295 -89.59520760001823
EPSG:2818
ll 44.27655933141987 -53.449034753624474
- en 4704539.71696707 1537639.1803034022
- ll2 44.27655933141996 -53.44903475362446
+ en 4704539.716967067 1537639.1803034043
+ ll2 44.27655933141997 -53.44903475362448
EPSG:2819
ll 69.883905947839 -98.55087041633416
- en 565297.1789718424 3506111.539885106
- ll2 69.8839059478399 -98.55087041633419
+ en 565297.1789718431 3506111.539885106
+ ll2 69.8839059478399 -98.55087041633416
EPSG:28191
ll -21.570203053454662 34.57767652812345
en 104754.31384402225 -5771883.990347592
@@ -4958,19 +4958,19 @@ EPSG:28193
ll2 20.97163233889922 36.158968021027356
EPSG:2820
ll 67.94752804358941 -117.02701082508148
- en 139497.1461777555 1.1693509050683323E7
- ll2 67.94752804358984 -117.02701082508146
+ en 139497.14617775427 1.1693509050683323E7
+ ll2 67.94752804358983 -117.02701082508149
EPSG:2821
ll -42.043841103831696 -123.07298810008213
en -30465.262780896737 -2522418.9944146127
- ll2 -42.04384109875494 -123.07298809836449
+ ll2 -42.043841098754946 -123.07298809836446
EPSG:2822
ll -18.636610438025315 -109.13250874345358
- en 1800774.4141015396 -1934259.1817195695
- ll2 -18.636610424009287 -109.13250876584567
+ en 1800774.4141015396 -1934259.1817195704
+ ll2 -18.636610424009294 -109.13250876584567
EPSG:2823
ll -48.38233620884156 -74.97020693549885
- en 55323.237163366284 -1.0073057549397146E7
+ en 55323.237163366255 -1.0073057549397146E7
ll2 -48.38233620872094 -74.97020693552665
EPSG:28232
ll -70.45503435010494 3.1018593674818993
@@ -4978,28 +4978,28 @@ EPSG:28232
ll2 -70.45503434803219 3.101859367862905
EPSG:2824
ll -28.889936726296277 -67.07211317738093
- en 875547.6929330528 -7519126.022270628
- ll2 -28.88993672132557 -67.07211317231916
+ en 875547.6929330527 -7519126.022270628
+ ll2 -28.889936721325565 -67.07211317231916
EPSG:2825
ll -15.941341386781247 -113.38673677328106
- en -807683.0418034304 -5214888.661877395
- ll2 -15.941341376676549 -113.38673674623507
+ en -807683.0418034318 -5214888.661877396
+ ll2 -15.941341376676549 -113.38673674623509
EPSG:2826
ll -14.48445216665192 -97.89703400011089
en 1403212.5934185013 -5048970.132863197
ll2 -14.4844521610241 -97.89703401858623
EPSG:2827
ll 13.791147118052095 -105.01219284594828
- en 1135136.9177355184 -1903785.162035582
- ll2 13.791147118047668 -105.01219284598093
+ en 1135136.9177355184 -1903785.1620355817
+ ll2 13.791147118047675 -105.01219284598092
EPSG:2828
ll -76.88530607124872 -82.28608994083882
- en -46728.080452051654 -1.2849147629930003E7
- ll2 -76.88530606884936 -82.28608984386928
+ en -46728.08045205186 -1.2849147629930003E7
+ ll2 -76.88530606884937 -82.28608984386928
EPSG:2829
ll 80.56719896144088 -79.04353955635025
- en 204984.4114553674 4519616.415657315
- ll2 80.5671989614404 -79.04353955634721
+ en 204984.41145536746 4519616.415657317
+ ll2 80.56719896144043 -79.0435395563472
EPSG:2830
ll -81.25546707294149 -77.42600220753225
en 369648.29745417746 -1.3454214588181432E7
@@ -5007,87 +5007,87 @@ EPSG:2830
EPSG:2831
ll -2.887523887112117 4.6400604285290115
en 1.022760993770531E7 -452063.89778443007
- ll2 -2.8875238871120725 4.6400604285290115
+ ll2 -2.887523887112072 4.6400604285290115
EPSG:2832
ll 9.612135208036918 -82.38090980409739
- en 3002624.629783563 -4164012.930349537
- ll2 9.612135208036946 -82.38090980409739
+ en 3002624.629783558 -4164012.9303495334
+ ll2 9.61213520803696 -82.38090980409739
EPSG:2833
ll 82.09318929267518 -38.473688627783076
- en 1793493.568673977 4938840.655788727
- ll2 82.09318929267583 -38.47368862778306
+ en 1793493.5686739765 4938840.655788726
+ ll2 82.09318929267582 -38.473688627783076
EPSG:2834
ll 63.14341650959699 -25.61803307002475
- en 3515421.7982826657 3667907.604894273
- ll2 63.143416509597635 -25.61803307002476
+ en 3515421.7982826573 3667907.6048942753
+ ll2 63.14341650959764 -25.618033070024765
EPSG:28348
ll 21.832175371059748 103.11215928443376
- en 304881.32494540047 1.2415447044539617E7
- ll2 21.832175371058973 103.11215928443332
+ en 304881.32494540344 1.241544704453962E7
+ ll2 21.832175371059005 103.11215928443336
EPSG:28349
ll -10.235491604420758 109.17901958781029
- en 300542.4233536497 8867987.182544267
- ll2 -10.235491604420528 109.17901958781549
+ en 300542.4233536527 8867987.182544267
+ ll2 -10.23549160442053 109.17901958781552
EPSG:2835
ll 17.96802310822084 -10.77489989610288
- en 7880655.046102923 780930.6804986205
- ll2 17.96802310822086 -10.774899896102882
+ en 7880655.046102923 780930.6804986262
+ ll2 17.968023108220862 -10.774899896102864
EPSG:28350
ll -82.86031577211327 109.49456201271676
- en 396142.78144527914 792374.6501030307
- ll2 -82.86031577194312 109.49456208604792
+ en 396142.7814452793 792374.6501030289
+ ll2 -82.86031577194312 109.49456208604794
EPSG:28351
ll -63.06419858258763 116.83308400418903
- en 188671.49853009428 2992300.564831852
- ll2 -63.06419857877969 116.83308401335827
+ en 188671.49853009352 2992300.564831853
+ ll2 -63.06419857877969 116.83308401335825
EPSG:28352
ll 83.18527454298663 134.725121952039
- en 575721.4254566985 1.9240901383792464E7
- ll2 83.18527454292673 134.72512194571397
+ en 575721.4254566989 1.9240901383792464E7
+ ll2 83.18527454292673 134.725121945714
EPSG:28353
ll 31.493699271043738 139.22874205111825
en 901773.355892359 1.3492072495057745E7
- ll2 31.493699270830987 139.22874205146172
+ ll2 31.493699270830987 139.2287420514617
EPSG:28354
ll 73.15795172306926 147.37055437421287
- en 705667.099414308 1.8129056434111536E7
- ll2 73.15795172140336 147.37055435920306
+ en 705667.099414307 1.8129056434111536E7
+ ll2 73.15795172140338 147.37055435920306
EPSG:28355
ll 79.23754119622251 142.27604222708695
- en 401624.94099382136 1.8800472294519037E7
- ll2 79.23754119613676 142.2760422281677
+ en 401624.94099382125 1.8800472294519033E7
+ ll2 79.23754119613672 142.27604222816777
EPSG:28356
ll 37.24503677351093 160.164629471205
en 1135873.6848876467 1.4146189423171137E7
- ll2 37.245036766071195 160.16462946992374
+ ll2 37.245036766071195 160.1646294699237
EPSG:28357
ll 15.41355991534519 158.41835449740907
- en 437589.640588919 1.1704152589305999E7
- ll2 15.413559915345177 158.418354497409
+ en 437589.64058892813 1.1704152589305999E7
+ ll2 15.413559915345179 158.4183544974091
EPSG:28358
ll -70.59899245501776 174.85779424918164
- en 864056.7662661572 2137697.4886495993
- ll2 -70.5989924314284 174.85779348986472
+ en 864056.7662661561 2137697.4886495993
+ ll2 -70.5989924314284 174.85779348986478
EPSG:2836
ll 17.935868862087645 -153.14236747779543
- en -5202950.698821453 -229792.92318428447
- ll2 17.935868862087634 -153.14236747779543
+ en -5202950.698821457 -229792.92318426748
+ ll2 17.93586886208764 -153.14236747779543
EPSG:2837
ll 88.05302676954959 -32.131122585840075
en 1403350.3950990872 8348058.998446782
- ll2 88.05302676954975 -32.13112258584008
+ ll2 88.05302676954972 -32.13112258584008
EPSG:2838
ll 24.074683461176164 -97.18443795868691
- en 4987610.527899092 -1861570.2326931565
- ll2 24.074683461175947 -97.1844379586869
+ en 4987610.52789909 -1861570.2326931579
+ ll2 24.074683461175937 -97.18443795868691
EPSG:2839
ll 59.063001036441904 -164.31804561046323
en -1006563.6233224301 2630941.369756775
ll2 59.06300103644239 -164.31804561046323
EPSG:2840
ll -82.44604132332036 -68.32994400133197
- en 146520.86991129792 -1.3709301561963763E7
- ll2 -82.44604132331807 -68.32994400136234
+ en 146520.86991129804 -1.3709301561963765E7
+ ll2 -82.44604132331806 -68.32994400136232
EPSG:28404
ll 19.184618982477986 23.617173288787125
en 4775457.807633544 2124284.635406078
@@ -5095,235 +5095,235 @@ EPSG:28404
EPSG:28405
ll 15.28426865037855 36.708352722490346
en 6547215.090030165 1714097.2185204232
- ll2 15.284268635842476 36.70835267134097
+ ll2 15.284268635842475 36.70835267134097
EPSG:28406
ll -35.60457657778439 33.95132134387434
- en 6586311.015739959 -3942044.2007237137
- ll2 -35.604576561834776 33.95132136826248
+ en 6586311.015739959 -3942044.2007237133
+ ll2 -35.60457656183477 33.95132136826248
EPSG:28407
ll -2.981367817262509 30.14000862976606
- en 6511174.447041628 -333577.6262937502
- ll2 -2.981367807622221 30.14000871649704
+ en 6511174.447041628 -333577.62629375025
+ ll2 -2.9813678076222225 30.14000871649704
EPSG:28408
ll 28.36793296816849 51.538545338992506
- en 9141812.115932899 3156754.415647473
- ll2 28.367932964922634 51.5385453395656
+ en 9141812.115932899 3156754.4156474727
+ ll2 28.36793296492263 51.5385453395656
EPSG:28409
ll 46.63089294687745 44.25849153466909
en 8983913.46419534 5188423.421926229
- ll2 46.63089293843458 44.258491540716506
+ ll2 46.630892938434584 44.25849154071653
EPSG:2841
ll -7.515669853093999 -170.4368409180324
- en -9352321.716584284 -1882842.1668328282
- ll2 -7.515669853094035 -170.43684091803243
+ en -9352321.716584263 -1882842.166832851
+ ll2 -7.515669853094035 -170.43684091803235
EPSG:28410
ll -5.680151124759249 51.86384924269858
- en 9930351.203784581 -630544.6671321611
- ll2 -5.68015112237486 51.86384924752224
+ en 9930351.20378458 -630544.6671321611
+ ll2 -5.68015112237486 51.863849247522225
EPSG:28411
ll 33.247210273589204 71.5279417699767
en 1.2295974902554253E7 3712854.703151755
- ll2 33.24721025819822 71.52794175702019
+ ll2 33.24721025819823 71.52794175702019
EPSG:28412
ll -20.05534335282063 71.49510926374424
- en 1.2761124576051453E7 -2220358.9402640113
+ en 1.2761124576051455E7 -2220358.9402640117
ll2 -20.055343349997013 71.49510926544816
EPSG:28413
ll 28.74387959065308 73.4214210178472
en 1.3345840278083973E7 3181970.157299379
- ll2 28.74387958970247 73.42142101332391
+ ll2 28.74387958970247 73.42142101332388
EPSG:28414
ll -57.58094364862496 89.1373983886582
- en 1.4986127787759641E7 -6413775.642467014
- ll2 -57.58094360041957 89.13739829955968
+ en 1.4986127787759643E7 -6413775.642467014
+ ll2 -57.58094360041957 89.1373982995597
EPSG:28415
ll 61.54927099421755 88.56605448968509
- en 1.5583290801828755E7 6827734.088141508
- ll2 61.54927099765151 88.56605448734982
+ en 1.5583290801828757E7 6827734.088141508
+ ll2 61.54927099765151 88.56605448734983
EPSG:28416
ll -16.231458463475803 97.34775208433348
- en 1.696518743184074E7 -1800110.444199795
- ll2 -16.231458464778367 97.34775208414331
+ en 1.696518743184074E7 -1800110.4441997951
+ ll2 -16.23145846477837 97.34775208414331
EPSG:28417
ll -6.932553441156031 107.17814721880517
- en 1.8406760836549286E7 -774368.251899831
- ll2 -6.932553441752471 107.17814718305873
+ en 1.8406760836549282E7 -774368.251899831
+ ll2 -6.93255344175247 107.1781471830587
EPSG:28418
ll 34.130407886043116 105.79436448067983
- en 1.8573246469712347E7 3778460.1388100963
- ll2 34.13040788676735 105.79436448226419
+ en 1.8573246469712347E7 3778460.1388100972
+ ll2 34.13040788676736 105.79436448226419
EPSG:28419
ll -58.41779481067138 111.41025672531374
- en 1.952392656453936E7 -6477843.003915697
- ll2 -58.41779478598108 111.41025671699714
+ en 1.952392656453936E7 -6477843.003915696
+ ll2 -58.41779478598106 111.41025671699717
EPSG:2842
ll 72.76941191702103 -127.47289712077418
- en -451717.12450813316 3743031.8068149113
- ll2 72.76941191702198 -127.47289712077418
+ en -451717.12450813246 3743031.8068149136
+ ll2 72.76941191702201 -127.47289712077418
EPSG:28420
ll 31.509465893904306 113.9468079470582
en 2.0209848972125877E7 3491555.8526448044
ll2 31.509465893819993 113.94680795026439
EPSG:28421
ll -4.828981550440375 114.91955582673702
- en 2.0600616402643934E7 -539260.5887253745
+ en 2.0600616402643934E7 -539260.5887253744
ll2 -4.828981551817543 114.91955586533115
EPSG:28422
ll -38.8058530095232 135.60500333635323
- en 2.3073912057213984E7 -4317674.044164641
- ll2 -38.80585299062282 135.60500332548216
+ en 2.3073912057213984E7 -4317674.044164642
+ ll2 -38.80585299062283 135.60500332548216
EPSG:28423
ll -10.39702055548085 134.77284883953098
- en 2.34750167310913E7 -1149704.4075947774
- ll2 -10.397020554612425 134.77284883880125
+ en 2.34750167310913E7 -1149704.4075947776
+ ll2 -10.397020554612427 134.77284883880125
EPSG:28424
ll -6.43148124585251 148.03539786509762
- en 2.5280087583073426E7 -716500.3089329841
- ll2 -6.43148124210587 148.0353978483633
+ en 2.5280087583073422E7 -716500.3089329839
+ ll2 -6.431481242105869 148.03539784836326
EPSG:28425
ll 79.15579616673949 145.87386590873396
en 2.5476235135647196E7 8791168.782437125
ll2 79.15579616542487 145.8738659014018
EPSG:28426
ll 71.97739034799679 157.4797689962188
- en 2.6654513056016397E7 7995428.869722111
- ll2 71.97739034698722 157.47976899172244
+ en 2.6654513056016397E7 7995428.869722112
+ ll2 71.97739034698724 157.47976899172244
EPSG:28427
ll -19.481619765485576 155.2867741716042
en 2.710979918979231E7 -2159146.7672845884
- ll2 -19.48161975657782 155.28677416126814
+ ll2 -19.481619756577828 155.28677416126808
EPSG:28428
ll 72.08863825642183 166.0322136900184
- en 2.8535309333452657E7 8002418.752700696
- ll2 72.08863825558645 166.03221368220207
+ en 2.8535309333452657E7 8002418.752700698
+ ll2 72.08863825558646 166.03221368220207
EPSG:28429
ll -55.38503578851686 179.72368923790947
- en 3.0052004197750486E7 -6174830.05729377
- ll2 -55.385035735138594 179.7236890143648
+ en 3.0052004197750483E7 -6174830.05729377
+ ll2 -55.385035735138594 179.72368901436482
EPSG:2843
ll -5.276633625400965 -111.81730129504973
- en -2994186.8913243073 -4298650.809643972
- ll2 -5.2766336254009145 -111.81730129504975
+ en -2994186.891324306 -4298650.8096439745
+ ll2 -5.276633625400925 -111.81730129504973
EPSG:28430
ll 0.05819326035367567 173.02806650930566
- en 3.0057319087711446E7 6520.683033158252
- ll2 0.05819326795742384 173.02806649703567
+ en 3.0057319087711442E7 6520.683033158253
+ ll2 0.058193267957423855 173.0280664970357
EPSG:28431
ll 16.884223973982614 -168.68976871458398
- en 3.2387913660224393E7 1886387.9746583349
- ll2 16.884223977708952 -168.68976874318372
+ en 3.238791366022438E7 1886387.9746583344
+ ll2 16.884223977708952 -168.68976874318378
EPSG:28432
ll -0.8875521898879697 -178.52645480103192
- en 3.1659640692535553E7 -98930.11273467423
- ll2 -0.8875521793902829 -178.52645479345017
+ en 3.1659640692535557E7 -98930.11273467421
+ ll2 -0.8875521793902829 -178.52645479345026
EPSG:2844
ll 50.959065896917004 -138.81533119343845
en -2464219.2856230508 3415285.9375529187
ll2 50.959065896917224 -138.81533119343845
EPSG:2845
ll 17.91901259165654 -148.15361862073792
- en -4637983.427672049 1719847.5644626347
- ll2 17.919012591656536 -148.15361862073792
+ en -4637983.42767205 1719847.5644626347
+ ll2 17.91901259165654 -148.15361862073792
EPSG:2846
ll -8.477447929223612 -151.14142259326263
- en -6065932.726349096 1665.310613100417
- ll2 -8.477447929223546 -151.1414225932626
+ en -6065932.726349099 1665.31061309902
+ ll2 -8.477447929223572 -151.14142259326263
EPSG:2847
ll -10.361105664550042 -159.01496481262427
en -7307806.496608597 1490613.2103995103
ll2 -10.361105664550005 -159.01496481262427
EPSG:2848
ll 21.272977578994627 -99.4558860235732
- en 200322.55827025208 4512796.27335209
- ll2 21.272977578994556 -99.45588602357321
+ en 200322.55827025353 4512796.27335209
+ ll2 21.272977578994556 -99.4558860235732
EPSG:2849
ll 42.52663342735272 -56.2238944799401
- en 4742428.723968051 2640350.079559206
- ll2 42.5266334273528 -56.223894479940135
+ en 4742428.723968052 2640350.079559207
+ ll2 42.52663342735279 -56.22389447994011
EPSG:2850
ll -16.786533101709935 -46.43812483323225
en 1.0475092537638202E7 -1382514.1010371433
ll2 -16.78653310170989 -46.43812483323226
EPSG:2851
ll 77.06739075034419 -104.58870020297142
- en 748383.6083545929 8006624.462281467
- ll2 77.06739075034508 -104.58870020297144
+ en 748383.6083545934 8006624.462281467
+ ll2 77.06739075034508 -104.58870020297142
EPSG:2852
ll 30.131059404965313 -72.44170837814633
- en 505616.7365525296 -1372483.699163873
- ll2 30.13105940496396 -72.44170837814633
+ en 505616.7365525296 -1372483.6991638737
+ ll2 30.131059404963956 -72.44170837814633
EPSG:2853
ll 36.735086265994774 -18.10592184449891
- en 8516012.796182487 3608719.9344904935
- ll2 36.735086265994894 -18.105921844498916
+ en 8516012.796182487 3608719.9344904954
+ ll2 36.7350862659949 -18.105921844498887
EPSG:2854
ll 86.33923001118484 -123.41876952103317
- en 2772412.3087434755 8064748.778562766
- ll2 86.33923001118515 -123.41876952103316
+ en 2772412.3087434648 8064748.778562801
+ ll2 86.33923001118517 -123.41876952103317
EPSG:2855
ll 50.384565002527054 -97.53997170045061
- en 2132694.057625518 625425.8755850751
- ll2 50.38456500252724 -97.53997170045061
+ en 2132694.057625517 625425.8755850773
+ ll2 50.384565002527275 -97.5399717004506
EPSG:2856
ll 35.40827317235953 -129.8255833817529
- en -360300.01760368014 -1058623.5718570172
- ll2 35.408273172359706 -129.8255833817529
+ en -360300.0176036798 -1058623.571857018
+ ll2 35.40827317235968 -129.8255833817529
EPSG:2857
ll -9.354742510932127 -75.79178928747676
- en 1169762.4341860055 -5957767.231728786
+ en 1169762.4341860043 -5957767.231728779
ll2 -9.354742510932093 -75.79178928747676
EPSG:2858
ll 59.384137112476516 -64.58445470512787
- en 1604516.5855652392 2638860.9628428076
- ll2 59.38413711247699 -64.58445470512788
+ en 1604516.5855652401 2638860.9628428086
+ ll2 59.38413711247701 -64.58445470512785
EPSG:2859
ll 46.96198480599918 -54.17272305810374
- en 3235386.6850502244 804219.1658124324
- ll2 46.96198480599928 -54.17272305810374
+ en 3235386.685050223 804219.1658124353
+ ll2 46.96198480599932 -54.17272305810375
EPSG:2860
ll 26.45409900869919 -47.69824251502665
- en 4827083.195466883 -834877.0429249188
- ll2 26.454099008698712 -47.698242515026635
+ en 4827083.195466881 -834877.0429249174
+ ll2 26.45409900869872 -47.69824251502665
EPSG:28600
ll 56.36454950371004 41.22067137692805
en -416492.36961739336 3888874.9807494367
- ll2 56.36454941600867 41.22067199673184
+ ll2 56.364549416008664 41.22067199673183
EPSG:2861
ll 27.44473716678757 -69.27049524025287
en 2702841.90629927 -1373723.921196759
ll2 27.444737166786943 -69.27049524025288
EPSG:2862
ll -54.859968314021 -99.42707879961206
- en 568346.5064920555 -1.0581138110791167E7
- ll2 -54.85996831069406 -99.42707880296317
+ en 568346.5064920546 -1.0581138110791167E7
+ ll2 -54.85996831069405 -99.4270788029632
EPSG:2863
ll -36.63660558567621 -114.5512629071745
en -245977.62937221385 -8465053.51153763
- ll2 -36.63660557821709 -114.55126290632343
+ ll2 -36.636605578217086 -114.55126290632342
EPSG:2864
ll 83.39970938300581 -101.87275535111752
en 688076.7563663863 4784695.793046292
- ll2 83.39970938290091 -101.87275538442039
+ ll2 83.39970938290091 -101.8727553844204
EPSG:2865
ll -14.340130687515867 -103.43988523446411
- en 1518027.2117974865 -5980991.410565446
- ll2 -14.340130686341144 -103.43988523806011
+ en 1518027.2117974882 -5980991.410565445
+ ll2 -14.340130686341125 -103.43988523806011
EPSG:2866
ll 26.909072405575685 -43.690097190523915
- en 2479762.7634973535 1350488.828777427
- ll2 26.909072405575163 -43.69009719052391
+ en 2479762.7634973507 1350488.8287774299
+ ll2 26.909072405575138 -43.690097190523915
EPSG:2867
ll 10.887552943926792 -105.48318582913151
en 2381502.08891441 -7292522.059915097
- ll2 10.887552943831905 -105.48318582987628
+ ll2 10.887552943831903 -105.48318582987628
EPSG:2868
ll 17.58220704284396 -111.02733489806285
- en 1009703.5644669728 -4874878.439280747
- ll2 17.58220704284394 -111.0273348980629
+ en 1009703.5644669728 -4874878.439280748
+ ll2 17.582207042843937 -111.02733489806289
EPSG:2869
ll -26.889995231426624 -111.26784308854157
- en 1509169.792607858 -2.1024953800494827E7
- ll2 -26.889995231420524 -111.26784308852918
+ en 1509169.7926078627 -2.1024953800494824E7
+ ll2 -26.88999523142051 -111.26784308852915
EPSG:2870
ll 10.295026349669062 -86.2876930345746
en 2.0771923624875583E7 -6481823.64076025
@@ -5334,64 +5334,64 @@ EPSG:2871
ll2 10.734185311838225 -159.61897622875372
EPSG:2872
ll 55.36443018508368 -57.923475567046864
- en 1.928438052895857E7 1.3049558744614612E7
- ll2 55.364430185084096 -57.92347556704684
+ en 1.9284380528958566E7 1.3049558744614614E7
+ ll2 55.3644301850841 -57.92347556704686
EPSG:2873
ll 82.93631726624601 -124.0230056723222
en 6139413.478559972 2.2226614446755815E7
- ll2 82.9363172662466 -124.02300567232223
+ ll2 82.9363172662466 -124.02300567232221
EPSG:2874
ll 18.644980047593336 -139.74830914924104
- en -1193168.8136852721 -2991262.9051375734
+ en -1193168.8136852721 -2991262.90513756
ll2 18.644980047593332 -139.748309149241
EPSG:2875
ll 27.982531527673814 -152.3337020993197
- en -4901867.806495693 2119652.4935996328
+ en -4901867.806495694 2119652.4935996328
ll2 27.982531527673064 -152.3337020993197
EPSG:2876
ll 0.4579967120290185 -93.92801226438294
- en 8250683.392146803 -1.3921311131100005E7
- ll2 0.45799671202904235 -93.92801226438296
+ en 8250683.392146812 -1.3921311131099999E7
+ ll2 0.45799671202906783 -93.92801226438294
EPSG:2877
ll -7.863306001591633 -100.30192533168015
- en 5560268.834927875 -1.7454327646172132E7
- ll2 -7.863306001591712 -100.30192533168017
+ en 5560268.8349278895 -1.7454327646172162E7
+ ll2 -7.863306001591712 -100.30192533168015
EPSG:2878
ll 75.35317807106279 -166.4393392053377
- en -4221222.33117292 1.894937545059204E7
- ll2 75.35317807106372 -166.4393392053377
+ en -4221222.331172946 1.894937545059206E7
+ ll2 75.35317807106374 -166.43933920533775
EPSG:2879
ll 35.50782647724369 -8.892664088870958
- en 1.8415874990199257E7 5301583.662705568
+ en 1.8415874990199253E7 5301583.66270557
ll2 35.50782647724387 -8.892664088870958
EPSG:2880
ll 17.427842675384028 -70.05543935259566
- en 2527122.2157288715 -7453468.811450203
- ll2 17.427842675061797 -70.05543935286424
+ en 2527122.2157288715 -7453468.811450202
+ ll2 17.4278426750618 -70.05543935286424
EPSG:2881
ll 7.062017112534747 -83.98153772620195
- en -424959.28153747943 -6266800.430403928
- ll2 7.062017112531134 -83.98153772611755
+ en -424959.2815374744 -6266800.430403928
+ ll2 7.062017112531134 -83.98153772611752
EPSG:2882
ll -67.27887426446053 -74.97490390177043
- en 1648188.9779005311 -3.33798300319985E7
- ll2 -67.27887425853888 -74.97490393468826
+ en 1648188.9779005314 -3.3379830031998493E7
+ ll2 -67.27887425853886 -74.97490393468824
EPSG:2883
ll 29.28925771528788 -44.748662556971965
- en 1.4386331295596661E7 2292123.1385279186
- ll2 29.28925771528679 -44.748662556971965
+ en 1.4386331295596663E7 2292123.1385279186
+ ll2 29.28925771528679 -44.74866255697196
EPSG:2884
ll 2.016130059508498 -91.12928327744198
en -2628306.2190583316 -1.0151222187732307E7
ll2 2.0161300576708907 -91.12928319425667
EPSG:2885
ll -13.709587689276745 -82.69291422754515
- en 2819590.924454928 -1.5867195155496377E7
- ll2 -13.709587689276667 -82.69291422754638
+ en 2819590.9244549223 -1.5867195155496381E7
+ ll2 -13.709587689276672 -82.6929142275464
EPSG:2886
ll 61.39722574468303 -107.95101378457029
- en 1394755.917309999 7225393.327547259
- ll2 61.397225744248836 -107.95101378483679
+ en 1394755.9173099985 7225393.327547268
+ ll2 61.39722574424887 -107.95101378483679
EPSG:2887
ll -40.83497255761329 -105.91828170736183
en 3877750.1598335146 -3.007848523222186E7
@@ -5399,279 +5399,279 @@ EPSG:2887
EPSG:2888
ll -72.07475689636841 -114.08545855390744
en 2812306.920873835 -4.1387824912884325E7
- ll2 -72.07475689636874 -114.08545855390753
+ ll2 -72.07475689636873 -114.08545855390753
EPSG:2891
ll 26.1166029273734 -137.7501506332176
en -1.5314631422283903E7 892833.7785102301
ll2 26.11660292737298 -137.7501506332176
EPSG:2892
ll 75.02619506058451 -131.23661511109816
- en -4059200.0479735928 1.856309672971696E7
- ll2 75.02619506058544 -131.2366151110981
+ en -4059200.0479735904 1.856309672971698E7
+ ll2 75.02619506058547 -131.23661511109822
EPSG:2893
ll 84.72861840871315 -36.22855467720031
en 3899326.015089709 2.1027157301707573E7
- ll2 84.72861840871363 -36.228554677200314
+ ll2 84.72861840871363 -36.22855467720032
EPSG:2894
ll 22.24477776770418 -68.78995259181369
en 1625427.3538287317 -4486770.961258065
ll2 22.24477776770409 -68.78995259181369
EPSG:2895
ll 70.86769146774367 -91.8136784061893
- en -1380852.6259588336 1.188704338615769E7
- ll2 70.8676914677446 -91.81367840618928
+ en -1380852.6259588327 1.188704338615769E7
+ ll2 70.86769146774462 -91.81367840618931
EPSG:2896
ll 51.219135532054906 -138.94745289057153
- en 1.5132118445507025E7 6127866.86356725
- ll2 51.21913553205511 -138.94745289057153
+ en 1.5132118445507023E7 6127866.863567243
+ ll2 51.21913553205513 -138.94745289057153
EPSG:2897
ll 45.22154638495482 -31.027650332854165
en 3.2459251072916564E7 5052994.5402512215
- ll2 45.22154638495491 -31.02765033285417
+ ll2 45.22154638495492 -31.02765033285417
EPSG:2898
ll -17.05069379283582 -124.4716283283828
- en -9133569.72910723 -2.0067545131802883E7
- ll2 -17.05069379283579 -124.4716283283828
+ en -9133569.729107225 -2.0067545131802883E7
+ ll2 -17.05069379283579 -124.47162832838279
EPSG:2899
ll -25.50486490917868 -98.2768016047174
- en -2139320.974213613 -2.0079865113005515E7
- ll2 -25.504864892794934 -98.27680160070503
+ en -2139320.974213617 -2.0079865113005523E7
+ ll2 -25.504864892794945 -98.27680160070506
EPSG:28991
ll -79.88476397853589 -43.97574195676401
- en -5841532.3292005155 -3.0190179134511277E7
- ll2 -79.88476335640664 -43.975738387710166
+ en -5841532.329200517 -3.019017913451129E7
+ ll2 -79.88476335640665 -43.9757383877102
EPSG:28992
ll 53.0773 4.8091
- en 116258.11950901657 565761.7177196551
- ll2 53.0773000049619 4.809100002754373
+ en 116258.1195090166 565761.7177196565
+ ll2 53.07730000496192 4.809100002754373
EPSG:2900
ll -75.7873200782553 -89.55345450617067
- en 2366730.4187101894 -3.831707016881387E7
- ll2 -75.78732007825622 -89.55345450617067
+ en 2366730.4187101894 -3.831707016881388E7
+ ll2 -75.78732007825624 -89.55345450617067
EPSG:2901
ll 63.66681777698207 -170.368907691434
- en -7394814.0972135225 1.1015586441928096E7
- ll2 63.66681777698274 -170.36890769143395
+ en -7394814.097213513 1.1015586441928096E7
+ ll2 63.66681777698275 -170.36890769143392
EPSG:2902
ll -17.9806342915104 -108.2268655085713
en -812369.6827041504 -1.779410038771878E7
ll2 -17.98063429146759 -108.22686550853176
EPSG:2903
ll -21.350966054417043 -103.79378706284625
- en 2476386.0431679017 -1.9010197954070024E7
- ll2 -21.350966054413814 -103.79378706284442
+ en 2476386.043167907 -1.9010197954070024E7
+ ll2 -21.35096605441382 -103.79378706284437
EPSG:2904
ll 28.834465797984294 -100.96187873053285
- en 4925911.723016618 -723602.9687810421
- ll2 28.83446579486459 -100.9618787265097
+ en 4925911.723016618 -723602.9687810467
+ ll2 28.83446579486458 -100.9618787265097
EPSG:2905
ll 85.88871975709523 -78.71869900768407
- en 381402.78585162736 1.72029915207489E7
- ll2 85.88871975709328 -78.71869900727754
+ en 381402.78585162736 1.7202991520748895E7
+ ll2 85.8887197570933 -78.71869900727754
EPSG:2906
ll -9.777054201667994 -69.85151592804685
- en 3248486.210366035 -1.810294668548496E7
+ en 3248486.2103660353 -1.810294668548496E7
ll2 -9.777054200655984 -69.85151593584301
EPSG:2907
ll -48.62214952040123 -85.20874009849065
- en -453675.9519121879 -3.227602506384099E7
- ll2 -48.62214951275739 -85.20874009028589
+ en -453675.95191218413 -3.2276025063840996E7
+ ll2 -48.6221495127574 -85.20874009028589
EPSG:2908
ll 22.649553644605433 -58.76817512545708
en 6341032.204071437 -6012051.511193005
ll2 22.64955364460529 -58.76817512545706
EPSG:2909
ll 54.849199464280545 -128.24980546683537
- en -3795352.574097434 3920649.9272965486
- ll2 54.849199464280865 -128.24980546683537
+ en -3795352.574097441 3920649.9272965486
+ ll2 54.849199464280886 -128.2498054668354
EPSG:2910
ll 82.95570493705308 -122.5796821768268
- en 562763.0164462868 1.5217559071395602E7
- ll2 82.95570493705367 -122.57968217682675
+ en 562763.0164462917 1.5217559071395626E7
+ ll2 82.95570493705371 -122.57968217682681
EPSG:2911
ll 43.78567988934026 -95.91889207054136
- en 2523072.0958542456 3214373.309629246
- ll2 43.78567988934034 -95.91889207054133
+ en 2523072.0958542414 3214373.3096292554
+ ll2 43.78567988934037 -95.91889207054135
EPSG:2912
ll 18.75859387568014 -66.69040394679816
- en 1.3019450728155255E7 -3640521.551468335
- ll2 18.75859387568011 -66.69040394679816
+ en 1.3019450728155253E7 -3640521.5514683304
+ ll2 18.75859387568013 -66.69040394679816
EPSG:2913
ll 81.94212344148403 -55.09421313425847
- en 1.2514616413598398E7 1.7274356852754958E7
- ll2 81.94212344148471 -55.09421313425843
+ en 1.2514616413598396E7 1.727435685275495E7
+ ll2 81.94212344148472 -55.094213134258474
EPSG:2914
ll 85.57541227564856 -64.75075829363179
en 7565701.342783799 1.9520435752128746E7
- ll2 85.57541227564897 -64.75075829363178
+ ll2 85.57541227564899 -64.75075829363178
EPSG:2915
ll 76.46572984306718 -85.24313807394557
- en 2064035.4703657746 1.720260936279475E7
- ll2 76.46572984306809 -85.24313807394554
+ en 2064035.4703657746 1.720260936279476E7
+ ll2 76.46572984306812 -85.24313807394556
EPSG:2916
ll -4.7946169738327775 -174.47564731709363
- en -2.9798980321768127E7 -226034.82002870788
- ll2 -4.79461697383276 -174.47564731709355
+ en -2.9798980321768176E7 -226034.82002866128
+ ll2 -4.794616973832759 -174.47564731709372
EPSG:29168
ll -70.25491247711474 -81.69401220123639
- en 248109.42264958765 -7808167.599624477
- ll2 -70.25491247188579 -81.69401216415964
+ en 248109.42264958879 -7808167.599624479
+ ll2 -70.25491247188582 -81.69401216415964
EPSG:29169
ll -16.897642320548954 -72.78406758281518
- en 96808.6576074909 -1872068.0629700625
+ en 96808.65760749084 -1872068.0629700625
ll2 -16.89764231982037 -72.78406758171826
EPSG:2917
ll -17.134565313393402 -37.149908271384675
en 3.1116416767921787E7 -4851941.306130745
- ll2 -17.13456531339338 -37.149908271384696
+ ll2 -17.134565313393384 -37.149908271384696
EPSG:29170
ll 68.72268372360315 -54.945559379608184
- en 825449.1676440326 7644806.6400895165
- ll2 68.72268371354878 -54.94555950242345
+ en 825449.1676440327 7644806.640089517
+ ll2 68.72268371354879 -54.945559502423436
EPSG:29171
ll 27.559448900078976 -59.6001831314754
- en 243315.39684998593 3051125.0093508866
- ll2 27.55944889937739 -59.60018313398198
+ en 243315.39684998593 3051125.0093508856
+ ll2 27.55944889937738 -59.60018313398198
EPSG:29172
ll -2.046489732204705 -50.58006365437369
- en 546748.2596890687 -226166.3983152206
- ll2 -2.046489733431317 -50.58006365585033
+ en 546748.2596890671 -226166.39831522066
+ ll2 -2.0464897334313177 -50.58006365585035
EPSG:2918
ll 42.16906682330885 -94.91591238134568
- en 3793939.82872203 1.4456535980276125E7
- ll2 42.16906682330895 -94.91591238134568
+ en 3793939.82872203 1.445653598027612E7
+ ll2 42.16906682330896 -94.91591238134568
EPSG:29187
ll -13.416485525441274 -87.63410022332673
en -219574.53318728274 8507143.051071871
- ll2 -13.416485522938217 -87.63410021662074
+ ll2 -13.416485522938217 -87.63410021662075
EPSG:29188
ll 16.288468476072723 -84.66454547915717
en -536638.3459042554 1.1825574664153177E7
- ll2 16.288468460365557 -84.66454543383239
+ ll2 16.288468460365564 -84.6645454338324
EPSG:29189
ll 73.25226367474315 -77.12843316659391
- en 239353.08567096022 1.8146377540531166E7
- ll2 73.25226366871335 -77.12843303636764
+ en 239353.0856709604 1.8146377540531166E7
+ ll2 73.25226366871337 -77.12843303636762
EPSG:2919
ll 32.07881877359652 -28.49190057036813
- en 2.2530108173116792E7 2.106056544371558E7
- ll2 32.07881877359678 -28.49190057036813
+ en 2.25301081731168E7 2.1060565443715584E7
+ ll2 32.07881877359679 -28.491900570368117
EPSG:29190
ll 72.78756634462212 -60.74130164341408
- en 574643.8922263874 1.807819459336091E7
- ll2 72.78756634543403 -60.7413016500986
+ en 574643.8922263874 1.8078194593360912E7
+ ll2 72.78756634543406 -60.741301650098585
EPSG:29191
ll -37.94330251771137 -56.44243855801336
- en 549044.0544280591 5800368.913651682
- ll2 -37.94330251659119 -56.44243855664226
+ en 549044.0544280591 5800368.913651683
+ ll2 -37.943302516591196 -56.44243855664226
EPSG:29192
ll 68.83985198942568 -50.54394487640957
en 518421.16479927755 1.7636572142986476E7
- ll2 68.83985199062452 -50.54394488209433
+ ll2 68.83985199062454 -50.54394488209432
EPSG:29193
ll -58.69721068883372 -53.91007306245934
- en -15386.125468791171 3459352.618826627
- ll2 -58.697210647703734 -53.91007282940803
+ en -15386.125468790997 3459352.618826625
+ ll2 -58.69721064770376 -53.91007282940803
EPSG:29194
ll 46.55639949440163 -42.49327933071794
en 232280.6938805477 1.51618056448812E7
- ll2 46.55639949487212 -42.49327933429351
+ ll2 46.55639949487214 -42.49327933429351
EPSG:29195
ll 28.76150227250362 -42.992923367401104
- en -478169.53094754566 1.3222893991235718E7
- ll2 28.761502245824104 -42.99292333426739
+ en -478169.53094754496 1.3222893991235718E7
+ ll2 28.761502245824108 -42.992923334267374
EPSG:2920
ll 70.10099055272127 -95.07088262906137
- en 1617866.9906226136 3.466720734158055E7
- ll2 70.10099055272217 -95.07088262906137
+ en 1617866.990622611 3.466720734158055E7
+ ll2 70.10099055272218 -95.07088262906139
EPSG:2921
ll 11.908476731879517 -43.740034234929766
en 2.625561496989412E7 2615840.28989697
- ll2 11.908476731879551 -43.740034234929745
+ ll2 11.908476731879553 -43.74003423492975
EPSG:2922
ll 31.667372857799812 -73.80514002323024
en 1.3135032567149183E7 6584543.854619292
- ll2 31.66737285779781 -73.80514002323022
+ ll2 31.667372857797815 -73.80514002323022
EPSG:29220
ll -64.38629934790185 -57.13224264711534
- en 783033.8079972068 2846750.5862795925
- ll2 -64.3862993427053 -57.132242633792366
+ en 783033.8079972062 2846750.5862795915
+ ll2 -64.38629934270531 -57.13224263379237
EPSG:29221
ll 41.479893458821266 -57.17447914037778
- en 485718.93261770695 1.4592024377431013E7
- ll2 41.479893444140004 -57.1744790859093
+ en 485718.93261770514 1.4592024377431013E7
+ ll2 41.47989344414 -57.17447908590931
EPSG:2923
ll 0.8017509718093478 -95.9525745231654
- en 8487869.26410049 -3531521.965931912
+ en 8487869.264100485 -3531521.965931912
ll2 0.8017509718093717 -95.95257452316538
EPSG:2924
ll 75.02193195210958 -50.6784150234259
- en 1.4971297829882178E7 2.1981419914691813E7
- ll2 75.0219319521105 -50.678415023425906
+ en 1.4971297829882175E7 2.198141991469182E7
+ ll2 75.02193195211055 -50.6784150234259
EPSG:2925
ll -14.52873111792245 -50.281720350359635
- en 2.590314830835081E7 -1.5705554415129898E7
- ll2 -14.52873111792243 -50.28172035035962
+ en 2.5903148308350742E7 -1.5705554415129874E7
+ ll2 -14.528731117922428 -50.28172035035964
EPSG:2926
ll 64.6504582075611 -161.35322042254617
- en -4723659.850605627 8256579.965148483
- ll2 64.65045820756181 -161.35322042254617
+ en -4723659.850605627 8256579.9651484955
+ ll2 64.65045820756183 -161.35322042254617
EPSG:2927
ll 78.09300937632511 -124.69989856533931
- en 1241035.1092966537 1.27949631591309E7
- ll2 78.093009376326 -124.69989856533934
+ en 1241035.1092966571 1.2794963159130907E7
+ ll2 78.09300937632602 -124.6998985653393
EPSG:2928
ll 13.264862024031121 -133.91418587509526
- en -1.5211156379993072E7 -7351119.391051696
- ll2 13.26486202403113 -133.91418587509526
+ en -1.5211156379993096E7 -7351119.391051679
+ ll2 13.264862024031148 -133.91418587509526
EPSG:2929
ll 13.63763149501058 -95.2814295096164
- en -172728.52838872746 -1.1445553868659819E7
+ en -172728.5283887259 -1.1445553868659815E7
ll2 13.637631495010604 -95.28142950961639
EPSG:2930
ll 46.622081772275095 -32.39771033542809
en 1.5339421267950218E7 6496614.901722845
- ll2 46.62208177227525 -32.397710335428094
+ ll2 46.622081772275244 -32.397710335428094
EPSG:2931
ll 22.79738790536753 20.57691345535314
- en 1279310.8533823318 2540952.34276383
- ll2 22.797387901918665 20.57691345990645
+ en 1279310.8533823318 2540952.3427638295
+ ll2 22.79738790191867 20.576913459906446
EPSG:2932
ll -89.93150677413878 48.611312957115295
en 199722.64374323192 -1.2399399267234817E7
- ll2 -89.93150669055046 48.611336483076094
+ ll2 -89.93150669055046 48.6113364830761
EPSG:2933
ll 87.75905465051224 119.89720680123824
- en 512593.1876977848 1.9747792306329302E7
- ll2 87.75905398864231 119.89720698271924
+ en 512593.18769778486 1.9747792306329302E7
+ ll2 87.75905398864231 119.89720698271931
EPSG:29333
ll -74.64504056130846 18.17175622740899
- en 593771.1549714586 1713779.5211125389
- ll2 -74.64504043235944 18.171756128801025
+ en 593771.1549714585 1713779.521112536
+ ll2 -74.64504043235945 18.171756128801032
EPSG:2935
ll 38.81936948052132 48.75785112042052
en 1927885.265905534 4310530.202925557
ll2 38.81936947136284 48.757851113826376
EPSG:2936
ll -48.647120400737954 48.097223207433004
- en 2562691.8812145083 -5409388.822353787
- ll2 -48.64712038090432 48.09722323406063
+ en 2562691.881214509 -5409388.822353789
+ ll2 -48.64712038090433 48.09722323406064
EPSG:2937
ll -10.47957896491036 38.34268907705937
en 2289857.0618436136 -1186548.4562300143
- ll2 -10.47957894847922 38.34268915122442
+ ll2 -10.479578948479222 38.34268915122442
EPSG:29371
ll 34.91863848581775 1.7797035681255582
- en -843724.0470715509 6338311.837268499
- ll2 34.91863827069444 1.779703647356308
+ en -843724.0470715509 6338311.837268501
+ ll2 34.918638270694466 1.7797036473563101
EPSG:29373
ll 24.03384899385948 15.099240504430153
- en 213612.94286673857 5094369.586834461
- ll2 24.03384888418423 15.099240486093684
+ en 213612.94286673857 5094369.5868344605
+ ll2 24.033848884184227 15.099240486093684
EPSG:29375
ll 63.98639461530183 20.382600129133372
en 263308.66318907926 9542890.61646441
- ll2 63.986394138538046 20.382599906346055
+ ll2 63.986394138538046 20.38259990634606
EPSG:29377
ll 42.77353216592118 22.69322684008299
en 466048.59528135747 7186934.781317938
@@ -5679,171 +5679,171 @@ EPSG:29377
EPSG:29379
ll 60.52284358420064 16.2059249960416
en -153288.0185755555 9149044.816773035
- ll2 60.52284314410746 16.205924880024547
+ ll2 60.52284314410747 16.205924880024547
EPSG:2938
ll -32.92264931177382 55.17410701940402
- en 4734356.3111066 -3666577.392027815
- ll2 -32.9226492993064 55.17410703118489
+ en 4734356.3111066 -3666577.392027816
+ ll2 -32.92264929930641 55.1741070311849
EPSG:29381
ll -87.30942450829467 30.687521388031893
- en 50679.2539508035 -7271681.171939592
- ll2 -87.30942426712568 30.687518465707747
+ en 50679.25395080353 -7271681.171939592
+ ll2 -87.30942426712569 30.687518465707758
EPSG:29383
ll 57.26531727427624 17.732058765548242
- en -317496.23392579565 8795245.386038603
- ll2 57.265316867659195 17.73205864772565
+ en -317496.2339257957 8795245.386038603
+ ll2 57.26531686765919 17.73205864772565
EPSG:29385
ll -18.213063604697595 19.96800508632803
en -532645.1346448739 411959.01954249805
ll2 -18.213063602854476 19.96800508873741
EPSG:2939
ll 18.55704267828665 41.24427973247712
- en 1291101.8720598891 2064844.8360648337
- ll2 18.557042663887046 41.2442797589788
+ en 1291101.8720598891 2064844.8360648334
+ ll2 18.557042663887042 41.2442797589788
EPSG:2940
ll 17.513778277733905 60.7270729398457
- en 4040717.7188694365 1936095.5324674582
- ll2 17.51377827403162 60.72707293501801
+ en 4040717.718869438 1936095.5324674582
+ ll2 17.51377827403162 60.72707293501803
EPSG:2941
ll 30.132383077463572 51.91759741689417
- en 3832556.599863245 3330073.084452671
- ll2 30.132383076084164 51.91759741319689
+ en 3832556.599863244 3330073.0844526715
+ ll2 30.13238307608417 51.917597413196866
EPSG:2942
ll -56.25334211411242 -24.91290490745611
en -112612.69089339371 -6278596.942322536
- ll2 -56.253342052303296 -24.91290464601965
+ ll2 -56.25334205230329 -24.912904646019648
EPSG:2943
ll -85.95513407887886 -14.431504492671245
- en 504671.5799818515 -9546457.266469173
+ en 504671.5799818515 -9546457.266469175
ll2 -85.95513405213619 -14.4315041776916
EPSG:2945
ll 16.210310956893395 -56.006803831373986
en 571421.6490483931 1794357.0584547224
- ll2 16.210310956891004 -56.00680383138497
+ ll2 16.210310956891007 -56.006803831384964
EPSG:2946
ll -77.25173579957263 -65.29255757176675
- en 211410.0674603621 -8580454.556529295
- ll2 -77.25173579953551 -65.29255757162036
+ en 211410.06746036198 -8580454.556529293
+ ll2 -77.2517357995355 -65.29255757162036
EPSG:2947
ll -56.669409861065816 -60.216019502301826
en 567327.7303951567 -6290678.415963453
- ll2 -56.669409860501666 -60.21601950252659
+ ll2 -56.66940986050165 -60.216019502526585
EPSG:2948
ll -13.327539765484445 -65.6881457955713
- en 501107.4110648623 -1474515.4325574513
- ll2 -13.327539765484167 -65.68814579557501
+ en 501107.4110648623 -1474515.432557451
+ ll2 -13.327539765484165 -65.68814579557501
EPSG:2949
ll -37.978755876876434 -66.80300087254496
- en 629632.8681173807 -4211173.551256952
- ll2 -37.97875587672262 -66.80300087240096
+ en 629632.8681173808 -4211173.551256952
+ ll2 -37.97875587672263 -66.80300087240096
EPSG:2950
ll 6.585576002758842 -80.68552377975986
en -491815.89753903984 733906.2651551098
ll2 6.585576001590617 -80.68552376436584
EPSG:2951
ll 51.277294226479825 -69.39199562659587
- en 800457.4458935871 5706408.68225206
+ en 800457.445893587 5706408.682252061
ll2 51.27729421460805 -69.39199564675134
EPSG:2952
ll -60.59496143312633 -75.79858434667703
en 507525.93512710574 -6725397.374521412
- ll2 -60.59496143291969 -75.79858434675086
+ ll2 -60.59496143291968 -75.79858434675086
EPSG:2953
ll 27.871756720701313 -45.767960206422984
- en 4593100.585501374 5648999.195132518
- ll2 27.871756720700603 -45.76796020642296
+ en 4593100.585501373 5648999.195132518
+ ll2 27.871756720700606 -45.76796020642298
EPSG:2954
ll -48.78075405030826 -142.4034930890113
en -1.5200588206675174E7 -1.3514202097163564E7
ll2 -48.78075405030841 -142.4034930890113
EPSG:2955
ll -16.678765052445684 -117.67302242139628
- en 428239.00458009203 -1844139.9474961685
- ll2 -16.678765052445666 -117.67302242139628
+ en 428239.0045800905 -1844139.9474961692
+ ll2 -16.67876505244568 -117.6730224213963
EPSG:2956
ll 52.07234798218266 -117.39393450174387
- en 61984.080202106445 5788398.483856579
- ll2 52.07234797578127 -117.39393449398634
+ en 61984.080202105455 5788398.483856578
+ ll2 52.07234797578126 -117.39393449398634
EPSG:2957
ll -24.49466711631233 -109.15662218988658
- en 78613.00767642644 -2715339.6756289983
- ll2 -24.49466711620916 -109.15662219008584
+ en 78613.00767642644 -2715339.675628999
+ ll2 -24.494667116209165 -109.15662219008586
EPSG:2958
ll 88.2123475657275 -71.60582769004264
- en 532573.1136822097 9801050.489865663
- ll2 88.21234756640001 -71.60582826747448
+ en 532573.1136822095 9801050.489865663
+ ll2 88.2123475664 -71.60582826747456
EPSG:2959
ll -60.52436122638033 -81.09379428824678
- en 165821.32431843336 -6725303.02711821
- ll2 -60.52436122233372 -81.09379428063792
+ en 165821.3243184334 -6725303.027118211
+ ll2 -60.52436122233373 -81.09379428063792
EPSG:2960
ll 3.2348538118073833 -70.74789285198975
- en 305780.9874832777 357719.5617019909
- ll2 3.234853811807318 -70.74789285198379
+ en 305780.9874832777 357719.56170199084
+ ll2 3.2348538118073176 -70.74789285198379
EPSG:2961
ll -35.69352134693274 -67.4394995589345
- en 98206.79107670195 -3959049.1242389227
- ll2 -35.69352134653909 -67.43949955934741
+ en 98206.79107670195 -3959049.1242389237
+ ll2 -35.693521346539114 -67.43949955934741
EPSG:2962
ll 64.97263605532623 -47.51452416645091
- en 946443.0169226972 7238994.260952433
+ en 946443.0169226972 7238994.260952432
ll2 64.97263601787867 -47.51452464542012
EPSG:2965
ll -4.759597489808627 -79.76192233924039
- en 2480946.475958142 -1.4537243119331507E7
+ en 2480946.4759581424 -1.4537243119331507E7
ll2 -4.75959748958285 -79.76192234399322
EPSG:2966
ll 71.96322776905134 -83.09729798612621
en 3404560.511532508 1.3420095021737216E7
- ll2 71.96322776892622 -83.09729798634092
+ ll2 71.9632277689262 -83.09729798634092
EPSG:2967
ll 17.100854139314976 -88.29438713707302
- en -589687.9404659575 -6589786.372412681
- ll2 17.100854139311476 -88.294387137062
+ en -589687.9404659672 -6589786.37241268
+ ll2 17.100854139311476 -88.29438713706203
EPSG:2968
ll 16.974538111707318 -81.79866738188251
en 4801390.106078948 -6616899.899611087
- ll2 16.974538111420046 -81.79866738221632
+ ll2 16.974538111420046 -81.79866738221631
EPSG:2969
ll 18.09195682909748 -62.90557198327498
en 509756.870848181 2000799.1724028382
- ll2 18.0919568043076 -62.90557196864032
+ ll2 18.091956804307603 -62.90557196864032
EPSG:2970
ll 16.041843969107557 -61.20853416213802
- en 692080.8032091986 1774695.523862292
- ll2 16.041843952489902 -61.20853418759284
+ en 692080.8032091978 1774695.5238622925
+ ll2 16.041843952489906 -61.20853418759285
EPSG:29702
ll -25.018943690192323 43.41957106835357
- en 95176.46385931317 119965.98671352584
- ll2 -25.018943690579924 43.419571068215575
+ en 95176.46385931433 119965.98671352351
+ ll2 -25.018943690579928 43.41957106821558
EPSG:2971
ll 53.56316817165853 -43.38297738697324
en 1004072.5957439169 5961855.468240182
- ll2 53.56316812188068 -43.38297744085662
+ ll2 53.563168121880686 -43.38297744085662
EPSG:2972
ll 8.207268629853019 -50.21680809669106
en 586265.5532873704 907296.0057201401
ll2 8.207268629853017 -50.216808096691146
EPSG:2973
ll 14.407542336386097 -60.935843452421075
- en 722168.2113894979 1593628.3260067375
- ll2 14.407542351752355 -60.9358434333617
+ en 722168.2113894979 1593628.3260067373
+ ll2 14.407542351752353 -60.9358434333617
EPSG:29738
ll -10.390698040754444 38.395955901523116
- en -224361.85022001562 8843935.279647207
- ll2 -10.390698044430215 38.39595590499106
+ en -224361.85022001574 8843935.279647207
+ ll2 -10.390698044430215 38.39595590499107
EPSG:29739
ll -16.699851489937487 42.92205385469225
en -363597.229991524 8136174.792966424
ll2 -16.699851488833254 42.92205386159998
EPSG:2975
ll -16.18983230787581 40.123852994258414
- en -1326413.3757486297 8133460.392475499
+ en -1326413.3757486301 8133460.392475499
ll2 -16.18983190766203 40.12386116380695
EPSG:2976
ll -69.89188638594268 -150.08600167016644
- en 381647.8062629621 2243058.4800346624
- ll2 -69.89188639035059 -150.08600167371395
+ en 381647.806262961 2243058.4800346624
+ ll2 -69.8918863903506 -150.08600167371407
EPSG:2977
ll 71.38169901233545 -162.71205251639748
en 155457.02135342988 1.7947771121538803E7
@@ -5858,32 +5858,32 @@ EPSG:2980
ll2 -77.70365935430672 44.22097735488417
EPSG:2981
ll 79.22307988377977 155.53625643604767
- en 303590.68835706083 1.881094353624414E7
- ll2 79.2230799015326 155.53625674803553
+ en 303590.688357061 1.881094353624414E7
+ ll2 79.22307990153261 155.53625674803553
EPSG:29849
ll -40.42431035487997 109.72962545923168
- en 391841.1398165012 -4475582.172828807
- ll2 -40.424310318208335 109.72962551747369
+ en 391841.13981649996 -4475582.172828806
+ ll2 -40.424310318208335 109.72962551747368
EPSG:29850
ll -55.341380440943546 111.66825339856366
- en 161717.9177379434 -6145684.788568915
- ll2 -55.34138030836951 111.66825356951574
+ en 161717.91773794626 -6145684.788568917
+ ll2 -55.34138030836953 111.66825356951574
EPSG:2987
ll -33.75876752572323 -60.84890574987472
- en 143225.42952688428 -3742210.3025279203
- ll2 -33.75876729118265 -60.848905547512366
+ en 143225.42952688423 -3742210.3025279203
+ ll2 -33.75876729118264 -60.848905547512366
EPSG:29871
ll 7.31035675748481 118.5748895002964
- en 48909.58959707863 40329.147038348274
- ll2 7.310356768091936 118.5748894754716
+ en 48909.589597078455 40329.14703834823
+ ll2 7.310356768091936 118.57488947547155
EPSG:29872
ll 1.3854016435296481 112.8000830085585
- en 1135720.8906870638 503146.48138855735
- ll2 1.3854016469686072 112.80008298784752
+ en 1135720.890687073 503146.4813885587
+ ll2 1.385401646968607 112.80008298784755
EPSG:29873
ll 5.69775184958883 110.80589303824146
- en 124505.16128144541 630428.973107241
- ll2 5.697751852494578 110.80589302651768
+ en 124505.1612814485 630428.9731072409
+ ll2 5.697751852494578 110.80589302651767
EPSG:2988
ll 89.28270100887204 -176.36677725595038
en 500740.05519289494 1.991796034776146E7
@@ -5891,39 +5891,39 @@ EPSG:2988
EPSG:29901
ll 40.1560982521348 -17.83218586603864
en -638349.1785175876 -1186843.9058929645
- ll2 40.156098132687845 -17.832185692425654
+ ll2 40.156098132687845 -17.83218569242566
EPSG:29902
ll -51.44719596560751 -9.908848867660598
- en 67413.0187334505 -1.1383640412465783E7
- ll2 -51.44719519099296 -9.908848948266614
+ en 67413.01873345053 -1.1383640412465783E7
+ ll2 -51.44719519099295 -9.908848948266616
EPSG:29903
ll 28.852642592589604 -17.262796518133896
- en -705909.572025751 -2451909.080871975
- ll2 28.852642581330684 -17.26279651045389
+ en -705909.572025751 -2451909.0808719755
+ ll2 28.852642581330677 -17.26279651045389
EPSG:2991
ll 16.93058544667543 -149.0818149851665
en -2906629.4708545194 -2278029.537785783
ll2 16.930585446675448 -149.0818149851665
EPSG:2992
ll -4.390333010102898 -153.65592350213655
- en -1.4912051854719754E7 -1.5547906674806155E7
+ en -1.4912051854719752E7 -1.5547906674806155E7
ll2 -4.390333010102867 -153.65592350213655
EPSG:2993
ll 82.64439107463957 -54.90333851843843
en 1665556.9558652816 5601993.648995146
- ll2 82.64439107464023 -54.90333851843841
+ ll2 82.64439107464021 -54.90333851843843
EPSG:2994
ll 8.444511333972489 -93.18688659821532
- en 1.285175862855468E7 -1.0978267305472352E7
- ll2 8.444511333972526 -93.18688659821534
+ en 1.2851758628554683E7 -1.0978267305472348E7
+ ll2 8.444511333972528 -93.18688659821534
EPSG:2995
ll 9.637410048741387 168.40527746434768
- en 874064.5064419424 1.1067321996795377E7
- ll2 9.637410045808231 168.40527745865782
+ en 874064.5064419425 1.1067321996795377E7
+ ll2 9.637410045808231 168.40527745865785
EPSG:2996
ll 61.60035385782794 156.31689655536937
- en 39858.107211467344 1.6860426644987553E7
- ll2 61.600353735718656 156.3168963945273
+ en 39858.10721146612 1.6860426644987553E7
+ ll2 61.60035373571864 156.31689639452728
EPSG:2997
ll -69.27214869369661 173.476718311084
en 833755.2939700634 2291041.287796424
@@ -5938,20 +5938,20 @@ EPSG:2999
ll2 -13.760992483199203 38.60194124510362
EPSG:3000
ll 31.910053601835273 18.106211343257215
- en -6298607.693804365 4617158.822506971
- ll2 31.910053822996915 18.10621242764793
+ en -6298607.693804363 4617158.822506972
+ ll2 31.910053822996925 18.106212427647943
EPSG:3001
ll 35.517579866263844 152.3184248561901
- en 8596711.674334003 5097011.9228557665
- ll2 35.51757975669143 152.31842469563856
+ en 8596711.674334008 5097011.9228557665
+ ll2 35.51757975669144 152.3184246956386
EPSG:3002
ll 11.457376033055027 163.93490862689723
en 9885642.748954434 2171556.0805702494
- ll2 11.457376033600664 163.9349086202522
+ ll2 11.457376033600665 163.93490862025226
EPSG:3003
ll 38.09725651416973 7.4345625019044315
en 1362730.2218375676 4217833.144082101
- ll2 38.09725651416882 7.434562501902931
+ ll2 38.09725651416882 7.43456250190293
EPSG:3004
ll 46.42503928302209 18.74399103983138
en 2807681.5235197735 5148186.206928445
@@ -5962,24 +5962,24 @@ EPSG:3005
ll2 -38.30941542902001 9.097453472284542
EPSG:3006
ll 29.734840136260985 22.944467857913462
- en 1269513.1994306452 3315972.5915782275
- ll2 29.734840128429163 22.944467862496932
+ en 1269513.1994306452 3315972.5915782284
+ ll2 29.73484012842917 22.94446786249693
EPSG:3007
ll 85.09444290678704 13.59333461891303
- en 165216.18824875128 9454268.861656604
- ll2 85.09444290678748 13.593334618912971
+ en 165216.18824875125 9454268.861656606
+ ll2 85.09444290678748 13.593334618912976
EPSG:3008
ll 61.864054488897295 13.084399903079879
- en 128126.42078859449 6861850.502128279
- ll2 61.86405448889729 13.084399903079879
+ en 128126.42078859449 6861850.50212828
+ ll2 61.8640544888973 13.084399903079879
EPSG:3009
ll 75.84142598699606 14.868973663404937
- en 146420.94567875782 8420863.589297248
- ll2 75.84142598699695 14.86897366340494
+ en 146420.94567875788 8420863.589297248
+ ll2 75.84142598699697 14.86897366340494
EPSG:3010
ll -35.61156769605203 12.57054383720126
- en -206114.05031784123 -3949561.1397726503
- ll2 -35.61156769586363 12.57054383698271
+ en -206114.05031784123 -3949561.1397726513
+ ll2 -35.611567695863634 12.570543836982711
EPSG:3011
ll 31.08856949844197 17.952966701182998
en 145512.2762463716 3440794.9949085093
@@ -5990,68 +5990,68 @@ EPSG:3012
ll2 34.77359881264906 18.12557494784226
EPSG:3013
ll -81.11407807168527 24.062869060600324
- en 292932.4249450973 -9019805.026843721
- ll2 -81.11407807109651 24.062868877428173
+ en 292932.42494509695 -9019805.026843725
+ ll2 -81.11407807109654 24.062868877428176
EPSG:3014
ll 39.55563127495154 9.130464818877277
- en -548272.9089221188 4411815.694565126
- ll2 39.55563125742712 9.13046484062122
+ en -548272.908922119 4411815.694565127
+ ll2 39.55563125742713 9.130464840621217
EPSG:3015
ll 42.45208765109234 19.09275351960411
- en 178195.5158347532 4701910.649383178
- ll2 42.45208765109238 19.09275351960411
+ en 178195.5158347532 4701910.649383179
+ ll2 42.45208765109239 19.09275351960411
EPSG:3016
ll 17.87667530751979 10.283834844676605
- en -910570.6662609482 2005852.3962705366
- ll2 17.87667528780865 10.283834890396138
+ en -910570.6662609484 2005852.3962705366
+ ll2 17.876675287808645 10.283834890396136
EPSG:30161
ll -69.90134305473416 136.8532211214447
- en 281659.54406144255 -1.1426025916082904E7
- ll2 -69.90134204134009 136.85321978752427
+ en 281659.54406144226 -1.1426025916082907E7
+ ll2 -69.9013420413401 136.85321978752427
EPSG:30162
ll 1.9195474056796655 134.9184148669885
- en 436456.9764364435 -3439979.2604083526
- ll2 1.9195476488936225 134.9184147751809
+ en 436456.9764364435 -3439979.260408353
+ ll2 1.919547648893623 134.91841477518096
EPSG:30163
ll 41.246853327009774 132.97269671637383
- en 67788.40807842514 582372.8189840363
- ll2 41.246853292321454 132.9726967573053
+ en 67788.40807842516 582372.818984037
+ ll2 41.24685329232148 132.9726967573053
EPSG:30164
ll -81.75912881473042 125.64242301161136
- en -125129.87239187684 -1.2740757542405706E7
- ll2 -81.75912779360344 125.64242091829743
+ en -125129.87239187752 -1.2740757542405708E7
+ ll2 -81.75912779360344 125.6424209182974
EPSG:30165
ll 72.35707639270981 127.31045348873744
- en -236914.03081444855 4059631.2311732518
+ en -236914.0308144486 4059631.2311732518
ll2 72.3570764266513 127.31045362864694
EPSG:30166
ll 44.141886657363585 132.56344723059402
- en -274693.62837234075 909366.9296068924
- ll2 44.14188662358296 132.5634472791048
+ en -274693.6283723407 909366.9296068924
+ ll2 44.14188662358298 132.5634472791048
EPSG:30167
ll -49.4350930150272 134.5356181529894
- en -190506.62326075343 -9465704.699425919
- ll2 -49.435092071381966 134.53561765568008
+ en -190506.62326075337 -9465704.699425919
+ ll2 -49.43509207138195 134.53561765568008
EPSG:30168
ll -48.588382655107864 145.14428062642483
en 490192.6280325915 -9389582.314651666
- ll2 -48.58838172793248 145.14427995342137
+ ll2 -48.58838172793248 145.14427995342135
EPSG:30169
ll -57.944554797613016 133.13970243821615
en -395633.1627597213 -1.0428853434801329E7
- ll2 -57.94455378610695 133.1397018081107
+ ll2 -57.94455378610695 133.13970180811071
EPSG:3017
ll 51.82764692645915 14.915917178791242
- en -320886.44030617713 5766290.612375549
- ll2 51.82764691700207 14.915917193188655
+ en -320886.4403061773 5766290.612375549
+ ll2 51.82764691700208 14.915917193188651
EPSG:30170
ll 12.071127734843984 131.72180242979374
- en -995444.3858057479 -3077898.74221447
- ll2 12.071127834623455 131.72180243832742
+ en -995444.3858057449 -3077898.7422144697
+ ll2 12.071127834623457 131.72180243832742
EPSG:30171
ll -18.524206226869936 141.32371773933713
- en 113652.20827150381 -6922523.2735733865
- ll2 -18.524205655325545 141.32371749498787
+ en 113652.20827150378 -6922523.273573388
+ ll2 -18.524205655325577 141.32371749498793
EPSG:30172
ll -6.063578094114206 137.08224259693975
en -572436.4533272407 -5546656.251808244
@@ -6059,87 +6059,87 @@ EPSG:30172
EPSG:30173
ll -75.74947127170948 150.6585249548609
en 176117.14611697817 -1.3291763939991841E7
- ll2 -75.74947039837458 150.65852231649598
+ ll2 -75.74947039837457 150.658522316496
EPSG:30174
ll -4.4038542948742645 140.73203782412043
- en -140414.6491501181 -3363953.512153133
- ll2 -4.4038539357158015 140.7320376721039
+ en -140414.6491501149 -3363953.5121531333
+ ll2 -4.403853935715805 140.73203767210393
EPSG:30175
ll -61.17611242873696 125.57529108676184
- en -103333.6948528048 -9662218.686080147
- ll2 -61.176111388659045 125.57529055191927
+ en -103333.69485280404 -9662218.686080148
+ ll2 -61.17611138865905 125.5752905519193
EPSG:30176
ll 13.902345094201607 128.87217243179737
- en 527250.374060118 -1334204.8661727677
+ en 527250.3740601181 -1334204.866172768
ll2 13.902345175924898 128.87217240158455
EPSG:30177
ll -2.0786060420222867 132.62756275856188
en 181281.58314943544 -3106847.9126436156
- ll2 -2.0786057530486155 132.6275626613673
+ ll2 -2.0786057530486124 132.6275626613673
EPSG:30178
ll 19.248047478211205 134.96830859263298
en -108196.15345381048 -83435.23008501479
- ll2 19.2480475325295 134.96830856535271
+ ll2 19.2480475325295 134.96830856535274
EPSG:30179
ll 73.91924121718557 153.2969516167919
- en -21351.366670733387 5328584.236151344
- ll2 73.91924122984 153.29695176321158
+ en -21351.366670732514 5328584.236151343
+ ll2 73.91924122983997 153.29695176321164
EPSG:3018
ll -23.865604244610694 17.32647850693317
- en -454081.7217860189 -2653067.8956746347
- ll2 -23.865604243734712 17.32647850547256
+ en -454081.72178601904 -2653067.8956746347
+ ll2 -23.86560424373471 17.32647850547256
EPSG:3019
ll -29.422167597809512 9.480770225868152
en 1322897.038183 -3257730.8818254815
- ll2 -29.42216694309414 9.480770186271176
+ ll2 -29.42216694309414 9.480770186271178
EPSG:3020
ll 38.871020935750835 6.95521210212582
- en 926913.8607939163 4324318.619755185
- ll2 38.871020901539424 6.955212120989621
+ en 926913.8607939162 4324318.619755185
+ ll2 38.87102090153942 6.9552121209896205
EPSG:30200
ll -6.532368683324151 -60.9305157095611
en 651054.4449210155 -9007819.858745411
- ll2 -6.5323685558295725 -60.93051568833247
+ ll2 -6.532368555829574 -60.93051568833246
EPSG:3021
ll 7.152495328204623 12.543861613397564
- en 1139528.0055286526 791632.1219314353
- ll2 7.152495520464016 12.543861599462982
+ en 1139528.0055286526 791632.1219314352
+ ll2 7.152495520464017 12.543861599462982
EPSG:3022
ll 5.847748640394315 25.871556332941708
- en 2368199.590009581 652126.1696434538
- ll2 5.847748869842622 25.871556247652876
+ en 2368199.5900095813 652126.1696434538
+ ll2 5.847748869842622 25.871556247652872
EPSG:3023
ll -11.826985636980666 19.190254035153178
en 1378486.8795777417 -1308637.3024173472
- ll2 -11.826985196280653 19.190253966041578
+ ll2 -11.826985196280653 19.190253966041574
EPSG:3024
ll -29.32096175265435 23.303886416988803
- en 1572728.8646089796 -3245350.015367974
- ll2 -29.32096108948476 23.30388626791603
+ en 1572728.8646089793 -3245350.015367976
+ ll2 -29.320961089484776 23.303886267916024
EPSG:3025
ll 79.85937914013863 15.421338426699172
en 1580801.071079348 8871326.882598517
- ll2 79.85937914010628 15.42133842638762
+ ll2 79.85937914010628 15.421338426387623
EPSG:3026
ll -5.989173522301613 13.817968853931346
en 1528748.6904961104 -662215.9367135599
ll2 -5.989173522301613 13.817968853931346
EPSG:3027
ll 42.4419413705819 18.56276842527044
- en 1726606.3654995293 4703930.262061229
- ll2 42.44194137054833 18.56276842529459
+ en 1726606.3654995295 4703930.262061228
+ ll2 42.44194137054833 18.562768425294593
EPSG:3028
ll -64.10727799611644 14.420745072905532
en 1322787.6102911592 -7116124.888171584
- ll2 -64.1072779959626 14.420745072982152
+ ll2 -64.1072779959626 14.420745072982154
EPSG:3029
ll -83.42005373753756 26.169223569167034
en 1574873.8888542864 -9269848.217469327
- ll2 -83.42005373747811 26.16922356133676
+ ll2 -83.42005373747813 26.16922356133676
EPSG:3030
ll -4.64320164994038 12.585743064567561
- en 388018.01843731524 -521275.0737965966
- ll2 -4.643201641197295 12.585743232942303
+ en 388018.01843731524 -521275.07379659655
+ ll2 -4.643201641197294 12.585743232942303
EPSG:3031
ll -2.203568131709858 -146.83286534539934
en -6512331.978323617 -9964356.342448773
@@ -6151,15 +6151,15 @@ EPSG:3032
EPSG:3033
ll -53.85668026617815 77.57896596470384
en 6516634.160305619 5517993.571346073
- ll2 -53.856680266178124 77.57896596470384
+ ll2 -53.85668026617812 77.57896596470384
EPSG:30339
ll -18.792510794583734 50.731979229271005
en 471755.7029660448 -2077913.1906689378
ll2 -18.792510794583738 50.731979229271005
EPSG:3034
ll 14.000554993391734 63.48163397827122
- en 1.0109297983930215E7 788501.628538019
- ll2 14.00055499339175 63.48163397827122
+ en 1.0109297983930215E7 788501.6285380183
+ ll2 14.000554993391749 63.48163397827122
EPSG:30340
ll 66.01541861962434 58.15116066549848
en 552213.8284095287 7322183.704802955
@@ -6167,63 +6167,63 @@ EPSG:30340
EPSG:3035
ll -45.40063789010833 -114.5250706603789
en -7518153.250978978 662760.3359244876
- ll2 -45.400637891794425 -114.52507066037893
+ ll2 -45.40063789179444 -114.52507066037892
EPSG:3036
ll 41.91433993365871 33.792320014545986
en 565706.2186935929 1.4640569056416098E7
ll2 41.91433993365874 33.79232001454603
EPSG:3037
ll -66.07884568528519 35.14244280910481
- en 325547.9568416368 2665930.612521354
- ll2 -66.07884568509589 35.142442809245836
+ en 325547.9568416369 2665930.6125213522
+ ll2 -66.07884568509589 35.14244280924584
EPSG:3040
ll 34.114501979506784 -8.463671401911679
en 1103292.5130922473 3794201.977391028
- ll2 34.11450197601102 -8.46367139969396
+ ll2 34.11450197601103 -8.46367139969396
EPSG:3041
ll 42.093389288929785 -10.733001557952738
- en 356684.72510158084 4661598.345808554
- ll2 42.093389288927774 -10.733001557954964
+ en 356684.72510158067 4661598.345808554
+ ll2 42.09338928892777 -10.733001557954966
EPSG:3042
ll -47.760888373256776 6.075788362285259
- en 1179854.3587641444 -5329748.747200852
- ll2 -47.760888327945466 6.075788200391591
+ en 1179854.3587641441 -5329748.747200853
+ ll2 -47.760888327945494 6.07578820039159
EPSG:3043
ll -84.45096353446557 6.833224136057055
en 541352.7478127494 -9379815.77917413
- ll2 -84.4509635344625 6.833224135886868
+ ll2 -84.4509635344625 6.833224135886867
EPSG:3044
ll 14.306182987950535 10.821185936258606
en 696437.3408154539 1582360.6891249265
- ll2 14.306182987950228 10.821185936255281
+ ll2 14.30618298795023 10.821185936255283
EPSG:3045
ll -14.468702072372835 24.81051103517412
- en 1561839.9337874458 -1622440.1149258045
- ll2 -14.468702055373662 24.81051096725361
+ en 1561839.933787446 -1622440.1149258057
+ ll2 -14.468702055373674 24.810510967253606
EPSG:3046
ll -50.09554818786958 28.7118793293456
- en 1051294.0835678345 -5577794.247141042
- ll2 -50.095548169015174 28.7118792889632
+ en 1051294.0835678345 -5577794.247141041
+ ll2 -50.095548169015174 28.71187928896319
EPSG:3047
ll -77.24520907124231 29.949852563581622
- en 572672.4086706745 -8575961.879766664
- ll2 -77.24520907123475 29.949852563566388
+ en 572672.4086706747 -8575961.879766664
+ ll2 -77.24520907123474 29.949852563566395
EPSG:3048
ll -8.274428964101801 29.671066701419516
- en 133204.55608744046 -916171.3892292951
- ll2 -8.274428964093538 29.671066701561152
+ en 133204.55608744005 -916171.3892292954
+ ll2 -8.274428964093541 29.671066701561152
EPSG:3049
ll 88.56531807575678 37.061118793138284
- en 494581.1002254855 9837875.713370917
- ll2 88.56531807575692 37.06111879313864
+ en 494581.1002254855 9837875.713370916
+ ll2 88.5653180757569 37.061118793138654
EPSG:30491
ll 88.8277404108773 35.309197643939385
en 791369.3641076649 8249635.126093921
- ll2 88.82774041474603 35.30919748746051
+ ll2 88.82774041474605 35.30919748746051
EPSG:30492
ll 24.352615001244928 67.59839805203656
en 6740112.756188337 1310099.498474287
- ll2 24.35261500747518 67.59839804846403
+ ll2 24.352615007475183 67.59839804846403
EPSG:30493
ll 13.505027718076413 7.865517258122324
en 1100576.7785733575 -2236797.4296579044
@@ -6231,42 +6231,42 @@ EPSG:30493
EPSG:30494
ll 1.0176990200324774 1.5249008058602271
en 348278.42598231806 -3457403.8327385066
- ll2 1.0176990200325313 1.5249008058602267
+ ll2 1.0176990200325313 1.524900805860227
EPSG:3054
ll 54.197337776091786 -28.770269317133515
- en 384504.8970684394 6007119.43930597
- ll2 54.1973377827824 -28.770269318195083
+ en 384504.89706843963 6007119.43930597
+ ll2 54.1973377827824 -28.77026931819507
EPSG:3055
ll -31.284342678152527 -13.415796650511147
en 1222858.5438892131 -3486066.952754292
ll2 -31.284342662193325 -13.41579665610482
EPSG:3056
ll 78.93218164960041 -23.07277580680918
- en 327496.2155650357 8774577.103834184
- ll2 78.93218164498532 -23.072775676009595
+ en 327496.21556503547 8774577.103834182
+ ll2 78.93218164498529 -23.072775676009588
EPSG:3057
ll 87.35385571580754 39.154048948412566
- en 805639.2060223332 3249268.431762678
- ll2 87.35385571580775 39.154048948412566
+ en 805639.2060223338 3249268.431762681
+ ll2 87.35385571580777 39.15404894841263
EPSG:3058
ll -2.7105612795443648 -5.96276330989906
en 332179.2898141022 -8100482.393201372
- ll2 -2.7105602431966225 -5.9627639662522185
+ ll2 -2.710560243196622 -5.962763966252219
EPSG:3059
ll 49.23525189671949 -54.40128360306443
- en -4263130.034442673 2917092.5518731494
- ll2 50156.3548390288 -89.17586803776794
+ en -4263130.034442673 2917092.551873151
+ ll2 50156.35483902923 -89.17586803561426
EPSG:3060
ll -1.1011308836770013 155.39223808455847
en -574350.5171939996 9876249.5107104
- ll2 -1.1011309283087392 155.39223817372775
+ ll2 -1.1011309283087392 155.39223817372772
EPSG:3061
ll 0.21190388611037747 -12.867193512830896
- en 737744.2364601921 23124.654871007566
- ll2 0.21190396804181785 -12.867193603877853
+ en 737744.236460192 23124.65487100757
+ ll2 0.21190396804181796 -12.867193603877851
EPSG:3062
ll 39.48000704447523 -28.02953829303477
- en 411422.220623479 4370516.429597112
+ en 411422.2206234793 4370516.429597112
ll2 39.48000703530933 -28.029538295995692
EPSG:3063
ll 19.444579262715777 -26.6912160383828
@@ -6274,52 +6274,52 @@ EPSG:3063
ll2 19.4445792662654 -26.691216048674807
EPSG:3064
ll 61.837458715705935 10.021969384135332
- en 553811.3518356715 6856496.212260337
- ll2 61.83745871570646 10.021969384135353
+ en 553811.3518356715 6856496.2122603385
+ ll2 61.83745871570649 10.021969384135351
EPSG:3065
ll 59.84462866445179 13.601062228461913
en 421608.7625257697 6634935.594096522
- ll2 59.84462866445169 13.6010622284618
+ ll2 59.84462866445168 13.601062228461801
EPSG:3066
ll 78.7585993856645 27.27174709206205
en 289211.709554294 5762568.997143608
- ll2 78.75859938206246 27.271747848493625
+ ll2 78.75859938206244 27.271747848493625
EPSG:3067
ll 46.35672996407686 18.93631540194886
- en -120264.82768384414 5165372.018931383
- ll2 46.35672994146026 18.936315448581677
+ en -120264.82768384449 5165372.018931383
+ ll2 46.35672994146026 18.936315448581674
EPSG:3068
ll 55.703667858672645 14.46073843172399
- en 92519.82659949941 376112.61856716697
+ en 92519.82659949943 376112.61856716627
ll2 55.703667863702385 14.460738443502686
EPSG:3070
ll -32.08389450114475 -90.27989821155268
en 493586.1730085148 -8029769.096628061
- ll2 -32.08389450114475 -90.27989821155268
+ ll2 -32.083894501144755 -90.27989821155268
EPSG:3071
ll 31.38683827674204 -81.93987951574283
en 1287507.535323897 -979293.6900426196
- ll2 31.38683826713183 -81.93987951363712
+ ll2 31.38683826713183 -81.93987951363714
EPSG:3072
ll 9.082258639319292 -77.35092976090698
en -346268.0802293569 -3837127.3260295754
ll2 9.082258628774081 -77.35092966987294
EPSG:30729
ll -50.8917981976221 -0.43288501921205835
- en 1102154.5461300146 -5672864.587303037
- ll2 -50.89179782406014 -0.4328852393859237
+ en 1102154.5461300146 -5672864.587303038
+ ll2 -50.89179782406014 -0.4328852393859219
EPSG:30730
ll 66.25678962936743 1.7101739152361368
en 711555.6413577457 7356244.286912048
- ll2 66.25678961397031 1.7101739347904976
+ ll2 66.25678961397031 1.7101739347904978
EPSG:30731
ll 4.659215643629722 11.457634913031196
- en 1441485.4148102314 520361.00701989484
- ll2 4.65921568496585 11.457634851906176
+ en 1441485.4148102314 520361.0070198947
+ ll2 4.659215684965849 11.457634851906176
EPSG:30732
ll -32.634924622318216 0.777727973316845
- en -272273.86258895334 -3640988.8918925878
- ll2 -32.63492430757203 0.7777279202958991
+ en -272273.86258895334 -3640988.891892587
+ ll2 -32.63492430757203 0.7777279202959027
EPSG:3074
ll -31.7565410896659 -65.3039490767742
en 780713.4796148646 -8270110.46849452
@@ -6327,35 +6327,35 @@ EPSG:3074
EPSG:3075
ll -35.95318272721916 -76.8848128366882
en -113863.9663154725 -8873226.856416654
- ll2 -35.95318270246777 -76.88481279722417
+ ll2 -35.953182702467764 -76.88481279722417
EPSG:3077
ll -13.181858465951393 -68.5782001341696
en 494807.3976528088 -6202607.43973929
- ll2 -13.18185846595113 -68.57820013417324
+ ll2 -13.181858465951128 -68.57820013417324
EPSG:3078
ll 41.60827677021571 -88.24888965973831
- en 312432.1549270693 119889.29315797798
- ll2 41.608276770215575 -88.24888965973831
+ en 312432.1549270698 119889.29315797798
+ ll2 41.60827677021557 -88.24888965973831
EPSG:3079
ll 44.252524246297604 -83.22129775415792
- en 721651.7538175061 414986.47761983983
- ll2 44.25252424629757 -83.2212977541579
+ en 721651.7538175047 414986.47761984076
+ ll2 44.252524246297575 -83.22129775415792
EPSG:30791
ll 3.963529113965137 -52.4199902971053
- en -6204055.834249363 -1479017.8656732372
- ll2 3.96352907942215 -52.41999026696996
+ en -6204055.834249365 -1479017.8656732372
+ ll2 3.963529079422138 -52.41999026696998
EPSG:30792
ll -14.257229098423439 63.389151101239165
- en 9072484.78896342 -3024463.683682316
- ll2 -14.257228968271482 63.389151135238144
+ en 9072484.78896342 -3024463.6836823174
+ ll2 -14.257228968271509 63.38915113523815
EPSG:3081
ll 6.390660613302195 -84.60449919628834
- en 2851186.137204052 -1691638.4648882672
- ll2 6.39066061330221 -84.60449919628834
+ en 2851186.137204052 -1691638.464888263
+ ll2 6.390660613302236 -84.60449919628834
EPSG:3082
ll 20.70901244006837 -51.97229056952915
- en 6416360.392792111 6392510.807723739
- ll2 20.709012440068374 -51.972290569529164
+ en 6416360.392792112 6392510.807723741
+ ll2 20.709012440068374 -51.97229056952915
EPSG:3083
ll 81.50927874811325 39.39146840700445
en 7265001.362759071 1.61235875229174E7
@@ -6367,79 +6367,79 @@ EPSG:3084
EPSG:3085
ll -15.326940585111373 -90.47611084543749
en 2811978.189357174 2769938.273304244
- ll2 -15.326940585111382 -90.47611084543752
+ ll2 -15.326940585111382 -90.4761108454375
EPSG:3086
ll 86.51739400771302 35.64012776852934
- en 6453801.865683596 8400565.912698582
- ll2 86.51739400771285 35.640127768529325
+ en 6453801.865683592 8400565.912698584
+ ll2 86.51739400771285 35.64012776852931
EPSG:3087
ll 77.48347147768237 -133.15913997575345
- en -2548793.5410285657 5546550.178244245
- ll2 77.4834714776832 -133.15913997575342
+ en -2548793.5410285667 5546550.178244245
+ ll2 77.48347147768321 -133.15913997575345
EPSG:3088
ll -14.23564921832656 -148.67656184345333
- en -7744235.362002673 -2184915.5450622947
+ en -7744235.362002656 -2184915.5450623045
ll2 -14.23564921832653 -148.67656184345333
EPSG:3089
ll 78.15403445971336 -150.10979183739713
- en -1703388.7003046875 2.2744864794298124E7
- ll2 78.15403445971337 -150.10979183739713
+ en -1703388.700304712 2.2744864794298153E7
+ ll2 78.15403445971337 -150.10979183739715
EPSG:3090
ll 51.8715197455014 -43.183787036207534
- en 4423841.803255264 3421519.537984089
- ll2 51.8715197455016 -43.18378703620754
+ en 4423841.8032552665 3421519.537984089
+ ll2 51.871519745501644 -43.18378703620754
EPSG:3091
ll 52.994047382516314 -165.4061805413904
- en -1.1171510479761519E7 1.6741326417408919E7
- ll2 52.9940473825166 -165.40618054139037
+ en -1.1171510479761548E7 1.6741326417408917E7
+ ll2 52.994047382516584 -165.40618054139043
EPSG:3092
ll -55.07920868333913 114.99448287675537
- en -10284.381341636239 -6133035.141245527
- ll2 -55.07920764546102 114.99448276062174
+ en -10284.381341637287 -6133035.141245526
+ ll2 -55.07920764546101 114.99448276062175
EPSG:3093
ll -59.181752713763714 126.66207599851143
en 366633.83569286513 -6562653.305790835
ll2 -59.181751686434765 126.6620754798845
EPSG:3094
ll -12.649535242161889 129.80261201007573
- en -64804.2715745545 -1404608.1223212883
- ll2 -12.649534804123745 129.80261188430788
+ en -64804.2715745545 -1404608.1223212886
+ ll2 -12.64953480412375 129.80261188430788
EPSG:3095
ll -37.25499192211106 142.15160087339314
- en 602413.0491612302 -4124109.5227971487
- ll2 -37.25499110041702 142.15160044121313
+ en 602413.0491612328 -4124109.5227971487
+ ll2 -37.25499110041702 142.15160044121316
EPSG:3096
ll 3.8836289412677587 145.5788387770365
- en 342557.8119655143 428694.89577969915
- ll2 3.8836292116593056 145.57883864106398
+ en 342557.8119655143 428694.89577969926
+ ll2 3.883629211659307 145.57883864106398
EPSG:3097
ll 77.93124421339917 128.91575339260137
- en 637854.5232466967 8657662.552023735
- ll2 77.9312442129626 128.91575338445782
+ en 637854.523246697 8657662.552023739
+ ll2 77.93124421296264 128.91575338445787
EPSG:3098
ll -14.955569251703409 130.0832367792496
en 616486.1116182263 -1653695.9625342013
ll2 -14.9555692517034 130.08323677924938
EPSG:3099
ll -74.74190202689242 129.53028889536824
- en 339534.11092741176 -8302205.984890991
- ll2 -74.74190202635937 129.53028889923436
+ en 339534.11092741205 -8302205.984890994
+ ll2 -74.74190202635938 129.5302888992344
EPSG:3100
ll 76.8856440892776 143.69856006693752
en 568327.3050741379 8535579.410644384
ll2 76.88564408927313 143.6985600669307
EPSG:3101
ll 48.11295051341156 151.65851913125738
- en 846704.0342773186 5339358.262757181
- ll2 48.112950512473 151.65851913116458
+ en 846704.0342773186 5339358.26275718
+ ll2 48.112950512472985 151.65851913116458
EPSG:3102
ll -53.03580141153152 -118.15408681525594
en 1.5298054465686034E7 -1.6746128103145035E7
ll2 -53.03580112754245 -118.1540869810609
EPSG:31028
ll 58.02643501633568 -19.681456639706916
- en 223450.87354504812 6441141.62364626
- ll2 58.026434985483036 -19.681456588887038
+ en 223450.87354504818 6441141.623646262
+ ll2 58.026434985483064 -19.681456588887038
EPSG:3106
ll 72.0969514119389 80.73636400949908
en 183575.21646567277 8023799.466503381
@@ -6447,63 +6447,63 @@ EPSG:3106
EPSG:3107
ll -13.939572376888975 72.71285014675213
en -5656851.544577026 2053593.7177678414
- ll2 -13.939572376888943 72.71285014675212
+ ll2 -13.939572376888945 72.71285014675212
EPSG:3108
ll 8.91816206239352 -6.8576453231675885
- en -441898.13204586616 -4446080.846940495
- ll2 8.918162062335954 -6.857645322499122
+ en -441898.1320458662 -4446080.846940494
+ ll2 8.918162062335961 -6.857645322499123
EPSG:3109
ll -64.51505280082682 0.22546073300703107
en 153350.49658298417 -1.2544030034264563E7
- ll2 -64.5150528008163 0.2254607330059568
+ ll2 -64.5150528008163 0.22546073300595548
EPSG:3110
ll -37.69250272651594 81.8489807913753
en -2669861.345592534 2642545.344827027
- ll2 -37.6925027153536 81.84898081420047
+ ll2 -37.6925027153536 81.84898081420049
EPSG:3111
ll 6.955808962487794 77.27954738304109
- en -6521863.72360996 4495063.925749361
- ll2 6.955808962487888 77.27954738304108
+ en -6521863.72360996 4495063.92574936
+ ll2 6.955808962487865 77.27954738304108
EPSG:3112
ll -41.90400419239095 122.4905037010086
- en -975717.9421994186 -4757431.486697955
- ll2 -41.90400419239099 122.49050370100859
+ en -975717.9421994165 -4757431.486697955
+ ll2 -41.90400419239099 122.49050370100862
EPSG:31121
ll 62.07510916746668 -65.35492876401155
- en 64514.81339904311 6910876.308258023
- ll2 62.07510912764566 -65.3549287606725
+ en 64514.81339904381 6910876.308258023
+ ll2 62.075109127645675 -65.35492876067246
EPSG:3113
ll 4.062421876141414 148.14111791956225
- en -490178.6085472492 3649238.769942688
- ll2 4.062421876089105 148.141117921054
+ en -490178.60854725225 3649238.769942688
+ ll2 4.062421876089104 148.14111792105396
EPSG:3114
ll -51.3698935990179 -80.50421165304064
- en 970285.2416572837 -5201555.961081976
- ll2 -51.369893599018106 -80.50421165304066
+ en 970285.2416572837 -5201555.961081977
+ ll2 -51.36989359901813 -80.50421165304066
EPSG:3115
ll 80.32026539141822 -73.58709323403025
en 1065506.570203903 9414636.103367958
- ll2 80.32026539140826 -73.58709323410146
+ ll2 80.32026539140826 -73.58709323410145
EPSG:31154
ll -4.847325659785341 -45.57022475721077
en 1438202.7103227503 -541290.5597417465
ll2 -4.847325651635656 -45.5702248058915
EPSG:3116
ll -23.327410930347412 -79.36874443989939
- en 458314.14258523623 -2098953.244825838
+ en 458314.1425852347 -2098953.244825838
ll2 -23.327410929929577 -79.36874444060734
EPSG:3117
ll 11.752489327592315 -65.93839267862256
- en 1560863.304948336 1796605.548717604
- ll2 11.752489327407266 -65.93839267976806
+ en 1560863.3049483376 1796605.548717604
+ ll2 11.752489327407266 -65.93839267976804
EPSG:31170
ll 73.65054853913679 -56.29421033110805
- en 480958.2419358163 8173289.430677355
- ll2 73.65054856901251 -56.294210519406946
+ en 480958.24193581654 8173289.430677355
+ ll2 73.6505485690125 -56.29421051940694
EPSG:31171
ll -12.249864525501721 -48.22263803772671
en 1313922.6129212142 -1365526.3321450169
- ll2 -12.249864490068836 -48.22263803873002
+ ll2 -12.249864490068834 -48.22263803873002
EPSG:3118
ll 88.96275646934527 -62.70949221663832
en 1010837.8296028845 1.0378387518192977E7
@@ -6511,183 +6511,183 @@ EPSG:3118
EPSG:3119
ll -63.66626038697119 9.340822640482662
en 942796.3787164061 -6056105.053928434
- ll2 -63.66626034951472 9.340822707809364
+ ll2 -63.66626034951472 9.34082270780936
EPSG:3120
ll 19.8985951536566 -33.04056862381348
- en -1388814.036737659 3819516.8537753997
- ll2 19.898595180797976 -33.040568595614026
+ en -1388814.0367376609 3819516.8537754007
+ ll2 19.89859518079798 -33.04056859561404
EPSG:3121
ll -52.47794702193997 122.11808241531502
- en 847289.7230531302 -5828532.900541524
- ll2 -52.47794702444112 122.11808243125058
+ en 847289.7230531303 -5828532.9005415235
+ ll2 -52.477947024441114 122.11808243125058
EPSG:3122
ll -3.9488178610518645 110.40950085219563
- en -457788.8244377861 -441516.79342770984
- ll2 -3.948817872443556 110.40950089434193
+ en -457788.8244377845 -441516.79342770984
+ ll2 -3.9488178724435574 110.40950089434196
EPSG:3123
ll -22.92870232942016 122.246560456732
- en 627611.1869702899 -2537039.3571887473
- ll2 -22.928702363310162 122.2465604459495
+ en 627611.1869702899 -2537039.357188747
+ ll2 -22.92870236331016 122.2465604459495
EPSG:3124
ll -72.65689302227727 126.00708960610407
- en 599719.0591318544 -8067508.276766509
+ en 599719.0591318534 -8067508.27676651
ll2 -72.6568930034402 126.00708968086637
EPSG:3125
ll -6.798601011668325 117.31489428713793
en -352212.7038615529 -758492.9896796752
- ll2 -6.798601027500523 117.31489429546346
+ ll2 -6.798601027500523 117.31489429546347
EPSG:31251
ll 41.90936669892582 6.432678616793885
- en -323339.8266007398 -351531.64171534684
- ll2 41.90936670062695 6.432678667991262
+ en -323339.82660073973 -351531.6417153459
+ ll2 41.909366700626954 6.432678667991261
EPSG:31252
ll 87.88050268301609 13.210715891379232
- en -151.70113054053644 4764745.828790221
+ en -151.70113054053647 4764745.828790221
ll2 87.88050254080983 13.210713604959494
EPSG:31253
ll -49.582858253043376 16.785220918313335
- en 33060.91154325079 -1.0494686576874938E7
- ll2 -49.58285758177494 16.785220341167292
+ en 33060.91154325079 -1.0494686576874936E7
+ ll2 -49.58285758177492 16.785220341167292
EPSG:31254
ll -85.10505210993098 12.310007339837972
- en 18669.4423841676 -1.4455118974682637E7
- ll2 -85.10505115913237 12.310006686224032
+ en 18669.442384167553 -1.4455118974682638E7
+ ll2 -85.10505115913237 12.310006686224034
EPSG:31255
ll -55.77677766001058 7.79054116380742
- en -347763.246251033 -1.119766354488646E7
- ll2 -55.776776937880314 7.79054117867616
+ en -347763.2462510332 -1.119766354488646E7
+ ll2 -55.776776937880314 7.790541178676155
EPSG:31256
ll 43.04512383075314 19.559164725738697
en 262924.18538744235 -227715.1398881497
ll2 43.0451238270459 19.559164738976115
EPSG:31257
ll 27.43557111779407 11.88491484013841
- en 303360.0302289538 -1963631.7062430987
- ll2 27.435571090134413 11.884914835269194
+ en 303360.0302289536 -1963631.7062430982
+ ll2 27.435571090134427 11.884914835269196
EPSG:31258
ll -70.45401935130413 23.264183728872162
en 819301.1450267977 -1.2849712281419996E7
- ll2 -70.45401846985524 23.264182338763547
+ ll2 -70.45401846985526 23.264182338763543
EPSG:31259
ll -35.71524080578418 7.515352980932222
en -49005.6599319675 -8990258.522122616
- ll2 -35.715240333007486 7.515353013534229
+ ll2 -35.71524033300749 7.515353013534226
EPSG:3126
ll 86.07419343061667 13.472994954185086
en 457800.07296153513 9565515.911782999
- ll2 86.07419343061161 13.472994958850764
+ ll2 86.07419343061161 13.472994958850762
EPSG:3127
ll 23.16341973314549 10.896130064870267
en -434958.2707670451 2592022.2138695214
- ll2 23.16341972103042 10.896130065383648
+ ll2 23.16341972103043 10.896130065383652
EPSG:3128
ll -52.1077186715613 14.033587531642606
- en 23000.232993874874 -5798263.59186018
- ll2 -52.107718660978975 14.033587549228352
+ en 23000.232993874815 -5798263.591860181
+ ll2 -52.10771866097897 14.033587549228352
EPSG:31281
ll 79.49240238149827 19.13688732281793
- en 178962.3085274882 8841534.999821983
+ en 178962.308527488 8841534.999821985
ll2 79.49240231715156 19.136886698887285
EPSG:31282
ll 65.09326150554085 4.565513537934309
- en -410788.5724308488 7249887.574499125
+ en -410788.5724308489 7249887.574499125
ll2 65.09326149567472 4.565513796554601
EPSG:31283
ll 60.998371875052015 15.291740078096334
- en -55972.800791434114 6765283.566852367
- ll2 60.99837188304914 15.29174010390499
+ en -55972.80079143409 6765283.5668523675
+ ll2 60.998371883049145 15.29174010390499
EPSG:31284
ll 14.247673055787288 3.695642749339459
- en -567841.0627353061 1585561.2278121419
- ll2 14.24767304246903 3.6956427434915144
+ en -567841.0627353063 1585561.2278121416
+ ll2 14.247673042469028 3.695642743491511
EPSG:31285
ll -78.96191677609767 9.471284256180848
en 367343.6252655522 -8771636.21376291
- ll2 -78.96191584488054 9.47128419967286
+ ll2 -78.96191584488052 9.47128419967286
EPSG:31286
ll -81.4018133883345 18.98065315164695
- en 794069.721818764 -9042315.274638839
- ll2 -81.40181245896622 18.98065211219762
+ en 794069.721818764 -9042315.274638837
+ ll2 -81.4018124589662 18.980652112197614
EPSG:31287
ll 65.4748786980798 22.203061396940072
- en 834591.3614567589 2463056.5283291508
- ll2 65.47487871798293 22.203061409134992
+ en 834591.3614567589 2463056.5283291526
+ ll2 65.47487871798296 22.203061409134992
EPSG:31288
ll -54.564875899561486 12.635356733526313
- en 299198.04743964644 -6051336.600010446
- ll2 -54.564875160903355 12.635356123047869
+ en 299198.0474396463 -6051336.600010446
+ ll2 -54.564875160903355 12.635356123047865
EPSG:31289
ll -55.640772666618844 5.458653267012294
en -44888.18686224811 -6196815.043806087
- ll2 -55.64077188349784 5.458652856036451
+ ll2 -55.64077188349784 5.4586528560364505
EPSG:3129
ll -79.60035720713485 22.17424231908986
- en 503512.7206663984 -8840521.57981462
- ll2 -79.60035720713563 22.174242319089856
+ en 503512.72066639847 -8840521.579814624
+ ll2 -79.60035720713569 22.174242319089863
EPSG:31290
ll -34.96866855773854 12.367476755184192
en 388141.483837617 -3878598.853775355
- ll2 -34.96866808645178 12.367476469725617
+ ll2 -34.96866808645178 12.367476469725615
EPSG:3130
ll 20.199616348973237 26.35356576543394
- en 850649.9040347849 2238011.07524646
- ll2 20.199616348953718 26.353565765440635
+ en 850649.9040347849 2238011.0752464593
+ ll2 20.199616348953708 26.353565765440635
EPSG:31300
ll 53.394307701470694 47.94114028474445
- en 2889063.644322206 1282091.7004297231
- ll2 53.39430771350986 47.941140265337786
+ en 2889063.644322206 1282091.7004297217
+ ll2 53.39430771350983 47.941140265337765
EPSG:3131
ll 37.586356906337315 27.372926503210778
- en 797953.131965843 4166939.576992616
- ll2 37.586356906250785 27.37292650330104
+ en 797953.1319658434 4166939.576992615
+ ll2 37.58635690625078 27.372926503301056
EPSG:3132
ll 11.19893794164605 32.5104494518403
- en 1322437.9914423884 1248985.302552608
- ll2 11.198937939286326 32.510449437910594
+ en 1322437.9914423875 1248985.302552608
+ ll2 11.19893793928633 32.510449437910594
EPSG:3133
ll -64.57112744245511 23.491897096092845
- en 379809.5068237049 -7165900.694830598
- ll2 -64.57112744243972 23.49189709609495
+ en 379809.5068237053 -7165900.694830598
+ ll2 -64.57112744243972 23.491897096094963
EPSG:3134
ll -3.0037532528692736 19.764459673981715
- en -306506.5566852846 -334820.2523819238
- ll2 -3.0037532522739103 19.764459692663046
+ en -306506.5566852846 -334820.25238192384
+ ll2 -3.0037532522739117 19.764459692663046
EPSG:3135
ll -39.664659321132845 35.03886857440074
en 1104288.1683450956 -4416054.181081568
- ll2 -39.664659313351216 35.03886857108863
+ ll2 -39.66465931335123 35.03886857108863
EPSG:3136
ll -67.51033353221793 23.821985572568842
- en 279092.28831483773 -7500500.062630958
- ll2 -67.51033353124608 23.821985574667632
+ en 279092.28831483796 -7500500.062630961
+ ll2 -67.5103335312461 23.821985574667632
EPSG:3137
ll -49.48994178412712 29.902573077111434
- en 492941.28344176634 -5484120.816059019
- ll2 -49.48994178412728 29.90257307711142
+ en 492941.2834417661 -5484120.816059019
+ ll2 -49.48994178412729 29.902573077111423
EPSG:31370
ll 49.91513996934379 3.0892264075922404
- en 58108.251968638695 67871.94610605389
- ll2 49.91513997291573 3.0892264054277314
+ en 58108.25196863871 67871.94610607717
+ ll2 49.91513997291573 3.089226405427732
EPSG:3138
ll 37.75329621776774 23.366366878238786
- en -173220.16400133923 4207666.132652629
+ en -173220.16400133946 4207666.132652629
ll2 37.753296206694735 23.36636688451302
EPSG:3140
ll 56.97355664712137 177.4736509714258
- en 386838.44728108024 4.200249170917978E7
- ll2 56.973556595635976 177.47365083088502
+ en 386838.4472811834 4.200249170917978E7
+ ll2 56.97355659563598 177.47365083088505
EPSG:3141
ll -32.602880332544395 174.15109494326066
- en 233027.74814271 6389310.743980881
- ll2 -32.60288029247164 174.15109503899518
+ en 233027.74814270734 6389310.743980881
+ ll2 -32.60288029247164 174.1510950389952
EPSG:3142
ll -50.13785501476041 -169.15123604596107
- en 1060956.5325466925 4416626.275768923
- ll2 -50.13785493939392 -169.15123599856523
+ en 1060956.5325466925 4416626.275768924
+ ll2 -50.13785493939391 -169.15123599856523
EPSG:31466
ll 7.0210401440287065 6.5142293675331056
- en 2556811.486749014 776341.9609297286
- ll2 7.021040144028706 6.514229367533092
+ en 2556811.486749014 776341.9609297287
+ ll2 7.0210401440287065 6.514229367533092
EPSG:31467
ll 49.4988750014639 7.261117510799364
en 3374117.1277635116 5486123.243967674
@@ -6702,60 +6702,60 @@ EPSG:31469
ll2 75.71474879775381 16.23080002641239
EPSG:3148
ll 86.15060671189454 106.92451045928136
- en 514840.5955957416 9568045.63047007
- ll2 86.1506063932351 106.92450758945586
+ en 514840.59559574147 9568045.63047007
+ ll2 86.15060639323511 106.92450758945584
EPSG:3149
ll -75.32360770122031 108.12128905659506
- en 419126.7734937021 -8361465.51507343
- ll2 -75.32360687248718 108.12128701644131
+ en 419126.7734937013 -8361465.51507343
+ ll2 -75.32360687248719 108.1212870164413
EPSG:3152
ll -43.91583418356597 16.976866059797214
- en 13359.218037238432 -1.1365625457836935E7
- ll2 -43.91583418356589 16.976866059797036
+ en 13359.218037238432 -1.1365625457836937E7
+ ll2 -43.91583418356592 16.97686605979703
EPSG:31528
ll 2.7631172084955296 -20.079288603902167
- en -65533.50119754847 306630.39092309074
- ll2 2.763117208475143 -20.07928860201701
+ en -65533.50119754893 306630.39092309074
+ ll2 2.763117208475143 -20.079288602017012
EPSG:31529
ll -51.008733804989326 -11.97281977035034
- en 291209.2094018892 -5654978.0136481505
- ll2 -51.00873375033845 -11.972819692976977
+ en 291209.20940188924 -5654978.0136481505
+ ll2 -51.00873375033845 -11.972819692976975
EPSG:3153
ll 77.46241922427723 26.74623926269652
- en 2778974.772139853 6812372.203412658
- ll2 77.46241922427808 26.746239262696523
+ en 2778974.77213985 6812372.203412657
+ ll2 77.46241922427812 26.746239262696548
EPSG:3154
ll 18.45017833135401 -143.00518856983734
- en 288235.8346042344 2041165.7667713463
- ll2 18.45017833135325 -143.0051885698354
+ en 288235.8346042374 2041165.7667713463
+ ll2 18.450178331353246 -143.00518856983538
EPSG:3155
ll -49.40939045449984 -137.60572029584247
en 310987.90380838397 -5476232.23498336
- ll2 -49.409390454470405 -137.60572029585185
+ ll2 -49.40939045447039 -137.60572029585188
EPSG:3156
ll 1.1828487207214096 -138.20072176563622
- en -528047.3897590431 132455.7223599629
- ll2 1.1828487194135153 -138.2007216642987
+ en -528047.3897590493 132455.72235996294
+ ll2 1.182848719413515 -138.20072166429875
EPSG:3157
ll -1.6604711027809742 -128.34965152403618
- en -95904.82503601082 -184340.36872539198
- ll2 -1.6604711027392436 -128.34965152122427
+ en -95904.82503601082 -184340.36872539195
+ ll2 -1.6604711027392434 -128.3496515212243
EPSG:3158
ll 29.154454482019844 -102.49920139842189
- en 159573.97078021802 3230166.3247589325
+ en 159573.97078021662 3230166.3247589325
ll2 29.15445448196401 -102.49920139853069
EPSG:3159
ll 47.47140185097737 -101.25486998732752
- en -121850.61821181979 5290673.960427899
- ll2 47.47140182440025 -101.25486992320805
+ en -121850.61821182095 5290673.960427898
+ ll2 47.471401824400246 -101.25486992320803
EPSG:3160
ll 46.60819326939745 -95.24322063735278
en -131136.11781178042 5194728.955098456
ll2 46.60819324359939 -95.24322057828938
EPSG:31600
ll 75.5031736104261 -55.21746870173125
- en -1331686.6696599524 5275208.963842397
- ll2 75.50317357547468 -55.21746868685659
+ en -1331686.669659956 5275208.963842396
+ ll2 75.50317357547469 -55.217468686856606
EPSG:3161
ll 10.254386549913484 -98.59099008246342
en -874755.1431583394 8056019.252646049
@@ -6763,35 +6763,35 @@ EPSG:3161
EPSG:3162
ll 17.94943457675764 -87.10072121497633
en 677291.8858343575 8897887.656549431
- ll2 17.94943457675764 -87.10072121497633
+ ll2 17.949434576757636 -87.10072121497633
EPSG:3163
ll -30.19899154168688 85.32692106742883
en -7115029.034829221 -2650696.3767226785
- ll2 -30.198991541685494 85.32692106742884
+ ll2 -30.198991541685494 85.32692106742883
EPSG:3164
ll 67.99054064175422 173.77000381278478
en 865747.0148396955 1.7567889221237674E7
- ll2 67.99054062296287 173.77000356298302
+ ll2 67.99054062296285 173.77000356298302
EPSG:3165
ll -12.93524495780541 147.53559914211542
en -2073339.5562114853 907515.5123227658
ll2 -12.935244960329216 147.53559913940015
EPSG:3166
ll -18.93927383026218 178.61401200246848
- en 1282463.4258278126 316961.550419521
- ll2 -18.93927390047548 178.61401192504601
+ en 1282463.4258278122 316961.55041952385
+ ll2 -18.939273900475474 178.61401192504601
EPSG:3167
ll 4.5894214535343885 103.88899311718082
en -5460.509281410751 25224.956165464584
ll2 4.5894214535340145 103.88899311718082
EPSG:3168
ll 2.72881173225682 101.96321994329483
- en 440721.71596626757 301943.0167295394
- ll2 2.7288117322220073 101.96321994329483
+ en 440721.7159662675 301943.0167295395
+ ll2 2.728811732222008 101.96321994329483
EPSG:3169
ll 55.533553364212736 165.80954638264419
- en 929432.2229114383 1.6175247306053402E7
- ll2 55.53355335519353 165.80954636545235
+ en 929432.2229114384 1.61752473060534E7
+ ll2 55.53355335519351 165.80954636545232
EPSG:3170
ll 42.09027939157002 155.19334689850552
en -311408.05810636294 1.4706587066260938E7
@@ -6799,35 +6799,35 @@ EPSG:3170
EPSG:3171
ll 42.751109382053244 161.94718854387617
en -241087.74975581374 1.4773092468838092E7
- ll2 42.7511093443628 161.94718864893795
+ ll2 42.75110934436281 161.94718864893795
EPSG:3172
ll -38.34017538769148 164.9489446112713
- en -28818.499059191672 5739180.91297041
- ll2 -38.34017535774268 164.94894466271623
+ en -28818.49905919435 5739180.91297041
+ ll2 -38.3401753577427 164.94894466271614
EPSG:3174
ll -60.899707566792884 -49.471315779466266
- en 7250661.136818542 -6179481.623148579
- ll2 -60.899707566792856 -49.47131577946626
+ en 7250661.136818544 -6179481.623148577
+ ll2 -60.899707566792884 -49.471315779466266
EPSG:3175
ll 54.48901986889078 -31.455909339475028
- en 4167854.5415058676 3047009.6571801393
- ll2 54.489019868890736 -31.455909339475028
+ en 4167854.5415058644 3047009.657180145
+ ll2 54.48901986889081 -31.455909339475028
EPSG:3176
ll 69.19837213167696 102.7249402369923
- en 370686.0257036865 7679618.659454677
- ll2 69.19837204713502 102.72494006275043
+ en 370686.02570368705 7679618.659454675
+ ll2 69.19837204713501 102.72494006275048
EPSG:3177
ll -30.149040905771024 14.958223879504036
- en 804002.5237991506 -3326721.1387953227
- ll2 -30.149040904096037 14.958223882109941
+ en 804002.5237991507 -3326721.1387953227
+ ll2 -30.149040904096037 14.958223882109943
EPSG:3178
ll -56.10654798075091 -67.6790414846061
en 954864.6557096087 -6242113.788906899
- ll2 -56.10654796714425 -67.67904151901598
+ ll2 -56.10654796714426 -67.67904151901598
EPSG:3179
ll -44.936076432327205 -73.54958192606377
- en 141023.7458859909 -4985926.645873662
- ll2 -44.936076431578364 -73.54958192616563
+ en 141023.74588599085 -4985926.645873662
+ ll2 -44.93607643157836 -73.54958192616563
EPSG:3180
ll -74.36149029069755 -63.210385255713156
en 493669.6010396696 -8252379.121349439
@@ -6835,79 +6835,79 @@ EPSG:3180
EPSG:3181
ll 62.09641804429302 -54.89005535504933
en 610149.7812936178 6886713.939484298
- ll2 62.09641804428701 -54.89005535504929
+ ll2 62.096418044287 -54.890055355049306
EPSG:3182
ll 40.85993139761703 -47.55243700004584
en 790583.8179950041 4528931.424777876
- ll2 40.85993139749741 -47.55243699996122
+ ll2 40.859931397497405 -47.55243699996121
EPSG:3183
ll 34.30271745477067 -50.19845276265081
- en 21402.723933405476 3807977.488216638
- ll2 34.30271745385918 -50.19845276361471
+ en 21402.723933405476 3807977.4882166376
+ ll2 34.302717453859174 -50.1984527636147
EPSG:31838
ll 45.008471044965916 48.83955084153953
- en 802572.5536100287 4991060.1425034795
- ll2 45.00847104471706 48.839550841616884
+ en 802572.5536100281 4991060.14250348
+ ll2 45.00847104471707 48.83955084161686
EPSG:31839
ll -68.37967125351535 52.19108384744222
en 548974.5166519296 -7585663.532231414
ll2 -68.37967125355092 52.191083847423926
EPSG:3184
ll 45.85020702851969 -39.14446005080728
- en 488783.9778617058 5077414.83015507
- ll2 45.850207028519776 -39.1444600508073
+ en 488783.97786170634 5077414.83015507
+ ll2 45.850207028519776 -39.14446005080728
EPSG:3185
ll -41.570464517960644 -32.200121518947576
- en 566687.920376994 -4602396.07000146
- ll2 -41.57046451796067 -32.20012151894754
+ en 566687.9203769945 -4602396.07000146
+ ll2 -41.57046451796068 -32.20012151894753
EPSG:3186
ll 85.90465302754913 -34.22970037617718
en 442505.5839036521 9544353.153249266
- ll2 85.90465302759057 -34.229700323134864
+ ll2 85.90465302759056 -34.22970032313486
EPSG:3187
ll 51.949641623566606 -22.69343657444871
- en 383618.3081129879 5756791.770459042
- ll2 51.949641623564574 -22.693436574449617
+ en 383618.30811298784 5756791.770459041
+ ll2 51.94964162356456 -22.693436574449617
EPSG:3188
ll 80.83733049000645 -17.647432319128082
- en 452951.7194017656 8976120.284775345
- ll2 80.83733049000543 -17.64743231912215
+ en 452951.71940176556 8976120.284775345
+ ll2 80.83733049000543 -17.647432319122153
EPSG:3189
ll -30.76110413327143 -10.059233339268594
- en 398625.1815773608 -3403606.065429799
- ll2 -30.761104133269782 -10.059233339268769
+ en 398625.1815773608 -3403606.0654298
+ ll2 -30.761104133269793 -10.059233339268767
EPSG:3190
ll 70.78987144550649 6.241657851455208
- en 98775.10487581315 7859072.752480412
- ll2 70.78987142562299 6.241657886461296
+ en 98775.10487581324 7859072.752480413
+ ll2 70.78987142562302 6.241657886461296
EPSG:31901
ll 28.8533914846369 43.67628428259181
en 77870.48607035482 3200710.3778182813
- ll2 28.85339148448557 43.676284282413626
+ ll2 28.853391484485574 43.676284282413626
EPSG:3191
ll -17.568651842185375 10.465166777383091
- en 143292.37989347553 -1943229.6017884917
- ll2 -17.568651841443945 10.465166780395863
+ en 143292.37989347574 -1943229.6017884922
+ ll2 -17.568651841443952 10.465166780395867
EPSG:3192
ll -28.16645068381755 21.41966909591305
- en 1028582.8195608697 -3145611.927255938
- ll2 -28.16645067260657 21.419669101721382
+ en 1028582.8195608691 -3145611.9272559383
+ ll2 -28.166450672606565 21.41966910172138
EPSG:3193
ll 0.9405860922795313 11.272225364191764
- en -215141.71703821112 104224.40673724141
- ll2 0.9405860923438868 11.272225366909616
+ en -215141.71703821083 104224.40673724141
+ ll2 0.9405860923438867 11.27222536690962
EPSG:3194
ll -54.07499863840416 13.503430367221785
- en -28780.171948168543 -5999647.681706541
- ll2 -54.07499862992144 13.503430375474027
+ en -28780.17194816866 -5999647.681706541
+ ll2 -54.074998629921446 13.503430375474027
EPSG:3195
ll 13.179670895839436 15.382504828948825
- en -192339.58156771993 1460348.9253342578
- ll2 13.179670895525298 15.382504830666505
+ en -192339.58156771987 1460348.9253342585
+ ll2 13.179670895525309 15.382504830666504
EPSG:3196
ll -13.19594307749874 18.531334233919935
- en -67635.16334171017 -1460633.7374911953
- ll2 -13.19594307705642 18.53133423506075
+ en -67635.16334171093 -1460633.7374911953
+ ll2 -13.195943077056423 18.53133423506074
EPSG:31965
ll 25.99495309426034 -114.69801135994771
en 730425.9409817065 2877154.477667795
@@ -6915,55 +6915,55 @@ EPSG:31965
EPSG:31966
ll -69.43383465208657 -103.01342586154857
en 812347.7600584603 -7723161.09923649
- ll2 -69.43383464236061 -103.01342597118155
+ ll2 -69.43383464236061 -103.01342597118156
EPSG:31967
ll 26.882352186989408 -99.46771591723062
- en 1049965.0767249395 2985434.7512098616
- ll2 26.882352186266697 -99.46771591588815
+ en 1049965.076724941 2985434.751209862
+ ll2 26.882352186266694 -99.46771591588815
EPSG:31968
ll -77.1509552103097 -104.9981487371824
- en 351342.31081775046 -8571212.757828766
- ll2 -77.1509552097444 -104.99814872803016
+ en 351342.3108177502 -8571212.757828768
+ ll2 -77.15095520974441 -104.99814872803017
EPSG:31969
ll 38.179828843137045 -85.69895677953724
- en 1139853.0165379257 4251044.413228177
- ll2 38.17982883433173 -85.69895678301172
+ en 1139853.0165379257 4251044.4132281765
+ ll2 38.179828834331715 -85.69895678301172
EPSG:3197
ll -28.29947850958925 27.303703531433865
- en 622364.5800875244 -3139009.7461145357
- ll2 -28.29947850810385 27.30370353186236
+ en 622364.5800875241 -3139009.746114536
+ ll2 -28.299478508103856 27.30370353186236
EPSG:31970
ll -59.49964215270154 -78.13316794138889
en 1001043.5980964494 -6629195.991867643
- ll2 -59.49964211631114 -78.13316816572821
+ ll2 -59.499642116311136 -78.13316816572821
EPSG:31971
ll 3.664278382955615 -89.41831365958534
en -438221.9919995653 409447.6828108967
- ll2 3.664278380858708 -89.41831360804285
+ ll2 3.664278380858708 -89.41831360804284
EPSG:31972
ll -53.705138686154534 -82.49741849303969
en 5506.409365093452 -5976855.926691946
- ll2 -53.705138670027004 -82.49741845473562
+ ll2 -53.705138670027004 -82.49741845473561
EPSG:31973
ll 85.54512797185362 -75.60370133845133
en 442857.5135732579 9503878.461474305
- ll2 85.54512797184981 -75.60370131514401
+ ll2 85.5451279718498 -75.60370131514401
EPSG:31974
ll -89.76500035038443 -71.0624796677646
- en 496320.11857262754 -9971986.734093761
- ll2 -89.76500035040065 -71.06247952393687
+ en 496320.11857262737 -9971986.73409376
+ ll2 -89.7650003504006 -71.0624795239364
EPSG:31975
ll -12.071390934747981 -57.772168521095395
- en 415962.2849910932 -1334566.3579450846
- ll2 -12.07139093474798 -57.772168521095324
+ en 415962.2849910924 -1334566.3579450846
+ ll2 -12.07139093474798 -57.77216852109534
EPSG:31976
ll -50.4682055089346 -41.66172063624808
- en 1162159.3061357662 -5632476.422093357
- ll2 -50.468205453731414 -41.66172088527874
+ en 1162159.3061357667 -5632476.422093359
+ ll2 -50.46820545373143 -41.66172088527873
EPSG:31977
ll 70.76797911605797 -84.61841669946155
en 367044.619088302 1.78554854501383E7
- ll2 70.76797911597724 -84.61841669937353
+ ll2 70.76797911597723 -84.6184166993735
EPSG:31978
ll -85.6433692481077 -80.16435727696312
en 456258.6740630313 486473.4096565619
@@ -6971,23 +6971,23 @@ EPSG:31978
EPSG:31979
ll 46.21505516904443 -64.79681018494195
en 824187.381000883 1.5126534326922303E7
- ll2 46.21505516855903 -64.79681018487146
+ ll2 46.21505516855905 -64.79681018487148
EPSG:3198
ll -3.7929225709640093 29.15419178911087
en 661829.9056589965 -420492.2622077513
ll2 -3.7929225708085936 29.154191788377194
EPSG:31980
ll -60.640426887799414 -69.5789270452905
- en 140569.697356597 3259247.93810915
- ll2 -60.640426881484686 -69.5789270299433
+ en 140569.69735659525 3259247.938109151
+ ll2 -60.640426881484686 -69.57892702994333
EPSG:31981
ll -69.63928509331353 -66.92212861823295
en 116183.83714728383 2243097.937856051
- ll2 -69.63928506539042 -66.92212782572734
+ ll2 -69.63928506539044 -66.92212782572734
EPSG:31982
ll 83.65495607450433 -45.578681909852094
- en 566793.5523103037 1.9292717463749073E7
- ll2 83.65495607446867 -45.57868191372628
+ en 566793.5523103038 1.9292717463749073E7
+ ll2 83.65495607446867 -45.578681913726264
EPSG:31983
ll -2.514060122548898 -40.714699224343704
en 976836.8319167295 9721335.72698374
@@ -6995,99 +6995,99 @@ EPSG:31983
EPSG:31984
ll -5.453211893397707 -44.126451993776165
en -68631.65685350588 9394815.581779495
- ll2 -5.453211893299434 -44.12645199183504
+ ll2 -5.453211893299435 -44.12645199183505
EPSG:31985
ll -40.970542799095526 -25.485583796741093
- en 1132509.1214044793 5437233.265143625
- ll2 -40.970542786915104 -25.485583807947364
+ en 1132509.1214044788 5437233.265143626
+ ll2 -40.970542786915104 -25.48558380794738
EPSG:31986
ll -77.81649946586636 -82.63533786054313
- en 461477.3434294874 -8638428.379240602
+ en 461477.3434294873 -8638428.379240602
ll2 -77.81649946586705 -82.63533786054307
EPSG:31987
ll 71.1760756190753 -66.93317661267437
- en 789743.7364046336 7916379.20062704
- ll2 71.17607561084716 -66.93317673631557
+ en 789743.7364046345 7916379.20062704
+ ll2 71.17607561084719 -66.93317673631554
EPSG:31988
ll -67.9229496045171 -67.43942252721612
- en 565450.7063351029 -7535099.963161488
- ll2 -67.92294960451724 -67.43942252721612
+ en 565450.7063351022 -7535099.96316149
+ ll2 -67.92294960451724 -67.43942252721615
EPSG:31989
ll -87.02297082276581 -71.66198187003056
- en 449963.4189448606 -9669369.148217116
- ll2 -87.02297082319558 -71.66198159503712
+ en 449963.4189448608 -9669369.148217116
+ ll2 -87.02297082319558 -71.66198159503709
EPSG:3199
ll -78.80534511316962 6.904398019910948
- en 454666.0723307384 -8749135.633288296
- ll2 -78.80534508194518 6.9043980943311025
+ en 454666.0723307385 -8749135.633288298
+ ll2 -78.80534508194519 6.9043980943311
EPSG:31990
ll -44.33101585983202 -50.63958621464648
en 1007121.0877583167 -4928350.073734285
- ll2 -44.33101585447773 -50.63958621751675
+ ll2 -44.331015854477734 -50.63958621751675
EPSG:31991
ll -13.798974114031282 -48.027286944947946
- en 821431.3716479247 -1527484.2018254306
- ll2 -13.79897411402514 -48.02728694499055
+ en 821431.3716479263 -1527484.2018254308
+ ll2 -13.798974114025143 -48.02728694499054
EPSG:31992
ll -27.743414525977443 -81.72810672240611
- en 428240.7526674336 6931008.127738649
- ll2 -27.743414525976743 -81.72810672240614
+ en 428240.752667435 6931008.127738649
+ ll2 -27.743414525976743 -81.7281067224061
EPSG:31993
ll 40.433622081116255 -84.64998765948567
en -319094.75717006123 1.4520854652953342E7
- ll2 40.433622034073714 -84.64998750149128
+ ll2 40.433622034073714 -84.6499875014913
EPSG:31994
ll 19.107174811267313 -60.82661265236511
en 1362009.3292390606 1.213290905639511E7
- ll2 19.10717480580851 -60.82661265554125
+ ll2 19.1071748058085 -60.82661265554126
EPSG:31995
ll -13.318064765055453 -55.755515757487146
- en 1286476.6919368547 8516191.635879984
- ll2 -13.318064763022019 -55.7555157654693
+ en 1286476.6919368533 8516191.635879984
+ ll2 -13.31806476302202 -55.755515765469305
EPSG:31996
ll 74.60717859579822 -57.98523782614134
en 470809.9838413064 1.8280021000059437E7
ll2 74.60717859579917 -57.98523782614134
EPSG:31997
ll 73.95499796651382 -59.94325708220896
- en 225040.67606774968 1.8227689063306388E7
+ en 225040.67606774933 1.8227689063306384E7
ll2 73.9549979578677 -59.943256752989335
EPSG:31998
ll 33.855317727034645 -37.05091950278209
- en 1236221.6052728794 1.3774675612465248E7
- ll2 33.85531771637505 -37.05091950440325
+ en 1236221.6052728798 1.3774675612465248E7
+ ll2 33.85531771637505 -37.05091950440323
EPSG:31999
ll -21.840441122823407 -37.27368302165951
en 678410.2005006934 7583833.691027604
- ll2 -21.840441122822927 -37.2736830216593
+ ll2 -21.840441122822924 -37.2736830216593
EPSG:3200
ll 0.27792459611147535 62.17916478947201
- en 3706606.850250989 -2403673.6544149662
- ll2 0.2779246767591187 62.17916481719302
+ en 3706606.850250991 -2403673.654414963
+ ll2 0.2779246767591442 62.17916481719303
EPSG:32000
ll 48.97473565622522 -24.080993682636876
- en 1152317.0250506864 1.5463095730931453E7
- ll2 48.97473561406117 -24.080993831146824
+ en 1152317.0250506867 1.5463095730931453E7
+ ll2 48.974735614061174 -24.08099383114683
EPSG:3201
ll 31.353460893127206 12.1064843680827
- en 224788.4767226209 3472409.05881454
- ll2 31.353460891560648 12.106484371324878
+ en 224788.47672262113 3472409.05881454
+ ll2 31.353460891560648 12.106484371324882
EPSG:3202
ll -21.80284292498291 28.981501438573094
en 1326971.5830135695 -2432497.8075349834
- ll2 -21.80284291905865 28.981501440869458
+ ll2 -21.802842919058648 28.981501440869454
EPSG:3203
ll -82.50715867994074 26.694591238846222
- en 495556.922691418 -9161521.92701289
- ll2 -82.5071586408159 26.694591245330297
+ en 495556.9226914181 -9161521.927012892
+ ll2 -82.50715864081592 26.694591245330304
EPSG:3204
ll -41.41874114532288 -31.337539468526046
- en 2918771.066683934 4933816.3107773885
- ll2 -41.41874114532288 -31.337539468526053
+ en 2918771.066683933 4933816.3107773885
+ ll2 -41.41874114532289 -31.337539468526046
EPSG:3205
ll -27.408602766916843 8.961759086988224
en 6145357.654395057 4208289.283728451
- ll2 -27.40860276691683 8.961759086988224
+ ll2 -27.408602766916825 8.961759086988216
EPSG:3206
ll -86.41932531007691 -41.6911765446757
en 2587.469874450455 543638.2345610806
@@ -7103,23 +7103,23 @@ EPSG:3208
EPSG:3209
ll -32.21147520234139 -64.80936340253366
en -1164691.175490721 6690102.708197486
- ll2 -32.2114752023414 -64.80936340253366
+ ll2 -32.21147520234139 -64.80936340253366
EPSG:3210
ll -78.15973449847596 39.54816634518262
en -57775.70708002589 1477018.6265718867
ll2 -78.15973449847596 39.54816634518262
EPSG:32100
ll -3.6726976676919953 -70.49404825965979
- en 6468834.610441122 -4535090.681929465
- ll2 -3.6726976676919647 -70.49404825965979
+ en 6468834.610441127 -4535090.681929465
+ ll2 -3.6726976676919523 -70.49404825965979
EPSG:32104
ll 40.22690572637449 -118.51332242911707
en -1063516.8132782339 211740.0590201926
- ll2 40.22690572637453 -118.51332242911707
+ ll2 40.22690572637454 -118.51332242911707
EPSG:32107
ll -88.69220402051273 -106.76542823693995
- en 222388.06895756163 -5703106.843510088
- ll2 -88.6922040207744 -106.76542856150171
+ en 222388.0689575614 -5703106.843510088
+ ll2 -88.6922040207744 -106.7654285615018
EPSG:32108
ll 34.07171843940361 -108.80346679286973
en 1226608.5997516224 5952804.050932177
@@ -7134,15 +7134,15 @@ EPSG:3211
ll2 -19.756662018454826 37.958412382228516
EPSG:32110
ll -36.46376790235441 -64.05297699590737
- en 983005.5815594923 -8770950.657848656
- ll2 -36.463767892330075 -64.05297699943029
+ en 983005.5815594923 -8770950.657848658
+ ll2 -36.46376789233008 -64.05297699943029
EPSG:32111
ll 51.89511343513033 -79.13894601637848
en -169222.54670564813 1461705.008529387
- ll2 51.89511343417745 -79.13894601609469
+ ll2 51.89511343417746 -79.13894601609469
EPSG:32112
ll 37.73767942409711 -97.03819732031285
- en 808404.1753241112 772486.5817951522
+ en 808404.1753241115 772486.5817951522
ll2 37.73767941557283 -97.03819732310176
EPSG:32113
ll 61.72518028450094 -106.12937826303663
@@ -7151,50 +7151,50 @@ EPSG:32113
EPSG:32114
ll -41.701876796045894 -104.13283215646477
en 1138015.4654826925 -8055449.767257955
- ll2 -41.70187679585516 -104.13283215635353
+ ll2 -41.701876795855156 -104.13283215635353
EPSG:32115
ll -73.26790112137147 -71.86731045645604
- en 234600.7986890865 -1.243423884583887E7
- ll2 -73.26790112136277 -71.86731045646124
+ en 234600.79868908646 -1.2434238845838873E7
+ ll2 -73.26790112136277 -71.86731045646125
EPSG:32116
ll 21.56217041594553 -74.96195056436682
- en 417942.5047921 -2043207.0313706626
- ll2 21.56217041594527 -74.96195056436676
+ en 417942.50479209994 -2043207.0313706626
+ ll2 21.562170415945275 -74.96195056436676
EPSG:32117
ll -88.51847876929811 -77.65635429440242
- en 352676.6370518403 -1.4265148149720041E7
- ll2 -88.5184787692981 -77.65635429440242
+ en 352676.63705184025 -1.4265148149720045E7
+ ll2 -88.51847876929816 -77.6563542944024
EPSG:32118
ll 7.673547278944682 -112.36701548924843
en -4475748.593550849 -2734829.380197403
- ll2 7.673547278944683 -112.36701548924844
+ ll2 7.673547278944682 -112.36701548924844
EPSG:32119
ll -20.796878646843084 -65.3883012902503
en 2838272.5877569662 -6951928.935821855
ll2 -20.79687864684307 -65.3883012902503
EPSG:3212
ll -43.01313220711828 53.92212745783138
- en -1045983.9806361842 5363782.293891809
+ en -1045983.9806361843 5363782.293891809
ll2 -43.013132207118275 53.92212745783138
EPSG:32120
ll 5.811323522016167 -119.58278672446423
- en -2056120.0157189844 -4640056.51755669
- ll2 5.811323522016194 -119.58278672446423
+ en -2056120.0157189784 -4640056.517556685
+ ll2 5.81132352201618 -119.58278672446423
EPSG:32121
ll -6.393733159913311 -59.307644161438404
- en 6976436.017522453 -4901972.097704721
+ en 6976436.017522456 -4901972.0977047235
ll2 -6.393733159913289 -59.307644161438404
EPSG:32122
ll 84.24640553232369 -92.30996354262518
- en 406228.98865693616 5770015.478730845
+ en 406228.9886569375 5770015.478730833
ll2 84.24640553232368 -92.30996354262518
EPSG:32123
ll 84.14024069401984 -67.5167966398644
- en 913922.4027810029 6058376.79085056
- ll2 84.14024069401982 -67.5167966398644
+ en 913922.402781002 6058376.790850552
+ ll2 84.14024069401985 -67.5167966398644
EPSG:32124
ll 78.88017737933502 -155.39090722455012
- en -1239530.3672114639 6123555.765381101
+ en -1239530.367211447 6123555.765381081
ll2 78.88017737933502 -155.39090722455012
EPSG:32125
ll 6.718456510253169 -141.52638442945153
@@ -7202,19 +7202,19 @@ EPSG:32125
ll2 6.718456510253185 -141.52638442945153
EPSG:32126
ll 63.068643576502055 -80.22019633740774
- en 4566650.213247963 2721742.343292896
- ll2 63.068643576502 -80.22019633740774
+ en 4566650.213247961 2721742.3432928976
+ ll2 63.06864357650202 -80.22019633740774
EPSG:32127
ll 27.701124954207728 -176.24630495829368
- en -3777309.8918647096 255237.60139344106
- ll2 27.701124954207753 -176.24630495829368
+ en -3777309.8918647114 255237.60139344248
+ ll2 27.70112495420775 -176.2463049582937
EPSG:32128
ll 52.89541753290591 1.2385112011631918
en 5309144.5032887 3733670.026927582
ll2 52.89541753290592 1.2385112011631918
EPSG:32129
ll 85.22446161111813 -68.63928464140778
- en 762398.3512347464 6046634.55953297
+ en 762398.3512347488 6046634.559533003
ll2 85.22446161111812 -68.63928464140778
EPSG:3213
ll -23.864769230805706 0.5845554454316222
@@ -7223,14 +7223,14 @@ EPSG:3213
EPSG:32130
ll 77.19400500155612 -80.12146778377148
en -112679.16120189757 4037634.153514804
- ll2 77.19400499813862 -80.12146753808078
+ ll2 77.19400499813861 -80.12146753808078
EPSG:32133
ll 55.84917389585907 -146.16663495937755
- en -3546594.9082063846 4092550.7282016063
- ll2 55.8491738958591 -146.16663495937755
+ en -3546594.9082063828 4092550.7282016096
+ ll2 55.849173895859124 -146.16663495937755
EPSG:32134
ll 40.21542918669114 -30.510009047345562
- en 5832977.78465122 1992336.0368009885
+ en 5832977.784651223 1992336.0368009785
ll2 40.21542918669119 -30.510009047345562
EPSG:32135
ll -1.7938843612963637 -21.615569458567478
@@ -7250,16 +7250,16 @@ EPSG:32138
ll2 8.460538745620715 -42.53310986065062
EPSG:32139
ll 23.183383928931903 -105.35576480650263
- en 181350.31364033214 2290859.029581775
- ll2 23.1833839289319 -105.35576480650263
+ en 181350.31364033214 2290859.0295817736
+ ll2 23.183383928931896 -105.35576480650263
EPSG:3214
ll -73.50337408132764 68.26882399495472
- en -681711.3446474816 1887918.7399484308
+ en -681711.344647481 1887918.7399484287
ll2 -73.5033740813276 68.26882399495472
EPSG:32140
ll 19.281838590843385 -60.053295501996146
- en 4678373.329737075 3732884.9309929432
- ll2 19.281838590843414 -60.05329550199617
+ en 4678373.329737077 3732884.9309929432
+ ll2 19.2818385908434 -60.05329550199614
EPSG:32141
ll 68.12884833493115 -118.88172741545495
en -894263.504945497 1.0342120668600246E7
@@ -7270,8 +7270,8 @@ EPSG:32142
ll2 73.47123261571319 -115.76652740560617
EPSG:32143
ll 14.752551843942328 -144.1444846300601
- en -3254835.6122511546 -4855.983253135346
- ll2 14.752551843942346 -144.1444846300601
+ en -3254835.6122511546 -4855.983253133949
+ ll2 14.752551843942358 -144.1444846300601
EPSG:32144
ll 72.54988667794402 -111.78958413565135
en 487458.52463990037 7311325.231736523
@@ -7279,42 +7279,42 @@ EPSG:32144
EPSG:32145
ll -57.21096521747644 -64.07987080787352
en 1008030.7342186201 -1.1081660775879478E7
- ll2 -57.210965187990794 -64.07987093746121
+ ll2 -57.21096518799078 -64.07987093746121
EPSG:32146
ll 85.32993848446742 -3.823428569750064
- en 4747045.024762954 8921331.662519054
+ en 4747045.024762954 8921331.662519053
ll2 85.3299384844674 -3.823428569750064
EPSG:32147
ll 50.1859088797452 -129.74923516710192
- en -77556.6018054327 3547156.0433117957
- ll2 50.18590887974523 -129.74923516710192
+ en -77556.60180544248 3547156.04331179
+ ll2 50.1859088797452 -129.74923516710192
EPSG:32148
ll 32.836149145749566 -101.02439908660268
en 2395384.7484478867 -1346339.0444642166
ll2 32.83614914574979 -101.02439908660268
EPSG:32149
ll 41.345115027008326 -136.54126349071402
- en -838627.42998281 -307241.2372748449
- ll2 41.345115027008376 -136.54126349071402
+ en -838627.4299828096 -307241.23727484414
+ ll2 41.3451150270084 -136.54126349071402
EPSG:3215
ll -35.40635610799692 53.71400512384976
- en -4447139.463332412 4586615.810157276
- ll2 -35.40635610799691 53.71400512384976
+ en -4447139.463332411 4586615.810157275
+ ll2 -35.40635610799692 53.71400512384977
EPSG:32150
ll 56.41862304178528 -47.53627117353135
- en 2626076.6777242403 2385638.767126561
- ll2 56.41862304178532 -47.53627117353136
+ en 2626076.677724243 2385638.7671265607
+ ll2 56.41862304178532 -47.53627117353135
EPSG:32151
ll 53.96309910662908 -9.732689229515785
en 5009912.071787846 3693444.92318399
- ll2 53.96309910662911 -9.732689229515785
+ ll2 53.9630991066291 -9.732689229515785
EPSG:32152
ll -1.8947532789044494 -9.247883426664373
- en 1.086489611750697E7 -106631.42294820119
- ll2 -1.8947532789043917 -9.247883426664373
+ en 1.0864896117506985E7 -106631.42294817569
+ ll2 -1.8947532789044172 -9.247883426664373
EPSG:32153
ll -8.035437141913349E-4 -149.3713938513742
- en -7335234.912779008 -2314770.2571199797
+ en -7335234.912779002 -2314770.257119984
ll2 -8.035437141634177E-4 -149.3713938513742
EPSG:32154
ll 17.261977351199036 -106.6724453175491
@@ -7322,8 +7322,8 @@ EPSG:32154
ll2 17.26197735119905 -106.6724453175491
EPSG:32155
ll -73.91176421602708 -100.58987720684794
- en 341489.37170385127 -1.2695165118950034E7
- ll2 -73.91176421581245 -100.58987720761424
+ en 341489.3717038514 -1.2695165118950032E7
+ ll2 -73.91176421581244 -100.58987720761424
EPSG:32156
ll -71.97944035500473 -105.82351637727578
en 452144.43445060606 -1.237475763376128E7
@@ -7338,12 +7338,12 @@ EPSG:32158
ll2 4.29382916798915 -108.2716648829312
EPSG:3216
ll -6.714628610408042 167.72790766012298
- en 7914110.49256558 6858478.980283788
+ en 7914110.49256558 6858478.9802837875
ll2 -6.7146286104080035 167.72790766012298
EPSG:32161
ll 67.98791224862165 -141.50288139255298
- en -4924194.241609927 7820324.343475915
- ll2 67.98791224862163 -141.50288139255298
+ en -4924194.241609871 7820324.3434759015
+ ll2 67.98791224862165 -141.50288139255298
EPSG:32164
ll -28.774872343707706 -91.10813314595086
en 4172048.9711260437 -1.0527306086219631E7
@@ -7351,7 +7351,7 @@ EPSG:32164
EPSG:32165
ll -23.17127565354822 -102.73099700341784
en -1638192.0100839771 -8517345.08154885
- ll2 -23.171275635467726 -102.73099699196146
+ ll2 -23.171275635467723 -102.73099699196146
EPSG:32166
ll -21.762724209111795 -77.39407099085784
en 4910031.314343564 -7997819.004195921
@@ -7359,15 +7359,15 @@ EPSG:32166
EPSG:32167
ll -26.42004513816221 -88.02353851807332
en -660918.8030795753 -9650228.853372455
- ll2 -26.420045135184917 -88.02353852231268
+ ll2 -26.42004513518492 -88.02353852231268
EPSG:3217
ll -74.34720805413151 109.62575332486874
en -493583.5522318269 1847239.481731895
ll2 -74.3472080541315 109.62575332486874
EPSG:3218
ll -48.25500426191545 96.02159204859593
- en -3009657.281033817 3803693.8017702634
- ll2 -48.25500426191535 96.02159204859593
+ en -3009657.2810338177 3803693.8017702624
+ ll2 -48.255004261915346 96.02159204859592
EPSG:32181
ll 81.08780063330053 -46.24291032021104
en 421443.72491110663 9012510.13609463
@@ -7375,7 +7375,7 @@ EPSG:32181
EPSG:32182
ll -49.49828843939052 -47.069133773983
en 951262.3619318248 -5522950.7896167515
- ll2 -49.49828839657964 -47.069133929252345
+ ll2 -49.49828839657963 -47.069133929252345
EPSG:32183
ll -77.37238167462709 -66.9466461640749
en 99280.47826113974 -8605718.169954268
@@ -7383,27 +7383,27 @@ EPSG:32183
EPSG:32184
ll -72.52026360371245 -51.739734324673364
en 630819.6265141526 -8075942.242180465
- ll2 -72.52026358740814 -51.73973503981085
+ ll2 -72.52026358740815 -51.73973503981085
EPSG:32185
ll 50.850674492907274 -56.40842218030715
en 874186.1365329361 5666183.599446832
- ll2 50.85067446792817 -56.408422246958374
+ ll2 50.85067446792818 -56.408422246958374
EPSG:32186
ll 2.723320483968479 -61.04500504742545
en 1024015.2664794605 303032.50505850813
ll2 2.7233204837237737 -61.045005056341594
EPSG:32187
ll 16.81024880978275 -79.76492773737574
- en -686296.2977453397 1882442.444061483
- ll2 16.810248797794507 -79.76492770951646
+ en -686296.2977453397 1882442.4440614835
+ ll2 16.81024879779451 -79.76492770951646
EPSG:32188
ll 17.89981968500507 -69.91257369908901
- en 685105.1926528213 1983358.7422801082
- ll2 17.899819684979654 -69.91257369911936
+ en 685105.1926528214 1983358.7422801084
+ ll2 17.899819684979658 -69.91257369911936
EPSG:32189
ll -39.49605539670196 -73.9537001063012
en 523820.35669366166 -4376235.323447454
- ll2 -39.4960553966839 -73.95370010628245
+ ll2 -39.49605539668391 -73.95370010628245
EPSG:3219
ll -65.85957793908142 178.3924532110131
en 1252070.7973834586 2573946.050891125
@@ -7411,27 +7411,27 @@ EPSG:3219
EPSG:32190
ll 62.117290377871285 -83.33003285416139
en 104988.70299190484 6895219.74015447
- ll2 62.11729037763504 -83.33003285404878
+ ll2 62.117290377635044 -83.33003285404878
EPSG:32191
ll -62.994701769153785 -89.02796533572726
en -25595.939182991977 -7003890.438614156
ll2 -62.99470176381487 -89.02796532039564
EPSG:32192
ll -32.814042172863424 -89.26771746964647
- en -470498.47119902633 -3662203.6107639316
+ en -470498.47119902656 -3662203.6107639316
ll2 -32.81404216053253 -89.26771746700376
EPSG:32193
ll 43.46085684552361 -87.0640282267329
- en 56849.82233969687 4818001.067166417
+ en 56849.82233969684 4818001.067166417
ll2 43.46085684545703 -87.06402822677134
EPSG:32194
ll -48.81494182726456 -88.58285948749466
en 188564.42153954902 -5409715.261873965
- ll2 -48.81494182726308 -88.58285948749555
+ ll2 -48.814941827263084 -88.58285948749555
EPSG:32195
ll 40.88298038795631 -80.4652498791284
en 1108870.4342245935 4571134.098938981
- ll2 40.88298034266205 -80.46525002574054
+ ll2 40.88298034266206 -80.46525002574054
EPSG:32196
ll 40.16717231935655 -93.63171533429717
en 250992.36676791921 4447837.742247884
@@ -7446,168 +7446,168 @@ EPSG:32198
ll2 65.43153564894902 -41.471863889985045
EPSG:32199
ll 39.30596943899816 -175.78895335712394
- en -5916603.755438562 3946559.759439242
+ en -5916603.755438563 3946559.759439242
ll2 39.30596943899821 -175.78895335712394
EPSG:3220
ll -44.92202186597701 125.798298059721
en -2859248.3236974883 4390280.718304719
- ll2 -44.922021865976824 125.79829805972102
+ ll2 -44.92202186597682 125.79829805972102
EPSG:32201
ll 16.437540465657094 -175.20639733341002
- en 691487.1833723694 1818178.0087375478
- ll2 16.437540465539275 -175.20639733344697
+ en 691487.1833723725 1818178.0087375478
+ ll2 16.437540465539268 -175.2063973334468
EPSG:32202
ll -18.182594407983316 -169.60623402836654
- en 647390.5461653414 -2010950.335345117
- ll2 -18.18259440784845 -169.60623402840176
+ en 647390.5461653444 -2010950.3353451171
+ ll2 -18.182594407848445 -169.6062340284017
EPSG:32203
ll -37.695454753219344 -165.93281300438355
- en 417749.5512819131 -4172437.726525888
- ll2 -37.69545475300309 -165.9328130044184
+ en 417749.5512819056 -4172437.726525888
+ ll2 -37.695454753003084 -165.9328130044186
EPSG:32204
ll 26.81030397492397 -149.33924638305592
en 1462800.698070427 3002259.3413065365
ll2 26.81030395501728 -149.33924639472028
EPSG:32205
ll -41.32451311568638 -150.08116860591318
- en 744270.892767521 -4578894.280458346
- ll2 -41.324513115420025 -150.08116860591284
+ en 744270.8927675188 -4578894.280458346
+ ll2 -41.32451311542003 -150.0811686059129
EPSG:32206
ll -34.17084712875298 -155.27332454485364
- en -263486.484371825 -3812192.069333242
- ll2 -34.17084711487786 -155.27332453835803
+ en -263486.48437182256 -3812192.069333241
+ ll2 -34.170847114877844 -155.27332453835803
EPSG:32207
ll -31.308402397022135 -142.81231946499386
en 327516.4552063772 -3465202.207449854
- ll2 -31.30840239681985 -142.81231946503175
+ ll2 -31.308402396819847 -142.81231946503172
EPSG:32208
ll 64.15204995321344 -134.1815243853139
- en 539807.4222562618 7114209.403579669
- ll2 64.15204995304087 -134.1815243853487
+ en 539807.4222562604 7114209.403579669
+ ll2 64.15204995304089 -134.18152438534872
EPSG:32209
ll 78.81069130391705 -124.34098638635336
- en 600821.830835773 8752865.742201656
- ll2 78.81069130374453 -124.34098638733802
+ en 600821.8308357729 8752865.742201658
+ ll2 78.81069130374455 -124.34098638733806
EPSG:3221
ll -18.677628458618003 -108.0558848608644
- en -859770.2375695828 8627215.226564858
+ en -859770.2375695829 8627215.226564858
ll2 -18.677628458617964 -108.0558848608644
EPSG:32210
ll -5.524897397663295 -114.93271672430745
- en 1396457.9746922588 -616797.1669656569
- ll2 -5.524897395355317 -114.93271676006846
+ en 1396457.9746922539 -616797.1669656567
+ ll2 -5.524897395355315 -114.9327167600685
EPSG:32211
ll -37.06896275584342 -117.4240181114848
- en 462292.8880291372 -4102609.1294729104
- ll2 -37.06896275562841 -117.42401811151963
+ en 462292.8880291347 -4102609.12947291
+ ll2 -37.06896275562841 -117.42401811151964
EPSG:32212
ll 84.97564354499687 -101.32321366299726
- en 594174.8815050023 9444951.521678431
+ en 594174.8815050024 9444951.52167843
ll2 84.9756435468589 -101.32321441194144
EPSG:32213
ll -82.32173269042161 -114.6984244620744
en 355995.90339420026 -9152849.926865097
- ll2 -82.32173269184244 -114.69842370929034
+ ll2 -82.32173269184244 -114.69842370929035
EPSG:32214
ll -56.61862466223679 -99.76927062472987
- en 452782.62089586956 -6275199.605503831
- ll2 -56.618624662033426 -99.76927062476472
+ en 452782.62089586956 -6275199.605503832
+ ll2 -56.61862466203343 -99.7692706247647
EPSG:32215
ll 63.54795640691469 -88.18621621902693
- en 739071.4813180137 7055637.794237079
+ en 739071.4813180129 7055637.79423708
ll2 63.54795640588702 -88.18621622004228
EPSG:32216
ll 57.58065593173464 -84.47092978852162
en 651204.8968052922 6384838.062855633
- ll2 57.58065593151179 -84.4709297885555
+ ll2 57.5806559315118 -84.47092978855551
EPSG:32217
ll -68.4911606727365 -88.90752218476702
- en 177193.25739455986 -7618391.973189644
- ll2 -68.49116066235429 -88.90752208631648
+ en 177193.25739455945 -7618391.973189641
+ ll2 -68.49116066235425 -88.90752208631646
EPSG:32218
ll -0.7201408430170915 -77.42871464515675
- en 229667.53620673902 -79673.76911610621
- ll2 -0.7201408430078169 -77.42871464515751
+ en 229667.53620673902 -79673.76911610622
+ ll2 -0.7201408430078172 -77.42871464515751
EPSG:32219
ll -67.50429534789723 -64.41311005662267
en 695694.1964659975 -7494840.7742494
- ll2 -67.50429534726831 -64.41311005735953
+ ll2 -67.50429534726834 -64.41311005735955
EPSG:3222
ll -27.892712956823637 -119.74143458626457
en -3449463.9034756273 6501085.034951364
- ll2 -27.892712956823623 -119.74143458626457
+ ll2 -27.892712956823626 -119.74143458626457
EPSG:32220
ll -26.700692608794157 -61.41319115608923
- en 657846.9156476761 -2954270.2062480818
- ll2 -26.700692608612545 -61.413191156123055
+ en 657846.915647674 -2954270.2062480827
+ ll2 -26.700692608612567 -61.41319115612307
EPSG:32221
ll 9.016712665691358 -62.484744222398234
- en -103722.49025789136 1001234.3195484969
- ll2 9.016712665389756 -62.484744220132384
+ en -103722.49025789462 1001234.319548497
+ ll2 9.016712665389754 -62.48474422013241
EPSG:32222
ll 58.1034082713102 -46.22405247927425
- en 781335.1164441253 6450182.335632278
- ll2 58.10340827007177 -46.22405248002787
+ en 781335.1164441248 6450182.335632278
+ ll2 58.10340827007177 -46.22405248002788
EPSG:32223
ll 42.374629418802414 -53.548255198091645
- en -204027.32124784903 4726903.261367184
- ll2 42.37462939153529 -53.54825514170145
+ en -204027.3212478502 4726903.261367184
+ ll2 42.37462939153529 -53.54825514170146
EPSG:32224
ll 53.98988328319845 -43.55924054826497
- en 201158.67597435787 5992018.486144694
- ll2 53.9898832821356 -43.559240547980856
+ en 201158.67597435747 5992018.4861446945
+ ll2 53.989883282135615 -43.55924054798086
EPSG:32225
ll 2.3882589868040327 -36.056423985020906
en 160011.1371826781 264349.5031657011
- ll2 2.3882589867875375 -36.05642398494162
+ ll2 2.388258986787538 -36.05642398494162
EPSG:32226
ll 59.84612791789786 -21.203752873872496
- en 824517.9649120441 6648482.07202815
- ll2 59.846127914609525 -21.20375287860618
+ en 824517.9649120444 6648482.072028148
+ ll2 59.84612791460951 -21.20375287860618
EPSG:32227
ll 34.74195498539032 -25.168643220212694
- en 118281.06614653562 3852344.6790839923
- ll2 34.74195498493281 -25.16864322055504
+ en 118281.06614653562 3852344.679083993
+ ll2 34.741954984932825 -25.168643220555044
EPSG:32228
ll -70.15282272473661 -24.496408403628564
- en 141430.02859981044 -7810944.576133378
- ll2 -70.15282270318177 -24.496407867534906
+ en 141430.0285998101 -7810944.576133376
+ ll2 -70.15282270318173 -24.4964078675349
EPSG:32229
ll 21.832487707036833 -12.051397375852487
en 184539.10630101396 2417407.1454725103
- ll2 21.832487706873835 -12.051397375900878
+ ll2 21.832487706873835 -12.051397375900876
EPSG:3223
ll -64.8398745740263 -4.111936121088831
- en 2718610.5131051177 1019781.5875090859
- ll2 -64.83987457402627 -4.111936121088831
+ en 2718610.5131051163 1019781.5875090854
+ ll2 -64.8398745740263 -4.111936121088831
EPSG:32230
ll 67.6835797245194 -7.5529572418802955
- en 307206.25944100606 7514674.363935595
- ll2 67.68357972391935 -7.552957241255676
+ en 307206.2594410063 7514674.363935598
+ ll2 67.68357972391938 -7.552957241255676
EPSG:32231
ll 19.612661636720134 4.66616373938983
en 674714.8315357156 2169467.2411924726
ll2 19.612661636582306 4.6661637393545226
EPSG:32232
ll -0.5833227690133782 15.504239949294252
- en 1225274.023772245 -64899.69657208516
- ll2 -0.5833227689493204 15.504239939619833
+ en 1225274.0237722453 -64899.69657208516
+ ll2 -0.5833227689493203 15.504239939619831
EPSG:32233
ll -8.190407930252931 11.949003301951368
- en 163770.15141758847 -906628.3316171345
- ll2 -8.190407930182117 11.949003302005657
+ en 163770.15141758823 -906628.3316171345
+ ll2 -8.190407930182117 11.949003302005659
EPSG:32234
ll 57.45632342564912 17.556710856456057
- en 293437.4513564962 6373414.211346235
- ll2 57.45632342529944 17.55671085644512
+ en 293437.4513564964 6373414.211346235
+ ll2 57.45632342529945 17.556710856445132
EPSG:32235
ll 4.162104980702324 32.46263919728394
- en 1107162.2481308384 462146.6037142862
- ll2 4.1621049805562675 32.46263919424347
+ en 1107162.2481308393 462146.6037142862
+ ll2 4.162104980556267 32.46263919424348
EPSG:32236
ll -76.30071091808733 40.12751719572338
- en 687990.709200946 -8480114.940427734
- ll2 -76.30071091623124 40.12751715249095
+ en 687990.7092009461 -8480114.940427732
+ ll2 -76.30071091623121 40.127517152490945
EPSG:32237
ll 81.97951538459412 44.3388454541021
en 583045.6721059398 9106373.014324471
@@ -7618,104 +7618,104 @@ EPSG:32238
ll2 54.55233494352758 40.86808131591605
EPSG:32239
ll -24.995857767269214 54.25348529241538
- en 828417.7769167665 -2768435.019550598
- ll2 -24.995857767072174 54.253485292428614
+ en 828417.7769167674 -2768435.019550598
+ ll2 -24.995857767072177 54.25348529242863
EPSG:3224
ll -30.169457983965337 15.682877277068116
en 6865972.281620124 1614982.1731012487
- ll2 -30.169457983965323 15.682877277068144
+ ll2 -30.169457983965323 15.68287727706813
EPSG:32240
ll -66.98803786952726 49.14773859098307
- en 158193.6331210257 -7451648.773861672
- ll2 -66.98803785794439 49.14773868070049
+ en 158193.63312102598 -7451648.773861674
+ ll2 -66.98803785794442 49.14773868070046
EPSG:32241
ll -18.85610936968847 58.0214343770717
en -24984.46367593913 -2092294.954820811
- ll2 -18.85610936933478 58.02143437703148
+ ll2 -18.85610936933478 58.02143437703149
EPSG:32242
ll 42.946041068351775 71.81790189769906
en 729877.6921141814 4758670.785250222
- ll2 42.94604106809267 71.81790189769058
+ ll2 42.94604106809266 71.81790189769059
EPSG:32243
ll 4.965849523211247 78.89540306744915
en 932157.7321644278 550157.784447748
- ll2 4.965849523161676 78.89540306701068
+ ll2 4.965849523161676 78.89540306701066
EPSG:32244
ll -37.47528461161858 77.09313695606849
- en 154474.84571639984 -4154775.604581325
- ll2 -37.475284611195484 77.09313695583705
+ en 154474.84571639984 -4154775.604581326
+ ll2 -37.4752846111955 77.09313695583704
EPSG:32245
ll -78.27725912611622 89.13412166334285
- en 548390.8429742759 -8690192.928306084
- ll2 -78.2772591260283 89.13412166330721
+ en 548390.8429742758 -8690192.928306086
+ ll2 -78.27725912602833 89.1341216633072
EPSG:32246
ll -56.74511541226741 95.1837944995184
- en 633544.0837277867 -6291142.960361572
- ll2 -56.745115412054496 95.18379449948482
+ en 633544.0837277859 -6291142.960361573
+ ll2 -56.74511541205451 95.18379449948479
EPSG:32247
ll -11.918024342912943 103.18678358549985
- en 956263.7549255264 -1320939.9867011472
- ll2 -11.918024342771119 103.18678358511792
+ en 956263.7549255264 -1320939.9867011474
+ ll2 -11.918024342771124 103.18678358511794
EPSG:32248
ll 84.39392762147676 109.27124595022204
- en 546540.3257752073 9373794.969708165
- ll2 84.39392762142748 109.27124594973579
+ en 546540.3257752071 9373794.969708167
+ ll2 84.39392762142751 109.27124594973579
EPSG:32249
ll -72.98780245568636 118.98497450127707
- en 760055.3649944077 -8116478.83557714
- ll2 -72.98780244962255 118.98497438537134
+ en 760055.3649944082 -8116478.83557714
+ ll2 -72.98780244962252 118.98497438537134
EPSG:3225
ll -32.54037827207683 20.4491062372945
en 3974858.698084348 5444179.2894959105
ll2 -32.54037827207684 20.449106237294494
EPSG:32250
ll -35.74544784496241 116.35269350843049
- en 441458.62422282126 -3955911.1565182093
- ll2 -35.74544784475031 116.35269350839563
+ en 441458.62422282255 -3955911.1565182093
+ ll2 -35.74544784475031 116.35269350839566
EPSG:32251
ll 60.21102490371197 125.45855624968029
- en 636228.6443899982 6677445.652257202
- ll2 60.211024903504004 125.45855624964521
+ en 636228.6443899965 6677445.652257204
+ ll2 60.21102490350403 125.4585562496452
EPSG:32252
ll -43.769997112517665 138.41672629815045
en 1258014.1463898371 -4889619.516631308
- ll2 -43.7699970636375 138.41672612772004
+ ll2 -43.76999706363749 138.41672612772
EPSG:32253
ll -53.59988076460131 132.9428566331135
en 363863.99751308 -5940974.140215163
- ll2 -53.59988076438228 132.94285663307687
+ ll2 -53.59988076438229 132.94285663307687
EPSG:32254
ll 43.4945532635202 144.71915698578607
en 800698.7418582567 4822453.581761282
- ll2 43.494553263087525 144.71915698584485
+ ll2 43.494553263087504 144.71915698584482
EPSG:32255
ll 14.930344039713987 151.09623483108933
- en 940829.3917979626 1654681.747744561
- ll2 14.930344039556626 151.09623483087552
+ en 940829.3917979626 1654681.7477445605
+ ll2 14.930344039556621 151.0962348308755
EPSG:32256
ll 87.78021155033701 150.53458017425464
- en 489340.9462588148 9750354.487583527
- ll2 87.78021155032009 150.5345801742231
+ en 489340.94625881483 9750354.48758353
+ ll2 87.7802115503201 150.5345801742231
EPSG:32257
ll 61.01758350259087 157.99333156377233
- en 445576.74420378916 6765159.950234083
+ en 445576.7442037907 6765159.950234083
ll2 61.01758350240424 157.9933315637375
EPSG:32258
ll -84.78988461610956 173.32035577322037
- en 584062.2423953131 -9422362.180543544
- ll2 -84.78988461632593 173.3203555841243
+ en 584062.2423953147 -9422362.180543544
+ ll2 -84.78988461632593 173.32035558412454
EPSG:32259
ll -69.46449659151952 169.82123411763783
en 453848.9983434123 -7706600.911455938
- ll2 -69.46449659137511 169.82123411760315
+ ll2 -69.4644965913751 169.821234117603
EPSG:3226
ll -87.48491013185293 -63.12814977325898
- en -264804.55265691597 194605.3364156448
- ll2 -87.48491013185294 -63.12814977325898
+ en -264804.55265691597 194605.33641564474
+ ll2 -87.48491013185294 -63.12814977325899
EPSG:32260
ll -51.396046785821774 175.92624454660768
- en 425288.5772931582 -5694416.540577727
- ll2 -51.39604678560522 175.92624454657252
+ en 425288.5772931582 -5694416.540577728
+ ll2 -51.39604678560523 175.9262445465725
EPSG:3227
ll -86.20171091993228 -13.652904674184967
en -153395.35383949522 459266.3436588872
@@ -7730,44 +7730,44 @@ EPSG:3229
ll2 -33.61032125236723 12.584736766754187
EPSG:3230
ll -25.602950599467114 0.9019769821862411
- en -4790046.221644899 5995447.383147743
+ en -4790046.2216449 5995447.383147743
ll2 -25.6029505994671 0.9019769821862411
EPSG:32301
ll 10.201345090917684 -172.03326498531194
en 1044620.3437232117 1.1131857656891061E7
- ll2 10.201345090710193 -172.03326498647831
+ ll2 10.201345090710193 -172.03326498647834
EPSG:32302
ll -78.76071215161693 -166.98667462752042
en 587254.2953203521 1253735.5192788094
ll2 -78.76071215149584 -166.98667462780247
EPSG:32303
ll -3.387617232317041 -173.73179730665953
- en -473736.2722012858 9621147.211545283
- ll2 -3.3876172297620726 -173.7317972395195
+ en -473736.2722012891 9621147.211545283
+ ll2 -3.3876172297620726 -173.73179723951947
EPSG:32304
ll 70.04668694478633 -158.11379627981026
- en 533744.9551770561 1.7771320939728152E7
- ll2 70.04668694464561 -158.1137962798451
+ en 533744.9551770561 1.777132093972815E7
+ ll2 70.04668694464556 -158.11379627984508
EPSG:32305
ll 22.877126477297153 -151.5355916214446
- en 650205.9977806439 1.253065913426925E7
- ll2 22.877126477140507 -151.53559162147923
+ en 650205.9977806408 1.253065913426925E7
+ ll2 22.87712647714051 -151.53559162147928
EPSG:32306
ll -7.72508847225447 -147.90083043992
en 400642.94898168114 9145984.638426231
- ll2 -7.725088472191857 -147.90083043995463
+ ll2 -7.725088472191857 -147.9008304399546
EPSG:32307
ll -41.94249574927818 -146.47181706213337
- en 46342.9502409494 5342103.854447052
- ll2 -41.94249574706525 -146.47181706233042
+ en 46342.950240949285 5342103.854447052
+ ll2 -41.94249574706525 -146.47181706233044
EPSG:32308
ll -49.08839124798439 -135.2350132490535
- en 482829.7611850612 4562690.203178985
- ll2 -49.0883912477645 -135.23501324908833
+ en 482829.7611850612 4562690.203178983
+ ll2 -49.08839124776451 -135.23501324908833
EPSG:32309
ll 30.976070801337812 -131.37379362258133
en 273281.26802365604 1.342936329079016E7
- ll2 30.976070801136213 -131.37379362262917
+ ll2 30.976070801136217 -131.3737936226292
EPSG:3231
ll -66.71112978701595 136.6567566669696
en 2632381.690970136 574963.4714318267
@@ -7779,75 +7779,75 @@ EPSG:32310
EPSG:32311
ll 81.51528138960927 -115.51493911072576
en 524457.013543181 1.9051031816948272E7
- ll2 81.51528138954546 -115.51493911076065
+ ll2 81.51528138954545 -115.51493911076065
EPSG:32312
ll 17.088528545166668 -105.34317587934783
- en 1102646.5038711964 1.1898105737765707E7
- ll2 17.0885285445946 -105.3431758798502
+ en 1102646.5038711978 1.1898105737765707E7
+ ll2 17.088528544594602 -105.3431758798502
EPSG:32313
ll 47.52166202104431 -97.74080070163711
- en 1046348.6215875727 1.5288724006006997E7
- ll2 47.521662008085165 -97.74080072003596
+ en 1046348.6215875725 1.5288724006006997E7
+ ll2 47.52166200808517 -97.74080072003599
EPSG:32314
ll -60.438518108880174 -94.65608638499688
- en 738953.4491060026 3291865.828072965
- ll2 -60.43851810814751 -94.65608638536747
+ en 738953.4491060018 3291865.828072965
+ ll2 -60.43851810814751 -94.65608638536752
EPSG:32315
ll 8.671296062594806 -85.22099619064905
- en 1358299.2993717436 1.0967332081005957E7
- ll2 8.671296059997886 -85.22099621349481
+ en 1358299.2993717422 1.0967332081005957E7
+ ll2 8.671296059997887 -85.22099621349481
EPSG:32316
ll -63.73084279843762 -78.27575103421663
- en 929797.9259929078 2903557.0703444025
- ll2 -63.73084277178274 -78.27575125148469
+ en 929797.925992907 2903557.0703444015
+ ll2 -63.73084277178274 -78.2757512514847
EPSG:32317
ll 35.03587703733527 -82.3726525386223
- en 374779.7127928843 1.3877878126820942E7
- ll2 35.0358770371283 -82.37265253865787
+ en 374779.7127928843 1.3877878126820944E7
+ ll2 35.035877037128316 -82.37265253865789
EPSG:32318
ll -53.9451840444566 -67.03811523316021
- en 1022052.4900627991 3993171.909795142
- ll2 -53.945184021517726 -67.03811530082095
+ en 1022052.4900627991 3993171.9097951427
+ ll2 -53.94518402151771 -67.03811530082093
EPSG:32319
ll 69.69693391978558 -59.819462588952995
- en 854353.8639265741 1.7758768471364904E7
- ll2 69.69693390023012 -59.81946297970402
+ en 854353.863926574 1.7758768471364904E7
+ ll2 69.69693390023014 -59.81946297970402
EPSG:3232
ll -75.44988223039368 22.72997171715415
en -1119825.0238241374 1303562.7681734231
ll2 -75.44988223039368 22.72997171715415
EPSG:32320
ll -25.339337229786466 -70.74983969670456
- en -281406.641715745 7174763.801158652
- ll2 -25.339337224570826 -70.74983970217085
+ en -281406.6417157465 7174763.801158651
+ ll2 -25.33933722457084 -70.74983970217087
EPSG:32321
ll -80.72780126700127 -48.0135092320875
en 661017.405805712 1024691.6336327177
- ll2 -80.72780126635261 -48.01350960310528
+ ll2 -80.72780126635261 -48.01350960310527
EPSG:32322
ll 26.679542761976478 -54.87621188891377
- en 114144.5895235812 1.2956804006313823E7
- ll2 26.679542761718995 -54.876211889116526
+ en 114144.58952358109 1.2956804006313823E7
+ ll2 26.679542761719 -54.876211889116526
EPSG:32323
ll 16.363670129185806 -50.04875098246764
en -39794.1434761578 1.1815871401037384E7
ll2 16.363670128861443 -50.048750982153805
EPSG:32324
ll -77.85847899767823 -44.05736080316973
- en 381393.3944349801 1352304.5583560765
- ll2 -77.85847899740689 -44.057360801230054
+ en 381393.39443498006 1352304.5583560746
+ ll2 -77.85847899740693 -44.05736080123006
EPSG:32325
ll -34.12279345544742 -29.643953516267565
- en 809528.6409928501 6219137.711704273
- ll2 -34.12279345517416 -29.643953516207677
+ en 809528.6409928508 6219137.711704271
+ ll2 -34.12279345517418 -29.643953516207677
EPSG:32326
ll 23.17577764211235 -18.782398554706393
en 1343049.9005175265 1.2586877860448945E7
ll2 23.175777635490547 -18.78239855078002
EPSG:32327
ll -54.34258101050022 -14.84486230579175
- en 899888.871177274 3960880.379104755
- ll2 -54.3425810052301 -14.84486231210725
+ en 899888.8711772742 3960880.379104755
+ ll2 -54.342581005230095 -14.84486231210725
EPSG:32328
ll 80.73744037122472 -9.226722323904948
en 603573.1136784692 1.896904836822315E7
@@ -7855,7 +7855,7 @@ EPSG:32328
EPSG:32329
ll 34.41826485199198 0.23234208804298362
en 1349700.7033663308 1.384742365050891E7
- ll2 34.41826482646444 0.2323420482911375
+ ll2 34.41826482646444 0.23234204829113747
EPSG:3233
ll -29.89403403339982 -2.5543179933081275
en -6870481.279948504 1750860.0916699537
@@ -7863,51 +7863,51 @@ EPSG:3233
EPSG:32330
ll 24.605158143811167 -10.457275047941334
en -256317.87307414447 1.2741795061456615E7
- ll2 24.60515813982612 -10.457275052557486
+ ll2 24.60515813982612 -10.457275052557485
EPSG:32331
ll 75.62212824204747 1.216179915748775
- en 450557.8557871714 1.8393763902640074E7
- ll2 75.62212824194158 1.2161799157141107
+ en 450557.85578717146 1.839376390264008E7
+ ll2 75.62212824194161 1.2161799157141095
EPSG:32332
ll 53.89525759075258 7.113027612597596
en 375996.2181078495 1.5973513767894007E7
- ll2 53.89525759053847 7.113027612561596
+ ll2 53.895257590538456 7.113027612561597
EPSG:32333
ll 49.13272162013541 5.662080232336533
en -180751.14729456545 1.5484330494036723E7
- ll2 49.132721565634384 5.662080463184227
+ ll2 49.13272156563438 5.662080463184228
EPSG:32334
ll -63.833395325860344 17.321384723689235
- en 319069.0048430127 2916335.3077841857
- ll2 -63.83339532551791 17.32138472373843
+ en 319069.0048430126 2916335.3077841876
+ ll2 -63.83339532551788 17.321384723738426
EPSG:32335
ll 88.4134834760695 33.92354129069377
en 521349.33705309127 1.982211984699144E7
- ll2 88.41348347608209 33.923541254599
+ ll2 88.41348347608208 33.923541254598994
EPSG:32336
ll 11.69260063817488 24.67764040053431
en -409955.294398597 1.1306021192719722E7
ll2 11.692600633146334 24.67764042772445
EPSG:32337
ll -81.03104244474338 34.58600104883396
- en 423245.6938437972 1000410.632299168
- ll2 -81.03104244464176 34.58600104939399
+ en 423245.6938437973 1000410.6322991662
+ ll2 -81.03104244464178 34.58600104939399
EPSG:32338
ll 75.86905638423497 45.7513591090763
- en 520471.6746402453 1.8420700842393678E7
- ll2 75.86905638413134 45.75135910904146
+ en 520471.67464024556 1.8420700842393678E7
+ ll2 75.86905638413134 45.75135910904148
EPSG:32339
ll -34.34069175435221 51.446613703150504
- en 541064.3909644351 6199974.958603574
- ll2 -34.340691754143656 51.44661370311568
+ en 541064.3909644358 6199974.958603574
+ ll2 -34.34069175414366 51.44661370311568
EPSG:3234
ll -64.4411493208393 149.03591166668178
- en 2429129.4927544473 1670703.2321914793
- ll2 -64.4411493208393 149.03591166668178
+ en 2429129.4927544463 1670703.2321914784
+ ll2 -64.44114932083929 149.03591166668178
EPSG:32340
ll 50.74838505076565 48.83095791241072
- en -75930.7078027263 1.5653732264622072E7
- ll2 50.74838502419916 48.830957984832146
+ en -75930.70780272479 1.5653732264622074E7
+ ll2 50.748385024199166 48.83095798483217
EPSG:32341
ll -53.875873460055175 72.48873425709337
en 1122941.2652314575 3988460.528229582
@@ -7915,227 +7915,227 @@ EPSG:32341
EPSG:32342
ll 20.10748033974211 75.2332849949542
en 1152564.1021156623 1.2235606860430285E7
- ll2 20.10748033863023 75.23328499547677
+ ll2 20.107480338630232 75.23328499547675
EPSG:32343
ll 32.49718274520407 72.32289953307833
- en 248454.10134125763 1.3598700764471062E7
- ll2 32.49718274499034 72.32289953301691
+ en 248454.10134125766 1.3598700764471063E7
+ ll2 32.497182744990354 72.32289953301691
EPSG:32344
ll 23.98164511111986 79.08950346905267
en 305613.852156835 1.2653507119079646E7
- ll2 23.981645110956517 79.08950346901628
+ ll2 23.981645110956514 79.08950346901628
EPSG:32345
ll -18.018772535859654 79.48237179091487
- en -297631.47598118626 7991480.626044711
- ll2 -18.01877253267676 79.48237179334203
+ en -297631.47598118463 7991480.62604471
+ ll2 -18.01877253267677 79.48237179334203
EPSG:32346
ll 88.58866591779028 92.23039110858727
- en 497883.28472379455 1.98404019695697E7
- ll2 88.58866591777954 92.23039110855247
+ en 497883.2847237945 1.9840401969569698E7
+ ll2 88.58866591777952 92.2303911085525
EPSG:32347
ll 71.28632330966201 101.11980001338999
en 575888.7743296688 1.791065672091E7
- ll2 71.28632330952564 101.11980001335449
+ ll2 71.28632330952564 101.11980001335448
EPSG:32348
ll 35.30919915716942 108.92579870476236
- en 856962.2638110588 1.3914402630808756E7
- ll2 35.30919915677885 108.92579870494689
+ en 856962.2638110602 1.3914402630808756E7
+ ll2 35.30919915677886 108.92579870494691
EPSG:32349
ll 75.89597933583363 104.50291904154456
- en 323598.5399102075 1.8433286760239944E7
- ll2 75.89597933457638 104.50291906009991
+ en 323598.5399102082 1.8433286760239944E7
+ ll2 75.89597933457638 104.50291906009993
EPSG:3235
ll -77.8786923971827 20.413971853334125
en -1406395.3243985819 333164.3933478491
- ll2 -77.87869239718269 20.413971853334118
+ ll2 -77.87869239718269 20.413971853334104
EPSG:32350
ll -77.35907593951951 119.1106910555281
- en 551548.6024866294 1412231.2836164963
- ll2 -77.359075939425 119.1106910554925
+ en 551548.6024866293 1412231.2836164925
+ ll2 -77.35907593942504 119.1106910554925
EPSG:32351
ll -70.58190379125884 116.46276664943045
- en 257840.7173184834 2156186.699154593
- ll2 -70.58190378836812 116.46276666762617
+ en 257840.7173184829 2156186.699154593
+ ll2 -70.5819037883681 116.46276666762614
EPSG:32352
ll -5.908396803522976 128.3820247064776
en 431579.3792274307 9346879.169843292
- ll2 -5.908396803473952 128.3820247064428
+ ll2 -5.908396803473951 128.3820247064428
EPSG:32353
ll -5.4042833959554315 131.6100351576005
- en 124213.60401799082 9401594.257608823
- ll2 -5.404283395903704 131.61003515774914
+ en 124213.60401799716 9401594.257608823
+ ll2 -5.404283395903706 131.61003515774922
EPSG:32354
ll 8.158662121054078 144.72119763439375
en 910174.4843880202 1.0903725719117004E7
- ll2 8.158662120978262 144.72119763409646
+ ll2 8.15866212097826 144.72119763409646
EPSG:32355
ll 63.01659767276692 144.86929321129688
- en 392142.3343478769 1.6989221911813587E7
- ll2 63.01659767258237 144.86929321126212
+ en 392142.33434787975 1.698922191181359E7
+ ll2 63.0165976725824 144.86929321126217
EPSG:32356
ll 82.09148658301928 149.03988513489492
- en 439212.72695171053 1.9117119738284126E7
- ll2 82.09148658294711 149.0398851350853
+ en 439212.72695171117 1.9117119738284133E7
+ ll2 82.09148658294717 149.0398851350853
EPSG:32357
ll 51.27939029610849 156.8306244959707
- en 348688.88581179775 1.5683125890053265E7
- ll2 51.27939029588336 156.83062449593262
+ en 348688.88581179973 1.5683125890053265E7
+ ll2 51.27939029588335 156.83062449593268
EPSG:32358
ll -3.509329738023254 164.41649157601023
en 435172.8732758625 9612084.175083837
- ll2 -3.50932973799253 164.41649157597544
+ ll2 -3.50932973799253 164.4164915759754
EPSG:32359
ll 3.194799709131644 175.70182299819425
- en 1022957.7632228122 1.035431826918909E7
- ll2 3.194799709077038 175.7018229968984
+ en 1022957.7632228155 1.035431826918909E7
+ ll2 3.194799709077038 175.70182299689858
EPSG:3236
ll -57.399566598876504 114.91330219016548
- en 56051.66023812171 3741441.328615873
- ll2 -57.39956659887648 114.91330219016548
+ en 56051.66023812171 3741441.3286158717
+ ll2 -57.3995665988765 114.91330219016548
EPSG:32360
ll -16.385059665945036 169.356596536243
- en -318267.1575982884 8173004.056697729
- ll2 -16.385059662573756 169.3565965420182
+ en -318267.15759828535 8173004.05669773
+ ll2 -16.38505966257375 169.35659654201814
EPSG:3237
ll -76.26023859941114 88.74869540439661
- en -933709.3046322367 1333081.3859083522
+ en -933709.304632237 1333081.3859083522
ll2 -76.26023859941115 88.74869540439661
EPSG:3238
ll -81.75861939259025 137.7403306095016
en -4275.998747958258 1003948.9503560105
- ll2 -81.75861939259026 137.7403306095016
+ ll2 -81.75861939259025 137.7403306095016
EPSG:3239
ll -63.054359003521455 65.71288312142221
en -3048748.720924422 580964.3796343006
- ll2 -63.05435900352144 65.7128831214222
+ ll2 -63.05435900352144 65.71288312142221
EPSG:3240
ll -15.926957040034026 100.718703754204
en -7671554.673028963 4870244.275759892
- ll2 -15.926957040033988 100.718703754204
+ ll2 -15.92695704003399 100.718703754204
EPSG:32401
ll 45.57533039608805 -177.07977613507876
en 493758.021254236 5046865.762584681
ll2 45.57533039564708 -177.07977613499293
EPSG:32402
ll -89.94958540610708 -161.8268481036446
- en 500897.30561703164 -9992405.195228228
- ll2 -89.94958540612112 -161.82684856892018
+ en 500897.3056170318 -9992405.195228226
+ ll2 -89.94958540612112 -161.82684856892075
EPSG:32403
ll 20.44093865420743 -174.3196217635097
- en -475435.9750800214 2288152.714433985
- ll2 20.440938640784815 -174.31962175240844
+ en -475435.97508002445 2288152.7144339853
+ ll2 20.440938640784815 -174.31962175240838
EPSG:32404
ll 79.43193370827723 -168.4311469193441
- en 307709.83297439857 8833774.48713422
- ll2 79.43193370680152 -168.43114634956058
+ en 307709.83297439653 8833774.487134222
+ ll2 79.43193370680154 -168.4311463495607
EPSG:32405
ll -4.89528430203103 -147.10584253157856
en 1154616.7366504653 -543971.8453592554
ll2 -4.895284301713712 -147.1058425361648
EPSG:32406
ll -88.97099553679607 -149.96019072995034
- en 494066.83665553294 -9883227.814728372
- ll2 -88.97099553677994 -149.96019072984765
+ en 494066.8366555329 -9883227.814728372
+ ll2 -88.97099553677994 -149.96019072984768
EPSG:32407
ll 52.68060533933709 -141.9007366534638
- en 439091.47290907777 5837119.370041289
- ll2 52.680605338911356 -141.9007366533779
+ en 439091.47290907777 5837119.37004129
+ ll2 52.68060533891135 -141.9007366533779
EPSG:32408
ll 7.9104794649145305 -133.47625612259074
- en 667945.9653416214 874706.4344674886
- ll2 7.910479464803653 -133.4762561225073
+ en 667945.9653416214 874706.4344674888
+ ll2 7.910479464803656 -133.47625612250727
EPSG:32409
ll -18.356881322270397 -128.1345083133151
- en 591416.0211523444 -2029888.7974983722
+ en 591416.0211523444 -2029888.7974983726
ll2 -18.356881321990105 -128.1345083132292
EPSG:3241
ll -33.760220950990444 165.2245452851041
en -944177.7006649225 6514300.0375678595
- ll2 -33.76022095099042 165.2245452851041
+ ll2 -33.76022095099043 165.2245452851041
EPSG:32410
ll -47.693173799748166 -122.78293897656056
- en 516270.5736391133 -5282221.091992813
- ll2 -47.69317379929418 -122.78293897647461
+ en 516270.5736391112 -5282221.091992812
+ ll2 -47.69317379929417 -122.78293897647465
EPSG:32411
ll -28.01125339992859 -114.05841450647328
- en 789243.2018716942 -3101938.463288399
- ll2 -28.01125339952744 -114.05841450635042
+ en 789243.2018716928 -3101938.463288398
+ ll2 -28.011253399527423 -114.05841450635045
EPSG:32412
ll -19.603789209544317 -115.55033658613439
- en 22416.16024362488 -2174011.2806965755
- ll2 -19.603789209122223 -115.550336586097
+ en 22416.160243623483 -2174011.280696576
+ ll2 -19.603789209122233 -115.55033658609703
EPSG:32413
ll 25.43849648223457 -95.90946849643534
- en 1416457.3866691208 2844904.252165376
- ll2 25.43849646878569 -95.90946849497769
+ en 1416457.3866691175 2844904.252165376
+ ll2 25.438496468785686 -95.90946849497773
EPSG:32414
ll 45.255237179734365 -107.94604869345612
- en -201934.3426725394 5050382.937402415
- ll2 45.25523714026466 -107.94604857624965
+ en -201934.34267253708 5050382.937402415
+ ll2 45.25523714026467 -107.94604857624961
EPSG:32415
ll -39.04320506465204 -91.43274609434913
- en 635612.5874414071 -4322739.553899801
+ en 635612.5874414071 -4322739.553899802
ll2 -39.04320506420288 -91.43274609426173
EPSG:32416
ll 64.17194372250248 -78.31448176361809
- en 921197.7214995695 7144982.730764789
- ll2 64.17194369710006 -78.31448197434142
+ en 921197.7214995688 7144982.730764789
+ ll2 64.17194369710009 -78.31448197434143
EPSG:32417
ll -12.33090035210077 -73.70391085806277
- en 1295206.8283871394 -1374001.4928523693
- ll2 -12.330900349856366 -73.70391086778693
+ en 1295206.828387139 -1374001.4928523696
+ ll2 -12.330900349856373 -73.70391086778693
EPSG:32418
ll -1.156024815891982 -68.45277407807015
- en 1229969.3420583634 -128621.73629916526
- ll2 -1.1560248157459811 -68.45277408799986
+ en 1229969.34205836 -128621.73629916523
+ ll2 -1.1560248157459811 -68.45277408799991
EPSG:32419
ll 17.892257492759995 -65.88428998623532
- en 830145.8185343923 1981022.549215655
- ll2 17.892257492497514 -65.8842899861665
+ en 830145.8185343938 1981022.549215655
+ ll2 17.892257492497514 -65.88428998616648
EPSG:3242
ll -66.00545403233392 -75.83723033655293
- en 2624869.193267551 743736.1817683442
- ll2 -66.00545403233392 -75.83723033655295
+ en 2624869.1932675513 743736.1817683437
+ ll2 -66.0054540323339 -75.83723033655293
EPSG:32420
ll -46.256182227876685 -65.26772001770328
- en 325201.9444995709 -5125011.395973453
- ll2 -46.256182227408715 -65.26772001762414
+ en 325201.9444995698 -5125011.395973454
+ ll2 -46.25618222740872 -65.26772001762416
EPSG:32421
ll -46.512118805849795 -64.30202598478706
- en -60109.222607151256 -5176914.097268323
+ en -60109.22260715114 -5176914.097268323
ll2 -46.512118792536334 -64.30202596703725
EPSG:32422
ll 22.937315675740138 -52.81733348870054
en 313625.9399440042 2537730.435332901
- ll2 22.93731567542722 -52.81733348861538
+ ll2 22.937315675427215 -52.81733348861538
EPSG:32423
ll 82.33289827227003 -49.969227320522364
- en 426069.2737639964 9145166.387433799
+ en 426069.2737639963 9145166.387433799
ll2 82.33289827211152 -49.96922731868626
EPSG:32424
ll 19.389124072087043 -40.164333176756955
- en 377711.40370139625 2144294.2319610557
- ll2 19.38912407181621 -40.16433317667093
+ en 377711.4037013962 2144294.231961056
+ ll2 19.38912407181622 -40.16433317667093
EPSG:32425
ll -13.213049823002848 -35.79077549610243
- en 197492.47858526872 -1462382.7596774497
- ll2 -13.21304982278691 -35.79077549598278
+ en 197492.4785852664 -1462382.7596774497
+ ll2 -13.213049822786912 -35.79077549598281
EPSG:32426
ll -30.874234181449197 -29.302513879035356
- en 279850.34080951347 -3417935.5525639914
- ll2 -30.8742341810365 -29.30251387896038
+ en 279850.3408095138 -3417935.5525639923
+ ll2 -30.87423418103651 -29.302513878960372
EPSG:32427
ll 58.98178971536578 -29.15306067224181
en 32072.71937957144 6566627.931455826
- ll2 58.9817896917037 -29.153060569491007
+ ll2 58.981789691703696 -29.153060569491007
EPSG:32428
ll -2.5311307610493827 -12.849023497180156
- en 739148.9895014374 -279967.9312753659
- ll2 -2.53113076099748 -12.849023497111897
+ en 739148.9895014376 -279967.9312753658
+ ll2 -2.5311307609974794 -12.849023497111897
EPSG:32429
ll -2.432819991206827 -16.306332580536736
- en -314526.45525962627 -271116.86243973015
- ll2 -2.432819990637277 -16.306332560255914
+ en -314526.4552596258 -271116.86243973015
+ ll2 -2.432819990637277 -16.306332560255917
EPSG:3243
ll -35.00490937530264 -152.39812019228324
en -1853610.2690080921 6168365.912708329
@@ -8143,43 +8143,43 @@ EPSG:3243
EPSG:32430
ll -78.59310364719727 3.1632982102592777
en 635829.8931434095 -8731727.890868813
- ll2 -78.59310364655757 3.1632981984711117
+ ll2 -78.59310364655757 3.1632981984711113
EPSG:32431
ll 73.25162318408809 7.275089875089382
- en 637394.1019090142 8133457.181771229
- ll2 73.25162318368659 7.27508987476461
+ en 637394.1019090143 8133457.181771227
+ ll2 73.25162318368655 7.275089874764609
EPSG:32432
ll -17.54804916928194 1.5290805581691078
en -294761.1459052616 -1955872.4863689088
ll2 -17.54804916612757 1.5290805612709486
EPSG:32433
ll 19.963633661261085 5.5944709291116235
- en -487542.0583761431 2235305.375751764
- ll2 19.963633647155795 5.594470943893428
+ en -487542.05837614334 2235305.375751765
+ ll2 19.963633647155802 5.594470943893424
EPSG:32434
ll -7.101115433784344 18.108945378427755
- en 180592.09347718576 -785925.3907184068
- ll2 -7.101115433659005 18.10894537858517
+ en 180592.09347718576 -785925.3907184069
+ ll2 -7.1011154336590065 18.10894537858517
EPSG:32435
ll 38.67340251215134 30.538581557596423
- en 807839.1754787173 4286475.896821476
- ll2 38.67340251159826 30.538581557792998
+ en 807839.1754787161 4286475.8968214765
+ ll2 38.67340251159828 30.538581557792984
EPSG:32436
ll 2.5420401094872744 37.43958664197514
en 994002.5727092111 281821.7809102555
- ll2 2.54204010944104 37.439586641145404
+ ll2 2.54204010944104 37.43958664114541
EPSG:32437
ll -35.15474303847255 40.733521840402545
- en 657875.8724424655 -3891579.2626917986
- ll2 -35.154743038038845 40.73352184049107
+ en 657875.8724424648 -3891579.2626917986
+ ll2 -35.15474303803884 40.73352184049106
EPSG:32438
ll -16.345589075166473 46.73873709628986
en 685707.0131650477 -1807957.466154417
- ll2 -16.34558907491171 46.73873709637395
+ ll2 -16.345589074911715 46.73873709637395
EPSG:32439
ll -53.07613799766844 41.25292762894742
en -152105.41586689628 -5925268.869866593
- ll2 -53.07613792743235 41.252928049946554
+ ll2 -53.07613792743235 41.25292804994655
EPSG:3244
ll -17.007340822423913 -166.08160507301596
en -6613037.5810141405 6127054.743013464
@@ -8187,63 +8187,63 @@ EPSG:3244
EPSG:32440
ll -57.91089845443789 58.78566096521282
en 605790.1550275818 -6420185.972550557
- ll2 -57.91089845402635 58.78566096529919
+ ll2 -57.91089845402636 58.78566096529921
EPSG:32441
ll 41.51558105942863 53.662277589019126
- en -279597.46258828416 4638299.50341287
+ en -279597.46258828416 4638299.503412871
ll2 41.51558101704531 53.66227771584926
EPSG:32442
ll 33.68410683379855 73.35151949779315
- en 903464.0685378418 3735635.2727799444
- ll2 33.68410683309349 73.35151949827582
+ en 903464.0685378405 3735635.2727799457
+ ll2 33.6841068330935 73.35151949827582
EPSG:32443
ll -28.406249774744232 73.30744154850547
en 334176.2986474796 -3143372.298627694
ll2 -28.406249774356237 73.30744154858968
EPSG:32444
ll -36.18687157220985 73.08902313353326
- en -212018.41041887435 -4033806.434376156
+ en -212018.41041887435 -4033806.4343761564
ll2 -36.18687155953383 73.0890231401331
EPSG:32445
ll -66.36164103281834 77.96904746458348
- en 97056.97220695595 -7389391.057179886
+ en 97056.97220695659 -7389391.057179886
ll2 -66.36164100670162 77.96904778037187
EPSG:32446
ll -43.655751906865454 92.25259511889526
- en 439713.8139509702 -4833910.519445422
- ll2 -43.65575190640904 92.25259511898112
+ en 439713.81395097135 -4833910.519445422
+ ll2 -43.65575190640904 92.25259511898115
EPSG:32447
ll -6.652542204587647 93.40019287402397
- en -119943.16388373426 -738858.784568652
- ll2 -6.6525422042598565 93.40019287722178
+ en -119943.16388373426 -738858.7845686519
+ ll2 -6.652542204259856 93.40019287722178
EPSG:32448
ll -2.084800812421804 96.7947568862143
- en -415610.70386101934 -232833.60286161618
- ll2 -2.08480081136471 96.79475693102697
+ en -415610.703861021 -232833.60286161624
+ ll2 -2.084800811364711 96.79475693102697
EPSG:32449
ll -45.83192942468648 110.02779961174497
- en 424475.2487260812 -5075833.463410602
- ll2 -45.831929424230175 110.02779961183074
+ en 424475.24872608343 -5075833.463410602
+ ll2 -45.831929424230175 110.0277996118308
EPSG:3245
ll -65.02966305046823 -132.09054212456485
en -1496001.6766843651 2411717.727600578
- ll2 -65.02966305046823 -132.09054212456485
+ ll2 -65.02966305046822 -132.09054212456485
EPSG:32450
ll -48.73882829315523 110.33216506962872
- en 9881.497761256527 -5419907.09037628
- ll2 -48.73882828475059 110.33216507856355
+ en 9881.497761257517 -5419907.09037628
+ ll2 -48.73882828475061 110.33216507856356
EPSG:32451
ll -1.06203763016633 120.3030773398
en 199814.62012695195 -117520.0992838467
ll2 -1.0620376301373267 120.30307733994519
EPSG:32452
ll -1.9999022178769792 119.73834975021418
- en -534525.9049130328 -223989.56736503603
- ll2 -1.9999022155269681 119.73834985552685
+ en -534525.9049130327 -223989.56736503603
+ ll2 -1.9999022155269681 119.73834985552683
EPSG:32453
ll 24.258111528712433 129.9154630616427
en -16592.076075143996 2692235.4143797653
- ll2 24.258111528036284 129.91546306108074
+ ll2 24.258111528036288 129.91546306108074
EPSG:32454
ll -76.7059745694772 145.15085983385868
en 606459.1808752402 -8517715.016552849
@@ -8251,31 +8251,31 @@ EPSG:32454
EPSG:32455
ll -57.89120453671093 148.86655754170164
en 610643.2064293101 -6418123.367078563
- ll2 -57.891204536298346 148.86655754178813
+ ll2 -57.89120453629835 148.86655754178813
EPSG:32456
ll -54.296086491196256 154.8138817307107
- en 618032.7368651199 -6017981.666263482
- ll2 -54.29608649076191 154.81388173079756
+ en 618032.7368651199 -6017981.6662634825
+ ll2 -54.2960864907619 154.81388173079756
EPSG:32457
ll 79.07380154090035 162.37381270352734
- en 571346.6132842824 8780270.906479461
- ll2 79.0738015407242 162.37381270356138
+ en 571346.6132842831 8780270.906479461
+ ll2 79.0738015407242 162.37381270356136
EPSG:32458
ll -1.3808958347662355 163.35509743859026
- en 316965.94373612676 -152695.96619459218
- ll2 -1.380895834732522 163.35509743868062
+ en 316965.94373612676 -152695.9661945922
+ ll2 -1.3808958347325226 163.35509743868062
EPSG:32459
ll 69.38291795348894 162.6043410322647
- en 170950.99510998867 7719672.37108909
- ll2 69.38291794039873 162.60434120478692
+ en 170950.99510998884 7719672.3710890915
+ ll2 69.38291794039876 162.60434120478695
EPSG:3246
ll -30.79643416500293 -117.78887553480291
- en -4053660.195715801 5711029.618706463
- ll2 -30.796434165002932 -117.78887553480291
+ en -4053660.1957158013 5711029.618706463
+ ll2 -30.79643416500293 -117.78887553480291
EPSG:32460
ll -15.543424552045607 167.36211159458594
- en -537730.0909344815 -1741983.966277399
- ll2 -15.543424536449107 167.36211164453854
+ en -537730.0909344784 -1741983.9662773986
+ ll2 -15.5434245364491 167.3621116445386
EPSG:3247
ll -48.47856018638429 19.828947621137672
en 4676278.535255693 855937.0369565791
@@ -8286,36 +8286,36 @@ EPSG:3248
ll2 -59.284254610066704 -28.30496597905514
EPSG:3249
ll -27.88011819910121 3.8514247481363384
- en 1584554.642680886 7234233.913445658
- ll2 -27.880118199101204 3.8514247481363384
+ en 1584554.6426808862 7234233.913445658
+ ll2 -27.8801181991012 3.85142474813634
EPSG:3250
ll -48.63987534276478 17.397007146611216
en 664860.4534239614 4687708.73204623
ll2 -48.63987534276468 17.397007146611216
EPSG:32501
ll -19.590252755032907 -178.29680409296077
- en 363967.2444871021 7833342.864307623
- ll2 -19.590252754737396 -178.2968040928746
+ en 363967.24448710505 7833342.864307623
+ ll2 -19.590252754737396 -178.29680409287462
EPSG:32502
ll -66.39305900443732 -166.3548938240275
en 707410.8543506439 2628569.5880880384
- ll2 -66.39305900354353 -166.35489382470854
+ ll2 -66.39305900354354 -166.35489382470854
EPSG:32503
ll -13.35751485217341 -174.84183174245695
- en -570478.95065003 8501930.351199213
- ll2 -13.357514835029184 -174.8418316619569
+ en -570478.9506500242 8501930.351199213
+ ll2 -13.357514835029187 -174.84183166195675
EPSG:32504
ll -68.28141170149729 -168.11339587535255
- en 124793.68120627792 2397964.8232878745
- ll2 -68.2814116789715 -168.1133955189928
+ en 124793.68120627588 2397964.8232878726
+ ll2 -68.28141167897151 -168.11339551899286
EPSG:32505
ll -35.81032541603049 -144.5861227770609
- en 1260977.6316937865 6004259.083316972
- ll2 -35.81032539874165 -144.5861227923274
+ en 1260977.6316937811 6004259.0833169725
+ ll2 -35.81032539874164 -144.58612279232747
EPSG:32506
ll 2.1013732276383337 -145.23682442981507
- en 696072.1017072946 1.023237458692726E7
- ll2 2.1013732276172656 -145.23682442973546
+ en 696072.1017072913 1.023237458692726E7
+ ll2 2.1013732276172656 -145.2368244297355
EPSG:32507
ll -46.940033911992536 -140.75494362364873
en 518634.16371991916 4801470.896169152
@@ -8326,40 +8326,40 @@ EPSG:32508
ll2 5.668021702664737 -132.22456229019875
EPSG:32509
ll 14.127294742128072 -133.1759992421112
- en 48901.32232537796 1.1565820041843263E7
- ll2 14.127294741872278 -133.1759992417879
+ en 48901.32232538104 1.1565820041843263E7
+ ll2 14.127294741872278 -133.17599924178793
EPSG:3251
ll -41.02225218588142 -37.32856305391536
- en -4997596.286389575 2674951.7772804475
- ll2 -41.02225218588142 -37.328563053915346
+ en -4997596.286389576 2674951.7772804466
+ ll2 -41.02225218588141 -37.32856305391536
EPSG:32510
ll 54.92582322564954 -130.67591145712376
- en 8565.96495809604 1.6113543189589655E7
- ll2 54.92582320699551 -130.67591140651834
+ en 8565.964958094351 1.6113543189589657E7
+ ll2 54.925823206995524 -130.67591140651834
EPSG:32511
ll -12.543937225149165 -120.07085730710867
- en 166224.29868171772 8611352.071145479
- ll2 -12.543937224939649 -120.07085730696213
+ en 166224.29868171777 8611352.071145477
+ ll2 -12.543937224939663 -120.07085730696214
EPSG:32512
ll -16.76966708329624 -106.46193355050488
- en 984033.0896220829 8140385.315490994
+ en 984033.0896220829 8140385.315490995
ll2 -16.769667082930127 -106.46193355058377
EPSG:32513
ll 37.06348854891246 -105.88565099218283
- en 421242.86544918414 1.410227957043904E7
- ll2 37.06348854848931 -105.88565099209703
+ en 421242.86544918414 1.4102279570439039E7
+ ll2 37.06348854848928 -105.885650992097
EPSG:32514
ll -24.751064649024016 -105.53016475454012
- en -161236.84097263438 7246792.290240965
- ll2 -24.751064646969127 -105.53016475715317
+ en -161236.84097263147 7246792.290240966
+ ll2 -24.751064646969116 -105.53016475715316
EPSG:32515
ll 3.721889048065762 -89.49906990732786
en 888966.1493304684 1.0412156421211446E7
ll2 3.7218890480137214 -89.49906990747428
EPSG:32516
ll 21.05566240806027 -89.38285659813513
- en 252367.70023356075 1.2330156407950185E7
- ll2 21.055662407766846 -89.38285659805014
+ en 252367.70023356078 1.2330156407950185E7
+ ll2 21.055662407766846 -89.38285659805013
EPSG:32517
ll 51.601077544367456 -76.12426445996317
en 837580.1830736131 1.5727935914630176E7
@@ -8367,74 +8367,74 @@ EPSG:32517
EPSG:32518
ll -53.683787732775656 -75.03662605769382
en 497566.08875711076 4051659.4128966955
- ll2 -53.6837877323416 -75.03662605760792
+ ll2 -53.68378773234159 -75.0366260576079
EPSG:32519
ll -68.93785843097179 -64.84848983747308
- en 666387.8226127493 2346940.444998008
- ll2 -68.93785843044121 -64.848489837681
+ en 666387.8226127492 2346940.4449980063
+ ll2 -68.93785843044122 -64.84848983768102
EPSG:3252
ll -32.162057566071 -17.7096247585055
en -5922063.207227578 3379827.5803550268
- ll2 -32.162057566071 -17.709624758505498
+ ll2 -32.162057566071 -17.70962475850549
EPSG:32520
ll 79.18936148210082 -61.14440260966682
- en 538843.0741871976 1.8791723255030796E7
- ll2 79.1893614819383 -61.14440260958114
+ en 538843.074187198 1.8791723255030796E7
+ ll2 79.1893614819383 -61.14440260958113
EPSG:32521
ll -73.26421528723056 -66.36876295450794
- en 199987.93078362447 1846496.597202505
- ll2 -73.2642152749344 -66.36876245648975
+ en 199987.93078362412 1846496.5972025031
+ ll2 -73.26421527493441 -66.36876245648976
EPSG:32522
ll 10.681855314674152 -53.99056107659987
- en 172790.2992455464 1.1182384156824056E7
- ll2 10.681855314516618 -53.990561076448635
+ en 172790.29924554483 1.1182384156824056E7
+ ll2 10.681855314516621 -53.99056107644866
EPSG:32523
ll -78.74068140656776 -48.4389091128823
- en 425079.79579176754 1256764.130698761
- ll2 -78.74068140638019 -48.43890911273487
+ en 425079.7957917672 1256764.130698761
+ ll2 -78.74068140638018 -48.43890911273488
EPSG:32524
ll 46.8203105089888 -31.858329544694154
- en 1044659.0035199494 1.5210007875278788E7
- ll2 46.8203104971558 -31.858329559168116
+ en 1044659.0035199494 1.5210007875278786E7
+ ll2 46.820310497155795 -31.858329559168112
EPSG:32525
ll 0.34661181519304307 -24.58199789923037
en 1440081.1442880626 1.0038729161009392E7
- ll2 0.3466118149960842 -24.581997953456515
+ ll2 0.3466118149960841 -24.581997953456515
EPSG:32526
ll 46.96257518172192 -23.209111739753727
en 788374.1819641581 1.5207979658338666E7
- ll2 46.962575181014856 -23.209111739614247
+ ll2 46.962575181014856 -23.209111739614244
EPSG:32527
ll -61.597093594490296 -26.269703835454717
- en 220553.5001149429 3159387.864433893
- ll2 -61.5970935924821 -26.269703833270196
+ en 220553.50011494278 3159387.864433893
+ ll2 -61.5970935924821 -26.2697038332702
EPSG:32528
ll 54.38516654968697 -7.907547227793742
- en 960209.8192522114 1.6049579026109595E7
- ll2 54.385166537653916 -7.907547251384402
+ en 960209.8192522114 1.6049579026109597E7
+ ll2 54.38516653765393 -7.907547251384399
EPSG:32529
ll 12.072714278165748 -16.22935260984511
en -288718.09012341406 1.1345040487263713E7
- ll2 12.072714276096342 -16.229352600199896
+ ll2 12.07271427609634 -16.229352600199896
EPSG:3253
ll -57.21838892174729 87.70920366846283
- en 1501419.8956482545 3411563.774780502
- ll2 -57.21838892174728 87.70920366846283
+ en 1501419.8956482548 3411563.774780502
+ ll2 -57.21838892174727 87.70920366846283
EPSG:32530
ll 20.527270035721642 -4.463570189686866
- en 347382.97376596334 1.227051197672948E7
- ll2 20.527270035436914 -4.463570189600808
+ en 347382.97376596334 1.2270511976729482E7
+ ll2 20.527270035436928 -4.463570189600809
EPSG:32531
ll 6.296169295441061 -0.563656294630464
- en 105555.3757502085 1.0697288497193767E7
- ll2 6.296169295344495 -0.563656294312861
+ en 105555.3757502085 1.0697288497193769E7
+ ll2 6.296169295344511 -0.563656294312861
EPSG:32532
ll -79.19994021765235 -0.5871956945698944
en 300314.12369918765 1191261.0652419757
ll2 -79.19994021607779 -0.5871950342703988
EPSG:32533
ll 37.3702721435382 12.386702880904668
- en 268570.13901431055 1.4139151341270976E7
+ en 268570.13901431044 1.4139151341270976E7
ll2 37.37027214309528 12.386702880967581
EPSG:32534
ll 33.18086044148109 23.368746327276902
@@ -8442,20 +8442,20 @@ EPSG:32534
ll2 33.1808604410714 23.368746327376495
EPSG:32535
ll 42.22083236425547 30.47551964392535
- en 786835.5433844088 1.468014205753507E7
- ll2 42.22083236368264 30.475519644090138
+ en 786835.5433844088 1.4680142057535069E7
+ ll2 42.22083236368262 30.47551964409013
EPSG:32536
ll 54.354315506695826 30.087024504148236
en 310692.3633280243 1.6026853550563462E7
- ll2 54.35431550621942 30.08702450423043
+ ll2 54.354315506219415 30.08702450423043
EPSG:32537
ll -20.340069859934957 30.44385440304653
en -395645.1542246195 7727517.511851648
- ll2 -20.340069852043488 30.44385440558097
+ ll2 -20.340069852043495 30.443854405580968
EPSG:32538
ll 59.27013707599767 49.60491218729226
- en 762339.6251705228 1.6579198536461504E7
- ll2 59.27013707480417 49.60491218683316
+ en 762339.6251705233 1.6579198536461504E7
+ ll2 59.270137074804175 49.604912186833175
EPSG:32539
ll -4.2431255993991215 48.722673889504414
en 247189.258590064 9530624.86399777
@@ -8466,28 +8466,28 @@ EPSG:3254
ll2 -69.5593578374822 147.6671054369056
EPSG:32540
ll 50.742899605893655 51.515606891742976
- en 113141.41262812528 1.5635589034289412E7
- ll2 50.742899602891235 51.5156068933254
+ en 113141.41262812592 1.5635589034289412E7
+ ll2 50.742899602891235 51.515606893325405
EPSG:32541
ll 67.64749169526684 55.82678430943707
- en 196125.27718338592 1.7521183558486726E7
+ en 196125.27718338562 1.7521183558486726E7
ll2 67.64749168850967 55.82678434958901
EPSG:32542
ll -65.12402239138055 70.29873954646621
en 560946.1040156902 2777098.0738306614
- ll2 -65.12402239103476 70.29873954655217
+ ll2 -65.12402239103476 70.29873954655216
EPSG:32543
ll -37.858030756996385 73.45118600939713
en 363732.5778399878 5808805.746266313
- ll2 -37.858030756551315 73.45118600948165
+ ll2 -37.858030756551315 73.45118600948166
EPSG:32544
ll 89.47733659900851 77.60134590195418
- en 496540.3633744286 1.993970961697992E7
- ll2 89.47733659899323 77.60134590209819
+ en 496540.3633744287 1.993970961697992E7
+ ll2 89.47733659899322 77.60134590209829
EPSG:32545
ll 73.37039474795887 85.32451815893725
en 446478.6153164117 1.8142546135401197E7
- ll2 73.37039474771666 85.32451815902324
+ ll2 73.37039474771669 85.32451815902326
EPSG:32546
ll -77.03555504060341 83.41972473249227
en 261072.74203697426 1429744.7798653953
@@ -8495,39 +8495,39 @@ EPSG:32546
EPSG:32547
ll -42.501010413473416 104.51598258817114
en 953262.3155636378 5279830.956331716
- ll2 -42.50101041087618 104.51598258828713
+ ll2 -42.50101041087618 104.51598258828714
EPSG:32548
ll -44.05631951807261 108.72959388426897
- en 798722.8085524049 5115106.841975158
- ll2 -44.05631951739494 108.72959388444278
+ en 798722.8085524049 5115106.841975159
+ ll2 -44.056319517394954 108.72959388444279
EPSG:32549
ll -47.79024504513258 120.96713044467752
- en 1246115.5341485247 4658712.855943393
- ll2 -47.79024497010312 120.9671300518695
+ en 1246115.534148527 4658712.855943394
+ ll2 -47.79024497010311 120.96713005186956
EPSG:3255
ll -24.712944754345344 82.89651328824415
- en -2096807.1749669164 7570555.545195507
- ll2 -24.712944754345322 82.89651328824415
+ en -2096807.174966916 7570555.545195505
+ ll2 -24.712944754345337 82.89651328824415
EPSG:32550
ll -84.15855584709759 114.87321203717849
en 475836.5886662899 653761.7909733187
- ll2 -84.15855584700638 114.87321203726526
+ ll2 -84.15855584700637 114.87321203726528
EPSG:32551
ll -25.379044046296983 130.38124527823572
- en 1243824.4292598886 7172468.494598497
- ll2 -25.37904404218063 130.38124528309368
+ en 1243824.4292598912 7172468.494598497
+ ll2 -25.37904404218064 130.3812452830937
EPSG:32552
ll -83.01429402152165 131.51764444791598
- en 534171.5787582373 781202.5805933233
- ll2 -83.01429402141243 131.51764444799807
+ en 534171.5787582381 781202.5805933233
+ ll2 -83.01429402141243 131.5176444479981
EPSG:32553
ll -37.28467539146039 130.8056558015254
- en 128090.70179143932 5865291.489277717
- ll2 -37.28467539070525 130.80565580132605
+ en 128090.70179143682 5865291.489277715
+ ll2 -37.28467539070527 130.80565580132605
EPSG:32554
ll -6.642585560330758 137.84340281860923
- en 150894.0861619119 9264646.770603377
- ll2 -6.642585560210425 137.84340281881256
+ en 150894.08616191504 9264646.770603377
+ ll2 -6.642585560210428 137.84340281881256
EPSG:32555
ll 12.105275825759804 153.69723050583352
en 1230273.5422147978 1.1347172969817497E7
@@ -8538,12 +8538,12 @@ EPSG:32556
ll2 8.308889914367892 152.47093685069382
EPSG:32557
ll 7.508930854839534 150.16957357993388
- en -478031.1721571862 1.0839916338661298E7
- ll2 7.508930849178858 150.16957364064254
+ en -478031.1721571896 1.0839916338661298E7
+ ll2 7.5089308491788564 150.1695736406425
EPSG:32558
ll 3.533557431363306 172.9229794182917
en 1382754.0522870314 1.0394347177956874E7
- ll2 3.5335574300023125 172.9229793843835
+ ll2 3.5335574300023125 172.92297938438347
EPSG:32559
ll -14.301265194839985 177.43378580823918
en 1195142.159082398 8409283.171743061
@@ -8554,8 +8554,8 @@ EPSG:3256
ll2 -27.62275480254319 72.64389187723052
EPSG:32560
ll -74.95589433562841 170.33047258992903
- en 307132.3817256767 1670461.2881217534
- ll2 -74.95589433380424 170.3304726133087
+ en 307132.3817256744 1670461.2881217524
+ ll2 -74.95589433380424 170.33047261330856
EPSG:3257
ll -81.07243394691687 59.68598141116407
en -993504.4215353964 315100.1163821542
@@ -8570,12 +8570,12 @@ EPSG:3259
ll2 -50.290231104867324 173.11762346836744
EPSG:3260
ll -61.28972457854637 -118.16292652049796
- en 2439690.8034169353 2139368.0766479103
- ll2 -61.28972457854636 -118.16292652049798
+ en 2439690.8034169283 2139368.076647918
+ ll2 -61.28972457854636 -118.16292652049796
EPSG:32601
ll 35.30468974675124 -181.75048187801644
- en 67958.20646357589 3917197.8125596363
- ll2 35.30468974617765 178.24951812139236
+ en 67958.20646357589 3917197.812559636
+ ll2 35.304689746177644 178.24951812139236
EPSG:32602
ll -0.35895685791257925 -175.75420623162898
en -29625.972570085898 -39813.425707886265
@@ -8594,12 +8594,12 @@ EPSG:32605
ll2 70.45567827510223 -154.871161331819
EPSG:32606
ll 45.0472445968384 -147.48643385071935
- en 461693.09169689566 4988313.776962079
- ll2 45.04724459683838 -147.48643385071935
+ en 461693.09169689566 4988313.77696208
+ ll2 45.04724459683839 -147.48643385071935
EPSG:32607
ll 17.160888392541953 -136.88735017825638
- en 937701.0944171889 1901994.178305092
- ll2 17.160888392484225 -136.88735017834057
+ en 937701.0944171889 1901994.1783050923
+ ll2 17.160888392484228 -136.88735017834057
EPSG:32608
ll 17.082700048931713 -138.83952009347482
en 91233.83062316518 1892731.3620542919
@@ -8610,16 +8610,16 @@ EPSG:32609
ll2 32.88791124475305 -124.77432738220956
EPSG:3261
ll -78.64267313267413 -88.62189292232901
- en 1044172.4365639106 753832.6617108453
+ en 1044172.436563911 753832.6617108522
ll2 -78.64267313267413 -88.62189292232901
EPSG:32610
ll 15.621043862710906 -127.89205445312605
en -24932.886804628302 1733063.162641437
- ll2 15.621043862547943 -127.89205445274153
+ ll2 15.62104386254794 -127.89205445274153
EPSG:32611
ll 10.73641510533119 -112.16478744764923
en 1029269.7699246187 1191002.7127373253
- ll2 10.736415105215261 -112.16478744856082
+ ll2 10.73641510521526 -112.16478744856082
EPSG:32612
ll 61.77560053459669 -114.5125390548194
en 314735.1980824949 6854188.16600647
@@ -8630,7 +8630,7 @@ EPSG:32613
ll2 4.758377948802402 -107.92602632984344
EPSG:32614
ll 14.263757165950743 -100.80954124472483
- en 304782.4591083076 1577656.5830076297
+ en 304782.4591083076 1577656.58300763
ll2 14.26375716595045 -100.80954124472159
EPSG:32615
ll 84.67761930424092 -95.31735150114109
@@ -8643,10 +8643,10 @@ EPSG:32616
EPSG:32617
ll 58.773416508274885 -79.23342848764487
en 602152.126425848 6516169.077287629
- ll2 58.77341650827223 -79.2334284876445
+ ll2 58.77341650827222 -79.2334284876445
EPSG:32618
ll 0.8542824171250176 -70.60589399441409
- en 989382.9848638988 94704.15218960555
+ en 989382.9848638987 94704.15218960555
ll2 0.8542824171192103 -70.6058939952968
EPSG:32619
ll 9.928164458825613 -66.53356619660251
@@ -8654,8 +8654,8 @@ EPSG:32619
ll2 9.928164458824138 -66.533566196628
EPSG:3262
ll -34.88133947471252 -164.93282809664842
- en -4513055.577587319 4680769.859609449
- ll2 -34.881339474712526 -164.93282809664842
+ en -4513055.577587291 4680769.859609449
+ ll2 -34.88133947471253 -164.93282809664842
EPSG:32620
ll -2.6787491025025547 -66.88079230367741
en 68302.71810571593 -296768.5025927257
@@ -8678,19 +8678,19 @@ EPSG:32624
ll2 5.131580338571973 -39.26307503457069
EPSG:32625
ll -0.7883094164596285 -30.122300530621676
- en 820321.3553729916 -87242.67464559128
+ en 820321.3553729916 -87242.6746455913
ll2 -0.7883094164592764 -30.12230053070564
EPSG:32626
ll 58.43458636013028 -29.168484112078048
en 373392.9302469797 6479137.4193609245
- ll2 58.434586360121145 -29.168484112078794
+ ll2 58.43458636012115 -29.168484112078794
EPSG:32627
ll 8.344532201175449 -23.182089463285656
- en 259685.68916592153 923051.0956245605
- ll2 8.344532201174848 -23.182089463270497
+ en 259685.6891659215 923051.0956245605
+ ll2 8.34453220117485 -23.182089463270497
EPSG:32628
ll 22.510955722354655 -11.39208694243174
- en 871237.6024480207 2493863.4479682995
+ en 871237.6024480208 2493863.4479682995
ll2 22.510955722318098 -11.392086942377562
EPSG:32629
ll 21.147897974547682 -10.932715320979701
@@ -8698,40 +8698,40 @@ EPSG:32629
ll2 21.147897974546964 -10.93271532097978
EPSG:3263
ll -72.72521460338073 -123.24021513334996
- en -874111.6672528489 1741962.2174893613
+ en -874111.6672528473 1741962.2174893667
ll2 -72.72521460338072 -123.24021513334996
EPSG:32630
ll 7.0485574964722595 -2.895336653090574
- en 511558.9813362481 779118.0296876958
- ll2 7.0485574964722595 -2.895336653090574
+ en 511558.9813362481 779118.0296876959
+ ll2 7.048557496472261 -2.895336653090574
EPSG:32631
ll 62.31144897764639 -1.7488227034434083
- en 253972.6113974089 6917912.226973126
- ll2 62.31144897680178 -1.748822702612415
+ en 253972.61139740905 6917912.226973128
+ ll2 62.311448976801806 -1.7488227026124168
EPSG:32632
ll 11.834748738967427 11.598093592769366
- en 783086.673635305 1309597.582045277
- ll2 11.834748738965084 11.59809359274162
+ en 783086.6736353051 1309597.582045277
+ ll2 11.834748738965086 11.59809359274162
EPSG:32633
ll 42.05539689126687 15.319058068358773
en 526400.7140049142 4655976.147281091
- ll2 42.05539689126688 15.319058068358773
+ ll2 42.055396891266874 15.319058068358773
EPSG:32634
ll 75.90951295643045 25.503495199048984
- en 622276.0812525111 8429752.166285353
- ll2 75.90951295629242 25.503495198370185
+ en 622276.081252511 8429752.166285355
+ ll2 75.90951295629243 25.503495198370185
EPSG:32635
ll 47.49067536542698 25.527726208112252
en 389099.4234549984 5260743.895816009
ll2 47.49067536542605 25.527726208111563
EPSG:32636
ll 2.3826611804187845 35.69036984079036
- en 799224.0520455651 263649.3963221676
- ll2 2.382661180418093 35.69036984073283
+ en 799224.0520455651 263649.39632216765
+ ll2 2.3826611804180935 35.69036984073283
EPSG:32637
ll 52.14316359823634 35.33858849767755
- en 249486.75996839185 5783285.072365791
- ll2 52.143163598004776 35.33858849768187
+ en 249486.75996839188 5783285.072365791
+ ll2 52.14316359800478 35.33858849768187
EPSG:32638
ll 53.91509364067411 42.2117397712837
en 316881.19957743154 5977677.047493373
@@ -8742,8 +8742,8 @@ EPSG:32639
ll2 78.64198694154439 46.228999726912456
EPSG:3264
ll -54.8291152806576 -0.6689559601307451
- en 3751814.9988290584 1381989.1771609443
- ll2 -54.82911528065758 -0.6689559601307451
+ en 3751814.9988290477 1381989.1771609623
+ ll2 -54.82911528065757 -0.6689559601307451
EPSG:32640
ll 53.864121366142705 57.44751774032813
en 529429.9386809022 5968496.735428121
@@ -8751,7 +8751,7 @@ EPSG:32640
EPSG:32641
ll 49.571868382578565 60.41766515903435
en 313303.34799034183 5494234.471212627
- ll2 49.57186838255045 60.41766515902551
+ ll2 49.57186838255044 60.41766515902551
EPSG:32642
ll -1.9071382046033127 69.6619425586165
en 573618.7511049965 -210811.00831990028
@@ -8762,23 +8762,23 @@ EPSG:32643
ll2 1.4895490042363353 73.50410601478401
EPSG:32644
ll 62.44367553939567 85.9750751673437
- en 756598.954905078 6933493.141725358
- ll2 62.44367553828925 85.97507516606618
+ en 756598.9549050779 6933493.1417253595
+ ll2 62.44367553828926 85.97507516606618
EPSG:32645
ll 77.10426871059683 89.0221872636809
- en 550370.2039676631 8559275.344486712
- ll2 77.10426871059592 89.0221872636804
+ en 550370.2039676631 8559275.34448671
+ ll2 77.1042687105959 89.0221872636804
EPSG:32646
ll 50.87569190579864 89.74835752271836
- en 271249.3586776806 5641039.535641504
+ en 271249.3586776806 5641039.535641505
ll2 50.87569190568538 89.7483575227041
EPSG:32647
ll 70.62231324887725 99.90770843411856
- en 533612.0813866678 7835525.490747357
- ll2 70.6223132488772 99.90770843411856
+ en 533612.0813866677 7835525.490747359
+ ll2 70.62231324887722 99.90770843411856
EPSG:32648
ll 39.26637557561634 107.38423392284906
- en 705690.5819331672 4349046.830078893
+ en 705690.5819331673 4349046.830078893
ll2 39.26637557560433 107.38423392286239
EPSG:32649
ll 11.255609425170523 111.88005555487531
@@ -8786,12 +8786,12 @@ EPSG:32649
ll2 11.255609425170519 111.88005555487518
EPSG:3265
ll -44.49906866987579 -90.72413098127085
- en -3501538.6738780085 3917042.701454671
- ll2 -44.49906866987578 -90.72413098127085
+ en -3501538.673877991 3917042.701454675
+ ll2 -44.499068669875776 -90.72413098127085
EPSG:32650
ll 9.877161924846341 119.53983649063838
- en 778545.0254093793 1092890.670780713
- ll2 9.877161924844575 119.53983649060856
+ en 778545.0254093793 1092890.6707807132
+ ll2 9.877161924844577 119.53983649060856
EPSG:32651
ll 29.894404052484198 123.73791699307937
en 571246.6122429472 3307313.233021876
@@ -8807,31 +8807,31 @@ EPSG:32653
EPSG:32654
ll 0.16694081399375094 139.49272157099904
en 332258.8768147535 18458.406171511975
- ll2 0.16694081399374955 139.49272157100194
+ ll2 0.16694081399374958 139.49272157100194
EPSG:32655
ll 15.325514479625792 147.8741788025552
en 593840.2220569488 1694519.0743215194
- ll2 15.325514479625788 147.87417880255512
+ ll2 15.32551447962579 147.87417880255512
EPSG:32656
ll 5.776293589970747 152.597733111241
en 455463.1790096139 638491.4093867452
ll2 5.776293589970748 152.597733111241
EPSG:32657
ll 46.64079768923685 162.60478038581513
- en 775876.5142921584 5171562.354304886
+ en 775876.5142921584 5171562.354304887
ll2 46.6407976890409 162.60478038586615
EPSG:32658
ll -0.9538168752974308 164.16373403116563
- en 406954.018830566 -105436.8250765074
- ll2 -0.9538168752974306 164.16373403116577
+ en 406954.01883056597 -105436.8250765074
+ ll2 -0.9538168752974308 164.16373403116577
EPSG:32659
ll 40.50129189541295 171.1151678182983
en 509758.4272200559 4483404.501650231
ll2 40.501291895412955 171.1151678182983
EPSG:3266
ll -24.19516961410197 -79.93101680725752
- en -6542156.279025885 4629748.098315456
- ll2 -24.195169614101957 -79.93101680725752
+ en -6542156.279025844 4629748.098315465
+ ll2 -24.195169614101946 -79.93101680725752
EPSG:32660
ll 84.38466705329412 178.8187390897748
en 519865.4438068824 9371350.999827776
@@ -8843,11 +8843,11 @@ EPSG:32661
EPSG:32664
ll -50.09455297160714 -98.97391526433553
en 1646537.8774331866 -1.820581643107428E7
- ll2 -50.09455297160714 -98.97391526433553
+ ll2 -50.094552971607136 -98.97391526433553
EPSG:32665
ll 48.656399849213244 -98.04573827384858
- en 421492.362719889 1.7721609616698764E7
- ll2 48.65639984768728 -98.04573827344329
+ en 421492.36271988915 1.7721609616698768E7
+ ll2 48.656399847687304 -98.04573827344329
EPSG:32666
ll 12.750316092072154 -87.82070278959428
en 1348130.4248864362 4624876.609456946
@@ -8858,20 +8858,20 @@ EPSG:32667
ll2 -19.621622194333792 -85.44743810185133
EPSG:3267
ll -40.01625335738457 -68.44351885545936
- en -5359688.996582285 2280140.3769221446
+ en -5359688.996582261 2280140.376922164
ll2 -40.016253357384564 -68.44351885545936
EPSG:3268
ll -27.6998391211661 57.27182902583411
- en 4035685.7427815697 6323132.265497871
- ll2 -27.6998391211661 57.27182902583411
+ en 4035685.7427815422 6323132.265497859
+ ll2 -27.699839121166086 57.27182902583411
EPSG:3269
ll -77.2514828668538 -35.152957049745574
- en -1426691.1975652885 217212.64499711202
- ll2 -77.2514828668538 -35.15295704974555
+ en -1426691.1975652925 217212.6449971207
+ ll2 -77.2514828668538 -35.15295704974557
EPSG:3270
ll -38.29326874944709 56.78302184030676
- en -1553907.0026095987 5845841.892691433
- ll2 -38.29326874944708 56.78302184030676
+ en -1553907.002609589 5845841.892691421
+ ll2 -38.29326874944707 56.78302184030676
EPSG:32701
ll -29.00158099669585 -176.06257492764095
en 591305.9239689746 6791477.062909741
@@ -8887,22 +8887,22 @@ EPSG:32703
EPSG:32704
ll -44.74896637041389 -154.13571225132324
en 885055.000033729 5033414.6251877425
- ll2 -44.74896636930496 -154.1357122512614
+ ll2 -44.74896636930495 -154.1357122512614
EPSG:32705
ll -4.570782032538887 -155.6804518141318
en 202567.24068296677 9494225.75977532
ll2 -4.570782032537629 -155.6804518140784
EPSG:32706
ll -55.61672629832347 -144.3508810047789
- en 666829.610298553 3833392.5732422806
- ll2 -55.616726298291056 -144.35088100477648
+ en 666829.6102985529 3833392.5732422797
+ ll2 -55.61672629829106 -144.35088100477648
EPSG:32707
ll -0.22277876804946573 -136.6505910806773
en 984445.3083006871 9975304.651945617
ll2 -0.22277876804804692 -136.65059108151155
EPSG:32708
ll -2.768962687806777 -135.91033889187207
- en 398815.2872440797 9693905.20036734
+ en 398815.28724407975 9693905.20036734
ll2 -2.7689626878067735 -135.91033889187185
EPSG:32709
ll -32.79190171964473 -131.727811570545
@@ -8910,8 +8910,8 @@ EPSG:32709
ll2 -32.79190171962786 -131.72781157057466
EPSG:3271
ll -26.453072300138466 20.11251090582438
- en -7392847.875732365 2086963.4825021168
- ll2 -26.453072300138455 20.11251090582438
+ en -7392847.87573233 2086963.482502149
+ ll2 -26.45307230013844 20.11251090582438
EPSG:32710
ll 1.5712020890239131 -124.21146729170505
en 365234.2722858875 1.0173704546361327E7
@@ -8919,11 +8919,11 @@ EPSG:32710
EPSG:32711
ll -41.091261924884776 -120.17689123197003
en 233168.6164003252 5446247.135222786
- ll2 -41.09126192481057 -120.17689123202514
+ ll2 -41.091261924810574 -120.17689123202514
EPSG:32712
ll -79.76744100986106 -115.94410343190378
- en 402063.9138540749 1140210.1029308978
- ll2 -79.76744100976357 -115.94410343026561
+ en 402063.913854075 1140210.102930896
+ ll2 -79.7674410097636 -115.94410343026561
EPSG:32713
ll -10.850887170003276 -108.88425627320359
en 75152.58517323533 8797793.85642363
@@ -8942,20 +8942,20 @@ EPSG:32716
ll2 -4.559807376148307 -82.52818257832048
EPSG:32717
ll -66.29192836668584 -83.46326129024452
- en 389503.5113214161 2645374.949492232
- ll2 -66.2919283666731 -83.46326129024241
+ en 389503.51132141607 2645374.949492234
+ ll2 -66.29192836667309 -83.46326129024241
EPSG:32718
ll -2.5647882790401297 -76.48884831326323
en 334474.6299803979 9716415.67820616
- ll2 -2.5647882790401026 -76.48884831326058
+ ll2 -2.564788279040103 -76.48884831326058
EPSG:32719
ll -3.3106740144730935 -68.43248658691562
en 563046.3761068006 9634048.929625392
- ll2 -3.3106740144730917 -68.43248658691563
+ ll2 -3.310674014473092 -68.43248658691563
EPSG:3272
ll -73.51800513325698 88.48056257252205
- en -953451.9596687705 1597309.0940135142
- ll2 -73.51800513325698 88.48056257252205
+ en -953451.9596687697 1597309.0940135203
+ ll2 -73.51800513325696 88.48056257252205
EPSG:32720
ll -69.88660504305992 -58.451395274860495
en 674428.974179743 2240266.527455697
@@ -8963,11 +8963,11 @@ EPSG:32720
EPSG:32721
ll -1.460807694037996 -56.918034017934815
en 509117.82030811213 9838536.340686502
- ll2 -1.460807694037999 -56.918034017934815
+ ll2 -1.4608076940379993 -56.918034017934815
EPSG:32722
ll -67.51187256863244 -49.8909954222962
en 547334.5777219022 2511132.6494826376
- ll2 -67.51187256863231 -49.89099542229619
+ ll2 -67.51187256863233 -49.89099542229619
EPSG:32723
ll -37.33901138489274 -46.319661481385886
en 383102.30125253036 5866702.31187365
@@ -8990,16 +8990,16 @@ EPSG:32727
ll2 -50.93436625608718 -25.166137353769884
EPSG:32728
ll -75.6414574413936 -19.243865220370584
- en 382615.2732716046 1600607.7105821092
- ll2 -75.64145744129156 -19.243865219974342
+ en 382615.27327160456 1600607.7105821092
+ ll2 -75.64145744129155 -19.243865219974342
EPSG:32729
ll -83.5333650193571 -5.501531193633692
- en 543962.835055189 722665.3614518307
- ll2 -83.53336501935377 -5.501531193707987
+ en 543962.835055189 722665.3614518326
+ ll2 -83.53336501935375 -5.501531193707994
EPSG:3273
ll -52.06743260522197 176.69139402063666
- en 2291679.3975831117 3670317.0461404733
- ll2 -52.067432605221924 176.69139402063666
+ en 2291679.3975831014 3670317.046140476
+ ll2 -52.0674326052219 176.69139402063666
EPSG:32730
ll -81.54589940598518 -0.6625327966681755
en 538355.0358692394 945086.5607374981
@@ -9007,7 +9007,7 @@ EPSG:32730
EPSG:32731
ll -77.7299649478657 6.793662551026102
en 589941.1445311456 1368855.4457734264
- ll2 -77.72996494783142 6.793662550878642
+ ll2 -77.72996494783142 6.793662550878643
EPSG:32732
ll -1.791491309390267 5.643292386980017
en 126449.06323080743 9801643.353370337
@@ -9023,7 +9023,7 @@ EPSG:32734
EPSG:32735
ll -67.02488461225471 23.602574863927025
en 352075.73642084474 2561806.4975000024
- ll2 -67.0248846121725 23.60257486397256
+ ll2 -67.02488461217251 23.60257486397256
EPSG:32736
ll -42.55662303150512 29.942428252202173
en 248987.61723446447 5283887.58059233
@@ -9039,11 +9039,11 @@ EPSG:32738
EPSG:32739
ll -36.97742607037574 49.32483640492937
en 350900.55360484595 5906320.568081254
- ll2 -36.977426070374484 49.32483640492722
+ ll2 -36.97742607037449 49.32483640492722
EPSG:3274
ll -86.31610991627304 101.26031773285018
- en -387814.70609587204 178479.98382070282
- ll2 -86.31610991627308 101.2603177328502
+ en -387814.7060958745 178479.983820706
+ ll2 -86.31610991627308 101.26031773285018
EPSG:32740
ll -78.828450880352 53.91362023885953
en 433274.5310192385 1247408.5976424795
@@ -9054,16 +9054,16 @@ EPSG:32741
ll2 -26.300363121964097 65.28977338534425
EPSG:32742
ll -46.57798418816586 66.46686755703854
- en 305909.447861159 4838613.998468486
- ll2 -46.577984188142224 66.46686755702713
+ en 305909.447861159 4838613.998468485
+ ll2 -46.57798418814223 66.46686755702713
EPSG:32743
ll -25.298456802256545 78.290225577417
en 831325.5755857098 7197935.587045593
- ll2 -25.29845680223009 78.29022557747079
+ ll2 -25.298456802230085 78.29022557747079
EPSG:32744
ll -23.333853962130412 81.03414728671824
- en 503490.800754981 7419521.505624598
- ll2 -23.333853962130405 81.03414728671824
+ en 503490.800754981 7419521.505624597
+ ll2 -23.333853962130412 81.03414728671824
EPSG:32745
ll -27.850501765768136 88.49974130692067
en 647670.9268986753 6918455.1208804175
@@ -9087,7 +9087,7 @@ EPSG:32749
EPSG:3275
ll 1.7601214433069003 6.782875586981817
en 1859839.0894781305 -1.2879121157179449E7
- ll2 1.7601214432833585 6.782875586981845
+ ll2 1.7601214432833585 6.782875586981817
EPSG:32750
ll -29.646256411547412 116.5390917394596
en 455389.40541231557 6720322.4952789955
@@ -9095,15 +9095,15 @@ EPSG:32750
EPSG:32751
ll -32.31249913837224 123.5620478825476
en 552907.9443416377 6424786.563103167
- ll2 -32.312499138372246 123.56204788254762
+ ll2 -32.31249913837224 123.56204788254762
EPSG:32752
ll -40.03951775988635 127.43317318342925
- en 366330.3564929392 5566680.742924173
+ en 366330.35649293923 5566680.742924173
ll2 -40.03951775988534 127.43317318342783
EPSG:32753
ll -28.176037015492348 138.7789296805875
- en 871098.4449456041 6877512.944383347
- ll2 -28.17603701541255 138.7789296807489
+ en 871098.4449456041 6877512.9443833465
+ ll2 -28.17603701541256 138.7789296807489
EPSG:32754
ll -76.09420937279235 144.16836879822267
en 584959.5966797009 1552021.5295536648
@@ -9111,7 +9111,7 @@ EPSG:32754
EPSG:32755
ll -5.430354355649115 147.0530080779711
en 505872.17624536785 9399764.410398118
- ll2 -5.430354355649118 147.0530080779711
+ ll2 -5.4303543556491185 147.0530080779711
EPSG:32756
ll -52.48522451023355 152.57450200005235
en 471106.2760023533 4184906.4029179476
@@ -9119,7 +9119,7 @@ EPSG:32756
EPSG:32757
ll -20.68227265660569 154.09167529202733
en -11660.993969265954 7705261.802298705
- ll2 -20.682272656387454 154.09167529182267
+ ll2 -20.682272656387457 154.09167529182267
EPSG:32758
ll -6.482322318456696 161.77847911397538
en 143617.7405419257 9282345.981167438
@@ -9130,7 +9130,7 @@ EPSG:32759
ll2 -9.653111284583055 166.14443173929217
EPSG:3276
ll -8.194824487338636 -109.26770422318646
- en 4751779.115560255 9859241.999783775
+ en 4751779.115560256 9859241.999783775
ll2 -8.194824487337963 -109.26770422318646
EPSG:32760
ll -36.29211488935783 181.82910716731914
@@ -9147,10 +9147,10 @@ EPSG:32766
EPSG:3277
ll -86.23600060084829 -35.32416339547672
en 391523.59633843246 145016.7166123399
- ll2 -86.23600060084827 -35.32416339547672
+ ll2 -86.23600060084829 -35.32416339547672
EPSG:3278
ll -26.26721898678278 64.3740133100342
- en 5123821.711823587 -5972580.930969879
+ en 5123821.711823585 -5972580.930969881
ll2 -26.267218986782076 64.3740133100342
EPSG:3279
ll 42.462912837780635 -65.96900130730877
@@ -9159,7 +9159,7 @@ EPSG:3279
EPSG:3280
ll -29.12698753271465 -169.32653437460684
en -3223347.230731451 -6705566.2155786315
- ll2 -29.12698753271407 -169.3265343746068
+ ll2 -29.126987532714068 -169.32653437460684
EPSG:3281
ll -20.143690831318054 -138.72173175047791
en -3911311.2533829147 -7921499.708626818
@@ -9167,22 +9167,22 @@ EPSG:3281
EPSG:3282
ll -87.6701522006823 -48.22027694753639
en -257972.5673550888 -14514.489217880324
- ll2 -87.6701522006823 -48.22027694753639
+ ll2 -87.6701522006823 -48.220276947536405
EPSG:3283
ll -13.884227540076509 152.48738701899043
en 9662415.267889481 2144337.609424833
ll2 -13.884227540075612 152.48738701899043
EPSG:3284
ll -26.1588365437026 19.215273340008352
- en -7864449.4256969765 579636.8384742583
- ll2 -26.1588365437019 19.215273340008366
+ en -7864449.4256969765 579636.8384742566
+ ll2 -26.158836543701895 19.215273340008352
EPSG:3285
ll -11.119833387948105 116.33610318999047
en -3326788.1921821907 9849003.589358458
ll2 -11.119833387947276 116.33610318999047
EPSG:3286
ll 54.838269793009545 -2.1123262410021955
- en -8836118.23538975 -3.861869453702794E7
+ en -8836118.235389758 -3.861869453702797E7
ll2 54.838269793005054 -2.1123262410021937
EPSG:3287
ll -48.17524303305226 -74.54067798259788
@@ -9191,35 +9191,35 @@ EPSG:3287
EPSG:3288
ll -3.9999750940881142 -47.03636985626031
en 8025276.764679871 8617015.629759714
- ll2 -3.99997509408775 -47.03636985626031
+ ll2 -3.9999750940877496 -47.03636985626031
EPSG:3289
ll 45.937795737057144 3.9887968424524445
en 1.735281221109577E7 2.573745609006604E7
- ll2 45.937795737057066 3.9887968424524445
+ ll2 45.93779573705706 3.9887968424524445
EPSG:3290
ll 50.120948094680614 -119.14390941469581
en -1.7752541164785463E7 -2.9713988516197786E7
- ll2 50.120948094669565 -119.14390941469583
+ ll2 50.12094809466956 -119.14390941469583
EPSG:3291
ll -64.60125291001827 -57.790730393799
en -1525235.425737202 -2421163.9703149754
ll2 -64.60125291001793 -57.79073039379901
EPSG:3292
ll -23.92677775484151 84.42446988982196
- en -7493786.04885471 3403191.868104349
- ll2 -23.92677775484074 84.42446988982198
+ en -7493786.0488547105 3403191.8681043466
+ ll2 -23.926777754840742 84.42446988982196
EPSG:3293
ll -86.85422121361098 107.10503797677018
- en 333472.3652349566 -102621.59297712774
- ll2 -86.85422121361098 107.10503797677018
+ en 333472.3652349553 -102621.59297712741
+ ll2 -86.854221213611 107.10503797677019
EPSG:3294
ll -30.47147734655283 172.2633184247099
- en 1239131.545879784 5639337.882713211
+ en 1239131.5458797752 5639337.88271318
ll2 -30.47147734655283 172.2633184247099
EPSG:3296
ll 49.37236302094749 -161.94287325274303
en -148806.44148575806 1.5507425148891475E7
- ll2 49.37236297789601 -161.94287309668866
+ ll2 49.372362977895996 -161.94287309668866
EPSG:3297
ll 19.883637968327164 -137.47260261389312
en 1500916.277644067 1.2227092734453809E7
@@ -9230,12 +9230,12 @@ EPSG:3298
ll2 -11.163918292030665 -134.8424848239847
EPSG:3299
ll -32.8903533609971 -133.39041506120634
- en 650554.1826432217 6359719.454872167
- ll2 -32.89035336099636 -133.3904150612046
+ en 650554.1826432217 6359719.454872165
+ ll2 -32.89035336099637 -133.3904150612046
EPSG:3300
ll 46.36923800373967 7.0185371880772465
- en -820048.0061365867 5292848.153480741
- ll2 46.369238003739945 7.018537188076923
+ en -820048.006136585 5292848.15348074
+ ll2 46.369238003739945 7.018537188076927
EPSG:3301
ll 59.493759099912154 27.525338967200614
en 699626.8833689764 6600366.426436952
@@ -9247,50 +9247,50 @@ EPSG:3302
EPSG:3303
ll -24.052865574918812 -135.17286493372413
en 1094084.3935497631 7323159.335869256
- ll2 -24.052868230524155 -135.1728664672505
+ ll2 -24.05286823052416 -135.1728664672505
EPSG:3304
ll -57.362570329389406 -138.63058216923295
- en 1002658.2838927045 3611142.4712697053
- ll2 -57.36257031014513 -138.63058229726562
+ en 1002658.2838927046 3611142.4712697053
+ ll2 -57.36257031014512 -138.6305822972656
EPSG:3305
ll 57.55109601229444 -149.29880056200292
en 362557.27395612455 1.638096428357774E7
- ll2 57.55109593132572 -149.2988005291937
+ ll2 57.55109593132572 -149.29880052919367
EPSG:3306
ll -73.66439289683126 -154.14788583498944
- en 463943.2825552961 1824996.8262575036
+ en 463943.282555296 1824996.8262575045
ll2 -73.66439287844452 -154.14788584137216
EPSG:3307
ll -6.374705957359055 45.56737517245509
- en -101687.98740747885 -707800.6821266378
- ll2 -6.374705957192219 45.56737517508216
+ en -101687.98740747967 -707800.6821266379
+ ll2 -6.37470595719222 45.56737517508217
EPSG:3308
ll 21.75387432517674 69.4599778267665
- en -2070542.6430060118 7170710.16329943
- ll2 21.75387432517666 69.4599778267665
+ en -2070542.643005997 7170710.163299447
+ ll2 21.75387432517665 69.45997782676649
EPSG:3310
ll 56.2833291759967 -105.61981952640022
- en 955883.0211813878 2058964.4636019208
+ en 955883.0211813882 2058964.4636019217
ll2 56.28332917599671 -105.61981952640022
EPSG:3311
ll 16.73308162957028 -124.60019911752742
- en -515778.336005594 -2308972.9143328546
- ll2 16.73308162957027 -124.60019911752741
+ en -515778.33600559697 -2308972.9143328555
+ ll2 16.73308162957023 -124.60019911752744
EPSG:3312
ll -68.21014682723902 -47.13731205896564
en 907128.486538963 -7598959.198560943
- ll2 -68.21014680372944 -47.13731278652381
+ ll2 -68.21014680372944 -47.137312786523815
EPSG:3313
ll -46.264956023596895 -55.33508065430007
- en 628301.0535500149 -5124833.695183911
- ll2 -46.26495602359509 -55.33508065429866
+ en 628301.0535500143 -5124833.695183911
+ ll2 -46.26495602359508 -55.33508065429866
EPSG:3316
ll 82.78318787391316 27.91829867460762
en 582892.7885299455 1.919910993909432E7
- ll2 82.78318787382482 27.91829866609011
+ ll2 82.7831878738248 27.91829866609011
EPSG:3317
ll 19.565421935397723 14.799172930013325
- en -468633.4469248041 1.2190059032614416E7
+ en -468633.44692480424 1.2190059032614416E7
ll2 19.565421923171915 14.799172942114735
EPSG:3318
ll -76.61571636176032 16.142436109321103
@@ -9299,7 +9299,7 @@ EPSG:3318
EPSG:3319
ll 85.17418296773252 16.89287355810026
en 527169.9869304205 1.9462564256533183E7
- ll2 85.17418296773208 16.892873558086762
+ ll2 85.17418296773207 16.892873558086762
EPSG:3320
ll 68.08730850148913 18.41450332451769
en 600572.5940242575 1.7556575291994244E7
@@ -9307,27 +9307,27 @@ EPSG:3320
EPSG:3321
ll -5.901621330412453 15.694328948031703
en 244638.1522742983 9347005.933801103
- ll2 -5.901621330411803 15.694328948055398
+ ll2 -5.901621330411804 15.694328948055398
EPSG:3322
ll 79.79278465286106 10.169476100842811
en 306343.32701246114 1.8877330552004695E7
- ll2 79.79278465251869 10.169476935225706
+ ll2 79.79278465251868 10.169476935225706
EPSG:3323
ll 21.0622070906566 28.254810511287573
en 1150961.991249159 1.2342337902298775E7
ll2 21.06220708959016 28.254810512294007
EPSG:3324
ll 75.58043311063128 33.32750971018049
- en 758370.363952565 1.8411096777512677E7
- ll2 75.5804331034448 33.32750921667387
+ en 758370.3639525648 1.8411096777512677E7
+ ll2 75.58043310344479 33.32750921667386
EPSG:3325
ll -17.716879756544373 22.42405422782315
en 120516.97793449159 8037113.099193201
- ll2 -17.716879756519088 22.424054227857983
+ ll2 -17.716879756519084 22.424054227857983
EPSG:3326
ll -89.94549968532651 35.52443389095464
- en 500797.1111773474 5167.333068244159
- ll2 -89.94549968532873 35.52443381413657
+ en 500797.11117734725 5167.333068242297
+ ll2 -89.94549968532876 35.52443381413845
EPSG:3327
ll -17.33044291431827 30.151351689401594
en 516087.0672878372 8083475.160329556
@@ -9335,99 +9335,99 @@ EPSG:3327
EPSG:3328
ll 84.84988202559029 97.68076346689902
en 1125850.7985865152 4741804.595633595
- ll2 84.8498820222375 97.68076346591187
+ ll2 84.84988202223751 97.6807634659119
EPSG:3329
ll -65.53829909085935 6.420970511272706
en 5104557.0495312875 -7298471.769155938
- ll2 -65.53829906511669 6.420970796600738
+ ll2 -65.5382990651167 6.420970796600737
EPSG:3330
ll -31.81008155880835 26.24839860272104
- en 7282375.084854804 -3550582.7382559124
- ll2 -31.810081533125384 26.24839863047773
+ en 7282375.084854804 -3550582.738255914
+ ll2 -31.81008153312539 26.248398630477734
EPSG:3331
ll 47.35500551628061 12.01391938557996
en 6821449.15572509 5286146.499073237
- ll2 47.355005476919104 12.01391954429633
+ ll2 47.355005476919104 12.013919544296327
EPSG:3332
ll 69.99345144430194 15.02228388333858
- en 8158267.852358297 7793616.810051431
- ll2 69.99345142786702 15.022284222376415
+ en 8158267.852358297 7793616.810051433
+ ll2 69.99345142786703 15.022284222376411
EPSG:3333
ll 66.25931623439811 7.276349393262851
en 3153713.6972590946 7373325.285683188
- ll2 66.2593162251657 7.27634949083058
+ ll2 66.25931622516573 7.276349490830579
EPSG:3334
ll 40.34290499963984 30.460435588355786
- en 5304521.3008623915 4510931.550522113
- ll2 40.34290495775378 30.460435465862684
+ en 5304521.300862392 4510931.550522114
+ ll2 40.34290495775379 30.460435465862705
EPSG:3335
ll 19.584967315594568 17.688182752478724
- en 4519757.3639415 2193392.715946257
- ll2 19.584967308907295 17.688182781794758
+ en 4519757.3639415 2193392.7159462576
+ ll2 19.5849673089073 17.688182781794758
EPSG:3336
ll -38.059719538877275 66.81234218327599
- en 308274.66663925315 5785135.415068007
- ll2 -38.0597195476253 66.81234220632373
+ en 308274.6666392544 5785135.415068007
+ ll2 -38.059719547625306 66.81234220632376
EPSG:3337
ll -7.988228931656124 51.26425790789248
- en 294095.5517305903 2347704.780978266
- ll2 -7.988229046701753 51.26425808726149
+ en 294095.5517305904 2347704.780978266
+ ll2 -7.988229046701778 51.2642580872615
EPSG:3338
ll -1.4358933712535276 -67.11964654531752
en 9529553.967427237 2242670.8230798407
ll2 -1.4358933712535458 -67.11964654531754
EPSG:3339
ll 50.74234943403934 10.661863508524672
- en 405700.1127516171 1.5623766081475757E7
- ll2 50.74234928112869 10.66186341631764
+ en 405700.1127516172 1.5623766081475757E7
+ ll2 50.742349281128696 10.661863416317644
EPSG:3340
ll -65.92684073658869 15.680047225495764
en 576618.6899822621 2685207.4259124873
- ll2 -65.92684072803257 15.680047192502407
+ ll2 -65.92684072803259 15.68004719250241
EPSG:3341
ll 23.072755837584992 7.5388742628012135
- en -368960.3350937923 1.2577763126719717E7
- ll2 23.072755777622348 7.538874236755045
+ en -368960.3350937923 1.2577763126719719E7
+ ll2 23.07275577762237 7.538874236755045
EPSG:3342
ll 63.143326337720794 10.514655857025655
- en 274202.1461535508 1.7009426317371298E7
- ll2 63.14332620239806 10.514655698195282
+ en 274202.1461535511 1.7009426317371298E7
+ ll2 63.14332620239804 10.514655698195291
EPSG:3343
ll -53.43850971431012 -15.694571752245407
- en 453861.00329485023 -5921277.558754369
+ en 453861.00329485023 -5921277.558754368
ll2 -53.4385097143104 -15.694571752245416
EPSG:3344
ll 72.36875909442838 0.09231890896850103
- en 806329.3026133215 8053287.035058835
- ll2 72.36875908196362 0.09231853503907851
+ en 806329.3026133212 8053287.0350588355
+ ll2 72.36875908196363 0.09231853503907494
EPSG:3345
ll 43.359645422412825 -11.395830293785405
- en -180461.7698684096 4835111.062660779
- ll2 43.35964539685999 -11.39583024151839
+ en -180461.76986840973 4835111.062660779
+ ll2 43.35964539685998 -11.395830241518393
EPSG:3346
ll 23.054766511379242 21.172871523540955
- en 210248.55301997642 2552893.545418455
+ en 210248.55301997636 2552893.545418455
ll2 23.054766511370495 21.17287152352779
EPSG:3347
ll 87.44868722075515 -13.603000073587651
en 6546188.66860158 5960565.572819538
- ll2 87.4486872207552 -13.603000073587765
+ ll2 87.4486872207552 -13.603000073587808
EPSG:3348
ll 26.51677610186634 -150.685247613345
- en 361864.35984244104 1681127.1979129203
- ll2 26.51677610186586 -150.685247613345
+ en 361864.3598424401 1681127.1979129284
+ ll2 26.51677610186587 -150.68524761334504
EPSG:3350
ll 5.599357699703646 20.231711131719678
en 59712.43155070444 608484.0388491711
- ll2 5.59935770755426 20.231711146224768
+ ll2 5.599357707554258 20.231711146224765
EPSG:3351
ll 67.79687570411429 22.808083858971692
en 1159784.6114889414 7513868.007186614
ll2 67.79687570384515 22.808083869570122
EPSG:3352
ll -75.06154253336874 37.331358717639105
- en 2519138.9826092613 -8366265.731294384
- ll2 -75.06154250409833 37.331358317764135
+ en 2519138.982609261 -8366265.731294387
+ ll2 -75.06154250409836 37.33135831776414
EPSG:3353
ll -9.950508313804349 9.653513833204329
en 571637.3118014578 8899976.453260724
@@ -9435,7 +9435,7 @@ EPSG:3353
EPSG:3354
ll 25.67781097036891 11.414375343108926
en 742335.6207772959 1.2842256161654878E7
- ll2 25.67781097036468 11.414375343117976
+ ll2 25.677810970364682 11.414375343117976
EPSG:3355
ll 45.910441215155885 39.76443431546049
en 1294757.1584853237 2613478.453495331
@@ -9443,31 +9443,31 @@ EPSG:3355
EPSG:3358
ll 45.66685140723709 -29.105926869202534
en 4400775.142282271 2302917.3512189593
- ll2 45.66685140723722 -29.105926869202538
+ ll2 45.66685140723721 -29.10592686920255
EPSG:3360
ll 47.89325413800849 -75.4370255502395
- en 1039269.5470926751 1811621.0254590653
- ll2 47.89325413800862 -75.43702555023948
+ en 1039269.5470926738 1811621.0254590667
+ ll2 47.89325413800864 -75.4370255502395
EPSG:3361
ll -3.027991028004351 -27.654307110758225
- en 2.4540933270281333E7 -7612905.0184383765
- ll2 -3.0279910280043247 -27.654307110758214
+ en 2.4540933270281337E7 -7612905.018438367
+ ll2 -3.027991028004325 -27.65430711075823
EPSG:3362
ll 28.352326642798012 -71.59950814694488
en 1217436.9314888376 -1300628.121009402
- ll2 28.352326642797195 -71.59950814694487
+ ll2 28.352326642797202 -71.59950814694487
EPSG:3363
ll 61.77945721674347 -144.4283991838936
en -9268752.197571998 1.2618682559345687E7
ll2 61.77945721674404 -144.4283991838936
EPSG:3364
ll 8.693639508488708 -156.47755149414124
- en -8100316.6893209815 589379.7036443362
- ll2 8.693639508488747 -156.47755149414124
+ en -8100316.689320976 589379.7036442951
+ ll2 8.69363950848872 -156.47755149414124
EPSG:3365
ll 87.360147821736 -29.519408173421482
- en 3797283.335489351 2.1975376909410097E7
- ll2 87.36014782173619 -29.519408173421446
+ en 3797283.3354893853 2.197537690941024E7
+ ll2 87.36014782173619 -29.519408173421535
EPSG:3367
ll -30.516440623036992 -15.44002200472711
en 457780.8196151796 -3375833.717692135
@@ -9475,7 +9475,7 @@ EPSG:3367
EPSG:3368
ll 45.69543152493526 -4.274420819545169
en 867921.8843384451 5070767.268889052
- ll2 45.69543152395688 -4.2744208195019455
+ ll2 45.69543152395688 -4.274420819501946
EPSG:3369
ll 81.23182332784359 -12.816471439482473
en 333708.68550661637 9033028.232526092
@@ -9487,14 +9487,14 @@ EPSG:3372
EPSG:3373
ll 70.53450274055439 167.6931700948511
en 155046.1602462955 7851967.381620284
- ll2 70.53450272207175 167.69317054383626
+ ll2 70.53450272207174 167.69317054383626
EPSG:3374
ll -79.85445744414656 0.37182958976734426
en 683535.3177323692 -8880414.097937567
ll2 -79.85445744317988 0.37182904991931665
EPSG:3375
ll 5.040852922166723 103.30627974440675
- en 590171.4386504 557417.1541343457
+ en 590171.4386503983 557417.1541343456
ll2 5.040852922166273 103.30627974440675
EPSG:3376
ll 4.747304314605861 118.84323425598721
@@ -9514,19 +9514,19 @@ EPSG:3379
ll2 56.46771682287961 102.52441529379698
EPSG:3380
ll -70.56287855128488 101.5357320871954
- en -29388.376541149293 -8182754.146054061
- ll2 -70.56287855128507 101.5357320871954
+ en -29388.3765411493 -8182754.146054063
+ ll2 -70.56287855128508 101.5357320871954
EPSG:3381
ll -44.32573731631593 102.57224457151007
en -20131.49542507911 -5457028.561008427
- ll2 -44.32573731641946 102.57224457142638
+ ll2 -44.325737316419456 102.57224457142638
EPSG:3382
ll -5.8703840014789535 99.96881248250148
en -41613.26705010444 -1248586.1903985934
ll2 -5.8703840014791995 99.96881248250051
EPSG:3383
ll 22.962743966167466 100.42861065428318
- en -21305.96296384345 1880863.5359677796
+ en -21305.96296384345 1880863.53596778
ll2 22.962743966168627 100.42861065428256
EPSG:3384
ll 45.85634027452056 100.53077601723719
@@ -9534,44 +9534,44 @@ EPSG:3384
ll2 45.8563402745316 100.53077601723217
EPSG:3385
ll 71.8618083553842 103.13867053860888
- en 42544.56389698691 7325220.477060333
- ll2 71.86180835557103 103.13867053853396
+ en 42544.563896986925 7325220.477060331
+ ll2 71.86180835557101 103.13867053853396
EPSG:3386
ll -89.59009830030605 15.366898838425108
- en 497801.63858697127 -9956469.843760252
- ll2 -89.59009826322071 15.366901934622827
+ en 497801.6385869712 -9956469.843760252
+ ll2 -89.59009826322071 15.366901934622756
EPSG:3387
ll 10.291404297700993 41.91402765514428
en 6480276.344184 1151844.8226038879
- ll2 10.291404319051509 41.91402761717174
+ ll2 10.291404319051507 41.91402761717174
EPSG:3388
ll -73.24907273227738 126.72589597701531
- en 6273844.747247949 -9063422.188490324
- ll2 -73.24907270081529 126.72589592872397
+ en 6273844.747247948 -9063422.188490324
+ ll2 -73.24907270081528 126.72589592872399
EPSG:3389
ll -14.438886660384838 173.46408675562256
- en 5.9793731386489995E7 -1606932.5947249217
- ll2 -14.438886647779773 173.46408674092564
+ en 5.979373138648997E7 -1606932.594724923
+ ll2 -14.438886647779777 173.46408674092538
EPSG:3390
ll -74.53447359657642 175.40050109492685
en 6.0363030953799844E7 -8280370.768905363
ll2 -74.53447358218067 175.40050097540697
EPSG:3391
ll -3.1867470301249483 34.71861712153077
- en 24187.558580653684 -353485.970078427
+ en 24187.558580653742 -353485.97007842694
ll2 -3.1867470148754866 34.71861710606257
EPSG:3392
ll -42.65524931085752 49.91035356384653
en 902770.5125926323 -4734340.896840583
- ll2 -42.65524909474413 49.91035336694729
+ ll2 -42.655249094744136 49.91035336694729
EPSG:3393
ll 2.534516067965697 58.92369445984853
- en 1383935.1126905978 282587.7856052731
- ll2 2.534516111288504 58.923694382117105
+ en 1383935.1126905987 282587.78560527315
+ ll2 2.5345161112885046 58.92369438211712
EPSG:3394
ll 5.395235475818197 71.65431390978327
- en 4744208.1267775055 -1532843.9099951917
- ll2 5.3952355076595 71.65431392775704
+ en 4744208.126777505 -1532843.9099951917
+ ll2 5.395235507659499 71.65431392775704
EPSG:3395
ll -55.07366715935213 -39.25832129180364
en -4370216.3356023105 -7341116.553800662
@@ -9594,35 +9594,35 @@ EPSG:3399
ll2 30.360299683563966 18.88369648726471
EPSG:3400
ll 78.77109954006596 -119.28488772461627
- en 406970.0428323222 8744341.626215268
+ en 406970.0428323223 8744341.62621527
ll2 78.7710995400108 -119.28488772416993
EPSG:3401
ll -78.83326450687409 -112.17864915060397
- en 60949.86241956899 -8749335.669829166
+ en 60949.862419569 -8749335.669829166
ll2 -78.83326450686958 -112.17864915061432
EPSG:3402
ll -63.378471196039925 -105.33887023233936
- en 981446.2654349719 -7061354.504695313
- ll2 -63.37847114964302 -105.33887077779332
+ en 981446.2654349711 -7061354.504695314
+ ll2 -63.378471149643026 -105.33887077779333
EPSG:3403
ll 41.305179163895815 -116.04810806419964
- en -87705.19224905368 4571335.492819392
- ll2 41.30517916389575 -116.04810806419982
+ en -87705.19224905249 4571335.492819394
+ ll2 41.30517916389576 -116.04810806419981
EPSG:3404
ll 80.03367287635575 -134.13315144751257
en -3597707.9959459757 2.116224422943901E7
ll2 80.03367287635653 -134.13315144751257
EPSG:3405
ll 82.1882894993609 104.21683540335934
- en 487920.5224368903 9125954.421341768
- ll2 82.18828949573296 104.21683562005725
+ en 487920.5224368905 9125954.42134177
+ ll2 82.18828949573297 104.21683562005728
EPSG:3406
ll 18.44100002148376 120.66715164912725
en 1524539.2181801887 2066626.3594603813
- ll2 18.441000010157175 120.66715161183406
+ ll2 18.441000010157175 120.66715161183404
EPSG:3407
ll -30.985259804927132 113.97942223611656
- en 69626.2350952239 -1.9285987758611754E7
+ en 69626.23509522392 -1.9285987758611754E7
ll2 -30.985259804928983 113.97942223611584
EPSG:3408
ll 14.029915387907806 -67.12353635759212
@@ -9631,7 +9631,7 @@ EPSG:3408
EPSG:3409
ll 63.43741087713781 -84.44919915879865
en -1.2343491854085062E7 1199589.7562103607
- ll2 63.437410877137815 -84.44919915879865
+ ll2 63.43741087713781 -84.44919915879865
EPSG:3411
ll 69.74806132169249 48.794738310977124
en 2211233.0676107476 146665.97776669028
@@ -9639,50 +9639,50 @@ EPSG:3411
EPSG:3412
ll 16.404693601449253 -96.84578170804078
en -1.633569511661152E7 -1961153.470471942
- ll2 16.40469360144833 -96.84578170804079
+ ll2 16.404693601448326 -96.84578170804079
EPSG:3413
ll -13.347765070074715 -0.641468759067152
en 1.0888686383430652E7 -1.1135271231159024E7
ll2 -13.347765070073843 -0.6414687590671448
EPSG:3414
ll 11.883716068132756 95.11990438231899
- en -924706.8804460268 1216850.668352316
+ en -924706.8804460268 1216850.6683523157
ll2 11.883716061261085 95.1199044196502
EPSG:3415
ll -6.102175202961085 84.63633050833405
- en -3099218.8699803147 -2274472.469430561
- ll2 -6.102175202853937 84.63633050842
+ en -3099218.869980315 -2274472.469430561
+ ll2 -6.102175202853963 84.63633050841997
EPSG:3416
ll -5.322633505229999 -35.94551921686246
- en -7021845.014243766 -3837710.56072128
- ll2 -5.32263350522998 -35.945519216862444
+ en -7021845.014243773 -3837710.5607212763
+ ll2 -5.322633505229968 -35.94551921686246
EPSG:3417
ll -16.561507277279265 -162.15589518686093
- en -3.013040151768322E7 -6783901.099483034
+ en -3.0130401517683286E7 -6783901.099482973
ll2 -16.561507277279237 -162.15589518686093
EPSG:3418
ll 40.5107077536901 -172.42651367404196
- en -1.7416639906293776E7 9478545.973200133
- ll2 40.51070775369016 -172.42651367404198
+ en -1.741663990629378E7 9478545.97320013
+ ll2 40.510707753690134 -172.42651367404196
EPSG:3419
ll -17.721469905012015 -93.14017874212873
- en 3992191.966135507 -2.3908776667571064E7
- ll2 -17.721469905011972 -93.14017874212873
+ en 3992191.966135508 -2.3908776667571075E7
+ ll2 -17.721469905012 -93.14017874212873
EPSG:3420
ll 70.52027814416724 -77.43076434716478
- en 4485053.843306687 1.486310431915316E7
+ en 4485053.843306695 1.4863104319153173E7
ll2 70.52027814416724 -77.43076434716478
EPSG:3421
ll 73.67174360087171 -107.25018112440583
en 1511814.8328836996 4.051709447442874E7
- ll2 73.67174359430923 -107.25018129685824
+ ll2 73.67174359430925 -107.25018129685824
EPSG:3422
ll 81.05013551862919 -109.10135076981314
en 2070434.514090215 3.662587338662852E7
ll2 81.05013551809898 -109.10135084759702
EPSG:3423
ll -81.14657874553757 -119.42653177986735
- en 2577121.1514911293 -2.9064406259412013E7
+ en 2577121.15149113 -2.9064406259412013E7
ll2 -81.1465787455376 -119.42653177986735
EPSG:3424
ll 83.59512175437138 -70.16953887632381
@@ -9690,47 +9690,47 @@ EPSG:3424
ll2 83.5951217543602 -70.16953887683299
EPSG:3425
ll -6.836025359901683 -40.08352540995509
- en 3.030097548558083E7 -8230872.867101327
- ll2 -6.83602535990168 -40.0835254099551
+ en 3.0300975485580876E7 -8230872.867101295
+ ll2 -6.83602535990168 -40.083525409955094
EPSG:3426
ll 8.273861167596934 -113.45763409808411
en -6669741.023110033 -1.1207569942153338E7
- ll2 8.273861167597104 -113.4576340980841
+ ll2 8.273861167597103 -113.45763409808411
EPSG:3427
ll 59.79271911123823 -45.09427464179993
en 1.122259583984195E7 1.0991006337769425E7
- ll2 59.79271911123872 -45.094274641799934
+ ll2 59.79271911123871 -45.094274641799934
EPSG:3428
ll 87.70307927418193 -129.86285544742736
- en 63000.1541477155 2.5090333274836246E7
- ll2 87.70307927418217 -129.86285544742736
+ en 63000.154147705376 2.50903332748363E7
+ ll2 87.70307927418219 -129.86285544742734
EPSG:3429
ll -66.73506190913574 -115.6151856819077
- en 651559.196016887 -1.0664484867677012E7
- ll2 -66.73506190913653 -115.61518568190773
+ en 651559.1960168931 -1.0664484867677012E7
+ ll2 -66.73506190913653 -115.61518568190769
EPSG:3430
ll -64.53500239862845 -115.47773535358215
- en 1827599.0293629537 -1.6423159792325553E7
- ll2 -64.53500239862903 -115.47773535358213
+ en 1827599.0293629519 -1.6423159792325553E7
+ ll2 -64.53500239862903 -115.47773535358216
EPSG:3431
ll 48.39171252373646 -117.00547035978207
- en 3008002.6449102303 1.809765724784164E7
- ll2 48.39171252373514 -117.00547035978117
+ en 3008002.6449102336 1.809765724784165E7
+ ll2 48.39171252373516 -117.00547035978114
EPSG:3432
ll 0.09284460723323207 -75.36628674813971
- en 175759.06702117936 -1.4072495769785482E7
- ll2 0.09284460723323687 -75.36628674813954
+ en 175759.06702118457 -1.4072495769785486E7
+ ll2 0.0928446072332305 -75.36628674813954
EPSG:3433
ll 63.364194899639116 -10.32847210477405
- en 1.5080097782846058E7 1.712724279547766E7
- ll2 63.364194899639095 -10.32847210477405
+ en 1.5080097782846015E7 1.712724279547766E7
+ ll2 63.36419489963912 -10.32847210477405
EPSG:3434
ll 18.944816956302404 -64.59795224136182
en 1.0982011951116135E7 -2434342.4354147343
ll2 18.944816956302404 -64.59795224136182
EPSG:3435
ll 46.41914402312324 -95.4701214398714
- en -815499.2068121645 3634971.1553288735
+ en -815499.206812165 3634971.155328871
ll2 46.419144011894346 -95.47012142600711
EPSG:3436
ll 4.395583219806028 -85.72474475476187
@@ -9738,143 +9738,143 @@ EPSG:3436
ll2 4.395583219774925 -85.72474475563408
EPSG:3437
ll -31.13433735666151 -71.75025541977746
- en 958096.4934041941 -2.6747897883933485E7
- ll2 -31.134337356661508 -71.75025541977746
+ en 958096.4934041941 -2.6747897883933492E7
+ ll2 -31.134337356661526 -71.75025541977746
EPSG:3438
ll -74.14137691090065 -63.33661201275136
en 1142981.9859636594 -4.198779422449263E7
ll2 -74.14137690546261 -63.3366121567263
EPSG:3439
ll 43.268080072176986 47.10078565465323
- en 183330.3688337985 4797676.478144465
- ll2 43.26808002447523 47.10078561143004
+ en 183330.36883379729 4797676.478144465
+ ll2 43.26808002447524 47.10078561143002
EPSG:3440
ll 11.267021467058086 59.116871210553946
- en 730794.2477152523 1246122.787733196
- ll2 11.267021475627615 59.116871172147185
+ en 730794.2477152532 1246122.7877331967
+ ll2 11.267021475627626 59.11687117214721
EPSG:3441
ll 78.93294417816234 -142.10942521091062
- en -4097277.6485259025 2.0036417042817373E7
- ll2 78.93294417816317 -142.10942521091056
+ en -4097277.6485258797 2.0036417042817343E7
+ ll2 78.93294417816315 -142.10942521091062
EPSG:3442
ll 85.27660684204932 -41.2527619293339
- en 4846618.434177201 2.6287601451329395E7
- ll2 85.27660684204976 -41.252761929333914
+ en 4846618.434177202 2.6287601451329395E7
+ ll2 85.27660684204977 -41.2527619293339
EPSG:3443
ll 70.20279294584208 -90.32979740107294
- en 736602.4433169132 1.2248104562652376E7
- ll2 70.20279294584051 -90.32979740107255
+ en 736602.4433169117 1.2248104562652381E7
+ ll2 70.20279294584051 -90.32979740107258
EPSG:3444
ll -56.21830010302792 -90.75985072272346
- en 2175851.6457305877 -3.3766145547834285E7
- ll2 -56.2183001030283 -90.75985072272346
+ en 2175851.6457305937 -3.3766145547834285E7
+ ll2 -56.218300103028305 -90.75985072272343
EPSG:3445
ll -53.6966358377803 -66.8795322506301
- en 2021247.1823779466 -3.5005256238596275E7
- ll2 -53.69663583663663 -66.87953225114256
+ en 2021247.182377947 -3.5005256238596275E7
+ ll2 -53.69663583663661 -66.87953225114256
EPSG:3446
ll 52.07317439471629 -78.89159248878899
- en -1333536.3492005256 4092781.091393044
- ll2 52.073174379784334 -78.89159245813048
+ en -1333536.3492005288 4092781.091393045
+ ll2 52.07317437978433 -78.89159245813049
EPSG:3447
ll 81.94991316977753 24.013087517745433
- en 542636.6581216238 3953544.95501578
- ll2 81.94991316977823 24.013087517745422
+ en 542636.6581216238 3953544.955015779
+ ll2 81.9499131697782 24.013087517745422
EPSG:3448
ll -9.469556457134523 -155.72437042047616
en -8639164.420642613 -482266.78619817365
- ll2 -9.469556457134493 -155.72437042047616
+ ll2 -9.469556457134493 -155.72437042047613
EPSG:3449
ll -49.38159424967611 -72.90809076552473
en 1087026.6551094363 -5501439.992075356
- ll2 -49.38159422507522 -72.90809082628938
+ ll2 -49.38159422507521 -72.90809082628938
EPSG:3450
ll -89.6502018233969 -82.68336134769663
- en 494778.4780959078 -9959260.84770352
- ll2 -89.6502018234097 -82.68336125483553
+ en 494778.47809590795 -9959260.84770352
+ ll2 -89.6502018234097 -82.6833612548353
EPSG:3451
ll -23.532726944184876 -12.15976750692596
en 4.190600545944153E7 -8047979.54710525
- ll2 -23.532726944184862 -12.15976750692596
+ ll2 -23.53272694418486 -12.15976750692596
EPSG:3452
ll -6.5384482841024365 -173.71981706202948
- en -2.9940400743297372E7 -1139489.5979829035
+ en -2.9940400743297435E7 -1139489.5979827547
ll2 -6.538448284102394 -173.71981706202948
EPSG:3453
ll -15.13104139484016 -156.62759824343254
- en -2.531578192316685E7 -8612560.174590379
+ en -2.5315781923166852E7 -8612560.174590379
ll2 -15.131041394840134 -156.62759824343254
EPSG:3455
ll 0.30393620951542033 -144.7006493436948
en -1.798977301215585E7 -1.1277036582947599E7
- ll2 0.3039362095154497 -144.70064934369483
+ ll2 0.3039362095154497 -144.7006493436948
EPSG:3456
ll 8.813363852980586 -64.712729088152
- en 1.3992669979502564E7 -6717246.004375306
- ll2 8.813363852980624 -64.71272908815197
+ en 1.3992669979502559E7 -6717246.004375306
+ ll2 8.813363852980624 -64.712729088152
EPSG:3457
ll 48.57643277369738 -72.28620682605248
- en 8141465.104244416 7844416.133632753
- ll2 48.57643277369752 -72.28620682605246
+ en 8141465.1042444 7844416.13363274
+ ll2 48.57643277369751 -72.28620682605249
EPSG:3458
ll 6.721433769397233 -118.4319625322766
- en -6124392.956162992 -1.3562895239989685E7
+ en -6124392.956162971 -1.356289523998967E7
ll2 6.721433769397295 -118.4319625322766
EPSG:3459
ll 68.58392737811086 -86.72417022349876
en 4011509.969322594 1.0104842058642292E7
- ll2 68.58392737811172 -86.72417022349876
+ ll2 68.58392737811174 -86.72417022349875
EPSG:3460
ll -84.45024822846737 176.4449754722133
- en 1975110.7575674593 -3501175.5116427178
- ll2 -84.45024822842522 176.44497547218006
+ en 1975110.7575674597 -3501175.511642716
+ ll2 -84.45024822842521 176.44497547217998
EPSG:3461
ll 70.73459484045745 -6.596094366132359
- en 808581.4716327959 7869059.7165172985
- ll2 70.73459481458488 -6.596094531257426
+ en 808581.4716327956 7869059.716517299
+ ll2 70.73459481458488 -6.596094531257427
EPSG:3462
ll -53.59813180666713 -2.05619326391691
en 959158.9250617919 -5961282.372376793
- ll2 -53.59813166980252 -2.0561932613186635
+ ll2 -53.59813166980251 -2.0561932613186626
EPSG:3463
ll 58.98630393640215 -76.03465210556418
en 103168.99583368265 1743385.9413266894
- ll2 58.986303927416145 -76.03465208287722
+ ll2 58.98630392741614 -76.03465208287722
EPSG:3464
ll -42.44355483875933 -60.07110826273677
- en 1245146.5667779816 -9558890.847327834
- ll2 -42.44355480157317 -60.07110836474803
+ en 1245146.5667779814 -9558890.847327836
+ ll2 -42.44355480157318 -60.071108364748056
EPSG:3465
ll -14.06099395967371 -86.89781434430125
en 85028.98886662918 -4930697.996707942
- ll2 -14.060993959673697 -86.89781434430104
+ ll2 -14.060993959673695 -86.89781434430104
EPSG:3466
ll -54.858798375462754 -89.64659644004634
en 462168.4919695121 -9403109.811177606
- ll2 -54.85879837545377 -89.64659644004809
+ ll2 -54.85879837545378 -89.64659644004809
EPSG:3467
ll -10.121502262444565 11.315779879774908
en 6409499.807739797 1.3194985033850841E7
- ll2 -10.121502262444562 11.31577987977491
+ ll2 -10.121502262444562 11.315779879774912
EPSG:3468
ll 56.778481667202094 -133.51413749442688
- en 828000.3747251807 550442.7429966275
- ll2 56.77848166719954 -133.51413749442682
+ en 828000.3747251779 550442.7429966284
+ ll2 56.778481667199564 -133.51413749442685
EPSG:3469
ll -9.158927392744403 -150.57572849576874
- en -445840.77742582746 -7009374.548615992
- ll2 -9.158927387510976 -150.575728452187
+ en -445840.7774258305 -7009374.548615992
+ ll2 -9.158927387510976 -150.57572845218706
EPSG:3470
ll 29.44836309118847 -148.83560202809355
- en 224871.90185754152 -2723328.8003963176
+ en 224871.90185754158 -2723328.8003963167
ll2 29.448363091171505 -148.83560202812646
EPSG:3471
ll 36.07544019685503 -154.41379287455672
- en 102333.85706872435 -1982773.4419073733
- ll2 36.07544019646427 -154.41379287495033
+ en 102333.8570687244 -1982773.4419073716
+ ll2 36.0754401964643 -154.4137928749504
EPSG:3472
ll -26.436940737694208 -152.93660831830667
- en 606060.5051553884 -8910706.962775573
+ en 606060.5051553913 -8910706.962775573
ll2 -26.436940737693703 -152.93660831830658
EPSG:3473
ll -18.845462911951273 -157.52974135539327
@@ -9882,192 +9882,192 @@ EPSG:3473
ll2 -18.845462911951234 -157.5297413553932
EPSG:3474
ll -20.006970310456026 -163.46688862195813
- en 346503.5566103979 -8198906.38723448
- ll2 -20.006970310455856 -163.46688862195788
+ en 346503.5566104009 -8198906.38723448
+ ll2 -20.006970310455852 -163.46688862195788
EPSG:3475
ll -51.36960498617959 -163.06140051924916
- en 704599.4498736458 -1.168205339217843E7
- ll2 -51.369604986117885 -163.0614005192387
+ en 704599.4498736459 -1.168205339217843E7
+ ll2 -51.36960498611787 -163.06140051923876
EPSG:3476
ll -78.70374234282379 -162.48556528053265
- en 663934.5640968536 -1.4735407290938875E7
- ll2 -78.70374234158494 -162.48556535216548
+ en 663934.5640968534 -1.4735407290938877E7
+ ll2 -78.70374234158493 -162.48556535216548
EPSG:3477
ll 80.29563187875151 -139.80564785835216
- en 1781222.7412564922 3630288.101635749
+ en 1781222.7412564922 3630288.101635748
ll2 80.2956318787523 -139.8056478583522
EPSG:3478
ll 2.441624169569039 -110.92080515043662
en 324113.34389434935 -3160634.7520607268
- ll2 2.441624169569038 -110.92080515043698
+ ll2 2.4416241695690384 -110.92080515043696
EPSG:3479
ll 73.89759901841512 -104.32861827222547
- en 1469039.8331771847 1.570663345833825E7
- ll2 73.89759901451758 -104.32861834613932
+ en 1469039.8331771863 1.570663345833825E7
+ ll2 73.89759901451758 -104.32861834613931
EPSG:3480
ll 45.00072893935453 -108.15055051806345
- en 372306.5138925308 1555873.513533841
- ll2 45.00072893934887 -108.15055051805932
+ en 372306.51389253186 1555873.5135338423
+ ll2 45.00072893934888 -108.15055051805933
EPSG:3481
ll 20.228746215411945 -102.33451365459575
- en 3391263.216460373 -3850703.4266941976
- ll2 20.228746211138937 -102.33451365438272
+ en 3391263.2164603733 -3850703.426694196
+ ll2 20.22874621113894 -102.33451365438272
EPSG:3482
ll -13.742475389139699 -104.43122009183224
- en 1225138.0921486472 -4970171.377007308
- ll2 -13.742475377421616 -104.4312201411517
+ en 1225138.0921486458 -4970171.377007308
+ ll2 -13.742475377421618 -104.43122014115173
EPSG:3483
ll -82.6730554031981 -123.3884196256042
- en 251668.15879731404 -4.14212477436086E7
- ll2 -82.67305540467228 -123.38841891262769
+ en 251668.15879731433 -4.14212477436086E7
+ ll2 -82.67305540467233 -123.38841891262771
EPSG:3484
ll -18.15635562210425 -169.46797442916605
- en -1.078677048641096E7 -2093745.3773290091
- ll2 -18.156355622104204 -169.46797442916596
+ en -1.078677048641098E7 -2093745.3773289907
+ ll2 -18.156355622104215 -169.46797442916602
EPSG:3485
ll 23.53837753596389 -98.69060242883582
- en -975054.642753693 -3878712.0387707627
- ll2 23.538377535963704 -98.69060242883582
+ en -975054.6427536942 -3878712.038770758
+ ll2 23.538377535963743 -98.69060242883582
EPSG:3486
ll 88.66840036909501 -18.113067422292914
en 1136443.1542913588 9167895.190724947
ll2 88.66840036909515 -18.113067422292943
EPSG:3487
ll 63.3705644218023 -77.94690434926537
- en 4014706.4825846194 1.3261622637262443E7
- ll2 63.370564421802975 -77.94690434926537
+ en 4014706.4825846185 1.3261622637262449E7
+ ll2 63.37056442180298 -77.94690434926537
EPSG:3488
ll -67.62358718857561 -125.43072634415131
- en -950648.6768179178 -8265379.508935452
- ll2 -67.62358718857635 -125.43072634415128
+ en -950648.6768179171 -8265379.508935456
+ ll2 -67.62358718857651 -125.43072634415128
EPSG:3489
ll 10.700536279365654 -145.98996824967776
- en -940695.7092484552 -2414658.9862327175
- ll2 10.700536279365686 -145.98996824967776
+ en -940695.7092484557 -2414658.9862327175
+ ll2 10.700536279365682 -145.98996824967776
EPSG:3490
ll -17.8003536057733 -95.08933285471139
en 2.152441404712621E7 -2.074644830705852E7
- ll2 -17.800353605773264 -95.08933285471139
+ ll2 -17.800353605773264 -95.0893328547114
EPSG:3491
ll 45.06811536826507 -66.07803968477985
en 6154200.777454782 2643259.6907573347
- ll2 45.0681153682652 -66.07803968477987
+ ll2 45.0681153682652 -66.07803968477988
EPSG:3492
ll -0.20392710310910545 -144.5760238811942
en -3560667.273427123 -1.1953034756883712E7
- ll2 -0.20392710310905204 -144.57602388119417
+ ll2 -0.20392710310905207 -144.57602388119417
EPSG:3493
ll 4.320027229791073 -86.96951778250107
- en 6261985.8142241035 -2496200.123339587
- ll2 4.320027229791105 -86.96951778250109
+ en 6261985.814224105 -2496200.1233395855
+ ll2 4.320027229791107 -86.96951778250107
EPSG:3494
ll 35.421825776609744 -120.58844085259862
en 6535295.57135235 1247768.1379976775
- ll2 35.42182577660992 -120.58844085259862
+ ll2 35.421825776609914 -120.58844085259862
EPSG:3495
ll -2.487244817082427 -54.319481583129686
- en 1.0266460575930107E7 -1126599.1279805307
- ll2 -2.487244817082394 -54.31948158312967
+ en 1.0266460575930104E7 -1126599.1279805321
+ ll2 -2.487244817082394 -54.3194815831297
EPSG:3496
ll 24.922552060216447 -116.81257540069748
en 7301085.205102579 -2166001.2256517876
ll2 24.92255206021618 -116.81257540069748
EPSG:3497
ll -24.517261906002172 -178.27422294546133
- en -7626348.784133954 -4239817.7965246355
- ll2 -24.517261906001874 -178.2742229454608
+ en -7626348.784133967 -4239817.796524632
+ ll2 -24.51726190600191 -178.27422294546136
EPSG:3498
ll 29.909374807336967 -129.3562235078399
- en 2958906.7103218497 536013.3076070434
- ll2 29.909374807335702 -129.3562235078399
+ en 2958906.7103218487 536013.3076070525
+ ll2 29.9093748073357 -129.3562235078399
EPSG:3499
ll -23.503951131957777 -134.0626340540275
- en -912100.399954713 -6543623.967185845
- ll2 -23.503951131957564 -134.0626340540275
+ en -912100.3999547143 -6543623.9671858465
+ ll2 -23.503951131957574 -134.0626340540275
EPSG:3500
ll 1.2362716112853853 -171.06191885716407
- en -1.5570074307503494E7 -4237391.815024724
- ll2 1.2362716112854237 -171.06191885716402
+ en -1.5570074307503523E7 -4237391.81502471
+ ll2 1.2362716112854237 -171.06191885716404
EPSG:3501
ll -11.464043228610239 -69.6184070813834
- en 6379112.972160447 -4805180.619590135
- ll2 -11.4640432286102 -69.6184070813834
+ en 6379112.972160462 -4805180.619590138
+ ll2 -11.464043228610198 -69.61840708138341
EPSG:3502
ll 6.3676835805569425 -36.12518772880617
- en 2.9488649048028857E7 -424165.6292301988
- ll2 6.367683580557013 -36.12518772880617
+ en 2.948864904802888E7 -424165.6292301524
+ ll2 6.367683580556999 -36.12518772880617
EPSG:3503
ll 75.49438629255329 -90.73831635876248
en 1457352.263450617 4719481.419460611
- ll2 75.49438629255422 -90.73831635876248
+ ll2 75.49438629255422 -90.7383163587625
EPSG:3504
ll -8.407171726928286 -23.113953042767548
en 3.8709930163534485E7 -597556.5892354485
- ll2 -8.407171726928414 -23.113953042767548
+ ll2 -8.407171726928416 -23.113953042767545
EPSG:3505
ll -17.36391002305864 -24.661595733526298
- en 1.2589108963154774E7 -1284584.9817036213
- ll2 -17.36391002305861 -24.66159573352627
+ en 1.2589108963154752E7 -1284584.9817036442
+ ll2 -17.36391002305858 -24.661595733526294
EPSG:3506
ll 8.366471414978164 -148.0632128168823
- en -1.3784313934180701E7 -5848370.100090056
- ll2 8.366471414978347 -148.0632128168823
+ en -1.3784313934180677E7 -5848370.10009007
+ ll2 8.366471414978346 -148.0632128168823
EPSG:3507
ll 43.177152073631035 -24.317803735754723
en 4041165.646138477 1488147.8896570343
- ll2 43.1771520736311 -24.31780373575472
+ ll2 43.177152073631106 -24.31780373575472
EPSG:3508
ll 51.721320560498924 -14.333439901118453
en 1.3465562244713208E7 8872896.556407215
ll2 51.72132056049917 -14.333439901118448
EPSG:3509
ll 33.67366435466222 -80.14717966271657
- en -238882.6719025242 -469971.78472781146
- ll2 33.673664354168174 -80.14717966333447
+ en -238882.67190252664 -469971.78472780995
+ ll2 33.67366435416819 -80.1471796633345
EPSG:3510
ll -70.79717182032516 -82.57754799848695
- en -204854.36947930197 -3.963531624934943E7
- ll2 -70.79717181582477 -82.57754795676317
+ en -204854.36947930386 -3.963531624934943E7
+ ll2 -70.79717181582478 -82.57754795676318
EPSG:3511
ll -16.15282055634917 -80.66827834302356
en 235476.59260122592 -4478528.257961152
- ll2 -16.152820556349166 -80.66827834302356
+ ll2 -16.152820556349162 -80.66827834302356
EPSG:3512
ll -56.122834698728795 -83.99193655457609
- en 45801.23036091056 -2.925833573194345E7
- ll2 -56.12283469866259 -83.99193655457549
+ en 45801.23036091065 -2.925833573194345E7
+ ll2 -56.122834698662594 -83.99193655457549
EPSG:3513
ll 23.496576570118393 15.45046219395772
- en 9497682.078746371 3825483.616906656
- ll2 23.496576570118187 15.45046219395772
+ en 9497682.07874637 3825483.6169066573
+ ll2 23.49657657011819 15.45046219395772
EPSG:3514
ll -2.401856999262357 -140.78775765814552
en -6403486.471235409 -1903207.3254296985
ll2 -2.401856999262319 -140.78775765814552
EPSG:3515
ll 84.06354323244639 -106.7069279764339
- en -115568.62789978847 2.5889761146141466E7
- ll2 84.06354323244686 -106.7069279764339
+ en -115568.62789978884 2.5889761146141466E7
+ ll2 84.06354323244689 -106.7069279764339
EPSG:3516
ll 46.0515012797872 -81.23032543751515
- en 259562.62368591904 2409747.8216436543
- ll2 46.05150127978725 -81.2303254375151
+ en 259562.623685919 2409747.8216436566
+ ll2 46.051501279787274 -81.2303254375151
EPSG:3517
ll -19.695630247954455 -86.97762325474424
- en -1057636.556634185 -1.6004741459448265E7
- ll2 -19.69563024772963 -86.97762325485293
+ en -1057636.5566341798 -1.6004741459448267E7
+ ll2 -19.695630247729625 -86.97762325485289
EPSG:3518
ll -73.17814949005167 -75.99567737788082
- en 399073.12595721683 -1.145284488295327E7
- ll2 -73.17814948866818 -75.99567738914037
+ en 399073.12595721707 -1.1452844882953273E7
+ ll2 -73.17814948866821 -75.99567738914035
EPSG:3519
ll -64.21669025111869 -84.75140202846548
- en 244565.6547620048 -3.4270365130743824E7
- ll2 -64.21669025109959 -84.7514020284627
+ en 244565.65476200494 -3.427036513074383E7
+ ll2 -64.2166902510996 -84.7514020284627
EPSG:3520
ll 46.238713817845706 -84.11126909409906
- en 704272.3598042307 1802327.6818204457
- ll2 46.23871381784582 -84.11126909409904
+ en 704272.3598042297 1802327.6818204457
+ ll2 46.23871381784582 -84.11126909409906
EPSG:3521
ll 15.061099209604222 -84.48990214269142
en 2182571.3315496244 -5427063.733979271
@@ -10075,71 +10075,71 @@ EPSG:3521
EPSG:3522
ll -45.13818628655267 -105.82238019365538
en 1143180.1418632865 -9647054.094403809
- ll2 -45.13818626297688 -105.82238024160891
+ ll2 -45.13818626297687 -105.82238024160891
EPSG:3523
ll 57.180607280165674 -116.59695797499657
- en 1125237.0814072276 5670309.182849549
- ll2 57.18060728013825 -116.59695797499764
+ en 1125237.0814072276 5670309.182849552
+ ll2 57.18060728013824 -116.59695797499764
EPSG:3524
ll -66.59759272267667 -102.90257576298782
en 609517.6644477892 -1.203393066632528E7
ll2 -66.59759269393182 -102.90257616299945
EPSG:3525
ll -64.63760851959596 -116.71730135311739
- en -57172.63732699976 -3.869000516095582E7
+ en -57172.63732700014 -3.869000516095582E7
ll2 -64.63760851902902 -116.71730135250948
EPSG:3526
ll -38.40520553542128 -115.584785997475
- en 814429.9859362768 -8866511.27315756
- ll2 -38.40520553542132 -115.58478599747498
+ en 814429.9859362757 -8866511.27315756
+ ll2 -38.40520553542131 -115.584785997475
EPSG:3527
ll 47.58368282254219 -108.17849787756961
- en 4492666.033054632 2248463.1598972753
- ll2 47.58368280626737 -108.1784979055406
+ en 4492666.033054635 2248463.159897278
+ ll2 47.58368280626737 -108.17849790554057
EPSG:3528
ll -29.075149955989254 -83.00791790347479
- en 818910.7297140909 -7288676.825412204
- ll2 -29.07514995530044 -83.00791790228635
+ en 818910.7297140895 -7288676.825412204
+ ll2 -29.075149955300446 -83.00791790228637
EPSG:3529
ll 69.55715369107216 -95.00133107643467
- en 132636.59612211562 1.2054238184845345E7
- ll2 69.55715368759411 -95.00133105500852
+ en 132636.59612211544 1.2054238184845345E7
+ ll2 69.55715368759411 -95.00133105500854
EPSG:3530
ll 15.53251510650307 -93.50131253675484
- en 342106.9515371459 -2338677.436345532
- ll2 15.532515106489095 -93.50131253670091
+ en 342106.95153714286 -2338677.436345532
+ ll2 15.532515106489095 -93.50131253670094
EPSG:3531
ll -56.65750281594887 -99.44743071869392
- en 432554.9515617103 -3.405262936488748E7
- ll2 -56.65750276485743 -99.447430409135
+ en 432554.95156170725 -3.405262936488748E7
+ ll2 -56.65750276485744 -99.44743040913501
EPSG:3532
ll 33.5936130079441 -75.83272884998115
en 1014522.3130646242 -139719.56132269057
- ll2 33.59361297484767 -75.83272892567967
+ ll2 33.59361297484767 -75.83272892567966
EPSG:3533
ll 15.624576267360553 -90.06382119296605
- en -1220137.2034739957 -7115921.782580589
- ll2 15.62457626727887 -90.06382119275047
+ en -1220137.2034740006 -7115921.782580587
+ ll2 15.624576267278877 -90.0638211927505
EPSG:3534
ll -39.90046950642374 -93.8072764246625
- en 324768.4506774129 -8341900.054429164
- ll2 -39.90046950038372 -93.80727642303525
+ en 324768.4506774128 -8341900.054429164
+ ll2 -39.90046950038373 -93.80727642303525
EPSG:3535
ll 41.11784842303382 -94.63328163147143
en 871684.5382297065 2228388.045185478
- ll2 41.11784841042437 -94.63328161929049
+ ll2 41.11784841042437 -94.6332816192905
EPSG:3536
ll -4.8145630890037765 -28.260388665073066
- en 1.0417962318631632E7 -1105746.0793309398
- ll2 -4.814563089003748 -28.260388665073055
+ en 1.0417962318631645E7 -1105746.0793309254
+ ll2 -4.814563089003748 -28.260388665073062
EPSG:3537
ll 76.36246736421842 -138.94924050466702
- en 86959.85407346662 1.8334024130433988E7
- ll2 76.36246736421934 -138.94924050466702
+ en 86959.85407348267 1.833402413043397E7
+ ll2 76.36246736421934 -138.94924050466705
EPSG:3538
ll 77.06452553452628 -50.41541160305081
- en 1893103.8853288328 4850386.913348883
- ll2 77.06452553452718 -50.4154116030508
+ en 1893103.8853288307 4850386.913348887
+ ll2 77.0645255345272 -50.41541160305081
EPSG:3539
ll 5.043108147998854 -30.86888553748736
en 2.6646458530392125E7 -4135270.726125431
@@ -10147,34 +10147,34 @@ EPSG:3539
EPSG:3540
ll 61.5558196273394 -102.37942569651105
en 145552.3864587984 2661006.5702218707
- ll2 61.555819627339986 -102.37942569651103
+ ll2 61.55581962733998 -102.37942569651105
EPSG:3541
ll 6.418956213978131 -88.60627267442091
- en 5268700.598285139 -1.2024035300040277E7
+ en 5268700.598285132 -1.202403530004028E7
ll2 6.418956213978185 -88.6062726744209
EPSG:3542
ll 71.07172750491365 -159.78473467609422
- en -2190080.2174402354 5380691.597490372
- ll2 71.0717275049146 -159.78473467609425
+ en -2190080.2174402457 5380691.597490372
+ ll2 71.0717275049146 -159.78473467609427
EPSG:3543
ll 70.28843656665295 -106.56733179994659
- en 79537.54416124318 1.4451155703154378E7
- ll2 70.28843656665386 -106.56733179994657
+ en 79537.5441612405 1.4451155703154394E7
+ ll2 70.28843656665387 -106.56733179994659
EPSG:3544
ll 26.649658290038992 -37.96637330061969
en 5006765.369976455 -55341.18134794594
- ll2 26.6496582900385 -37.96637330061968
+ ll2 26.6496582900385 -37.96637330061967
EPSG:3545
ll 72.7811838695077 -82.69288645843677
- en 1857444.3148937188 1.3887127320378361E7
- ll2 72.7811838695087 -82.69288645843677
+ en 1857444.3148937188 1.3887127320378356E7
+ ll2 72.78118386950864 -82.69288645843677
EPSG:3546
ll -0.4477716328843684 -122.69599553587113
- en -3422564.7852196805 -2396485.0189382327
- ll2 -0.44777163288435656 -122.69599553587113
+ en -3422564.785219676 -2396485.01893823
+ ll2 -0.44777163288434374 -122.69599553587115
EPSG:3547
ll 48.064417004532714 -130.2756762786753
- en -5733220.6324726585 1.0167106888184011E7
+ en -5733220.632472665 1.0167106888184007E7
ll2 48.06441700453285 -130.2756762786753
EPSG:3548
ll 75.71442088932288 -15.905555167609634
@@ -10182,32 +10182,32 @@ EPSG:3548
ll2 75.7144208893238 -15.905555167609634
EPSG:3549
ll 20.489319463834335 -45.22457401869691
- en 1.5647466945954133E7 -1154335.063187868
- ll2 20.489319463834278 -45.2245740186969
+ en 1.5647466945954127E7 -1154335.0631878634
+ ll2 20.489319463834295 -45.22457401869691
EPSG:3550
ll 13.259599714770033 -52.99845718807177
en 5402664.360601122 -1133049.7897307244
- ll2 13.259599714770053 -52.99845718807177
+ ll2 13.259599714770053 -52.99845718807176
EPSG:3551
ll 63.790701436153064 -30.264281793068136
en 1.4831552713601097E7 1.628764487547656E7
- ll2 63.79070143615378 -30.264281793068147
+ ll2 63.790701436153775 -30.26428179306815
EPSG:3552
ll -17.459568351833244 -114.96188205202168
- en -2468398.4506999846 -5359537.486001881
- ll2 -17.459568351833216 -114.96188205202165
+ en -2468398.450700003 -5359537.486001891
+ ll2 -17.459568351833216 -114.96188205202168
EPSG:3553
ll -4.158645240447537 -9.550289560001488
- en 3.562450350643122E7 -531897.5841467425
- ll2 -4.158645240447503 -9.550289560001474
+ en 3.562450350643126E7 -531897.5841465892
+ ll2 -4.158645240447478 -9.550289560001504
EPSG:3554
ll 7.0735793945017065 -74.1009426261075
- en -50396.138815101 -4033043.5303058904
- ll2 7.0735793944006256 -74.10094262462131
+ en -50396.13881510252 -4033043.5303058904
+ ll2 7.073579394400624 -74.10094262462134
EPSG:3555
ll 59.26290959057846 -59.21825980150858
- en 1192838.8749106182 1748712.3630531162
- ll2 59.262909558385935 -59.21825998044469
+ en 1192838.874910618 1748712.363053119
+ ll2 59.26290955838596 -59.2182599804447
EPSG:3556
ll -38.730347615679015 -75.67053093853383
en -160602.99117887882 -9045931.745417954
@@ -10218,8 +10218,8 @@ EPSG:3557
ll2 -2.7297588110655986 -61.04288565745596
EPSG:3558
ll -34.349368112043436 -63.2046243520432
- en 1541096.0621902598 -8568376.860013463
- ll2 -34.34936810689569 -63.20462435002073
+ en 1541096.0621902603 -8568376.86001346
+ ll2 -34.34936810689568 -63.204624350020744
EPSG:3559
ll 65.03004383374613 -71.44035444483136
en 697672.0579191988 3173939.0051292265
@@ -10231,23 +10231,23 @@ EPSG:3560
EPSG:3561
ll 82.9354045666615 -151.93241827963934
en 659730.7217919582 2.339608788694349E7
- ll2 82.93540449163778 -151.93241721305182
+ ll2 82.9354044916378 -151.93241721305182
EPSG:3562
ll -10.001551782905452 -148.53738688947135
en 3432514.4716097973 -1.1043166048457198E7
ll2 -10.001551757385565 -148.5373869915845
EPSG:3563
ll -83.69066018877388 -156.9220923914854
- en 542462.4096705952 -3.818446789054282E7
- ll2 -83.69066019126954 -156.9220924656976
+ en 542462.4096705962 -3.818446789054283E7
+ ll2 -83.69066019126957 -156.92209246569757
EPSG:3564
ll -50.20586826624992 -153.10161830085337
en 1997098.19492911 -2.6241512807122823E7
- ll2 -50.205868288541865 -153.10161837909135
+ ll2 -50.205868288541865 -153.10161837909132
EPSG:3565
ll 50.79409826080396 -164.94805141453816
- en -606709.2107020564 1.0641376221838962E7
- ll2 50.79409815627475 -164.9480512824575
+ en -606709.2107020499 1.064137622183896E7
+ ll2 50.79409815627474 -164.94805128245744
EPSG:3566
ll 79.2665559900964 -49.43735317060498
en 7390644.607086635 2.5312710084914997E7
@@ -10255,26 +10255,26 @@ EPSG:3566
EPSG:3567
ll 6.985545940807903 -151.3903935534382
en -1.4387685391964426E7 2006918.181212262
- ll2 6.985545940807938 -151.3903935534382
+ ll2 6.9855459408079374 -151.3903935534382
EPSG:3568
ll 28.217135968912814 -169.24719999590275
- en -1.6044953186934667E7 4934792.0139085995
- ll2 28.21713596891202 -169.24719999590275
+ en -1.6044953186934682E7 4934792.0139086135
+ ll2 28.21713596891202 -169.24719999590278
EPSG:3569
ll 24.21853835954039 -59.355223640827106
- en 1.8632276901489183E7 6458392.801625647
- ll2 24.21853835954019 -59.3552236408271
+ en 1.8632276901489187E7 6458392.801625642
+ ll2 24.21853835954017 -59.35522364082713
EPSG:3570
ll 65.28507670710543 -42.08740986593193
en 1.2808922894047802E7 2.5098408331824943E7
- ll2 65.28507670710617 -42.087409865931924
+ ll2 65.28507670710619 -42.087409865931924
EPSG:3571
ll 64.89964936582356 170.5317439480662
en -457227.6665739163 -2741615.032569975
ll2 64.89964936164473 170.5317439480662
EPSG:3572
ll 80.65412551155194 -36.295596276000964
- en 954663.40670505 419155.45358554856
+ en 954663.40670505 419155.4535855484
ll2 80.65412550591607 -36.29559627600095
EPSG:3573
ll -64.1444437814515 -139.25591996218657
@@ -10283,7 +10283,7 @@ EPSG:3573
EPSG:3574
ll -79.21995095992453 -64.95019752248338
en -5350993.180484241 -1.1501332058751125E7
- ll2 -79.21995095376043 -64.95019752248338
+ ll2 -79.21995095376045 -64.95019752248338
EPSG:3575
ll -57.24760170920752 24.22564317410226
en 3003306.07375122 -1.1846652341148507E7
@@ -10295,63 +10295,63 @@ EPSG:3576
EPSG:3577
ll 75.16436397991066 25.748997302526107
en -1.5032076950837223E7 -1750668.8653987835
- ll2 75.16436397991168 25.748997302526107
+ ll2 75.16436397991168 25.74899730252612
EPSG:3578
ll 7.650476268304587 21.67246228608596
- en 6269532.981529447 1.086874016784783E7
- ll2 7.650476268304611 21.67246228608596
+ en 6269532.981529595 1.0868740167847779E7
+ ll2 7.6504762683046055 21.67246228608596
EPSG:3579
ll -61.84796774100545 -70.16195012379792
- en 1.1332301755889906E7 -3059701.6726515684
- ll2 -61.84796774100604 -70.16195012379794
+ en 1.1332301755889898E7 -3059701.6726516536
+ ll2 -61.84796774100609 -70.16195012379794
EPSG:3580
ll 74.20254727493595 -140.2961482350721
- en -838766.9274933798 9899113.200109594
+ en -838766.92749338 9899113.200109594
ll2 74.20254727493594 -140.2961482350721
EPSG:3581
ll 82.28414310763898 -98.39265192463365
- en 214164.50433679592 1.0657955754081015E7
- ll2 82.28414310763962 -98.39265192463365
+ en 214164.50433679586 1.0657955754081015E7
+ ll2 82.28414310763965 -98.39265192463367
EPSG:3582
ll 21.060922413393108 -6.880022872821087
- en 2.3940006760597542E7 3005443.728233129
- ll2 21.060922413393037 -6.8800228728211
+ en 2.3940006760597542E7 3005443.7282331334
+ ll2 21.060922413393055 -6.880022872821087
EPSG:3583
ll 16.121190955990365 -33.499182664906
- en 4697140.579692931 -1934424.0892551907
- ll2 16.121190955990375 -33.49918266490599
+ en 4697140.579692929 -1934424.0892551907
+ ll2 16.12119095599037 -33.49918266490601
EPSG:3584
ll 19.960509717789492 -106.5189185233177
en -1.117818267359316E7 -5123522.548078061
ll2 19.960509717789463 -106.5189185233177
EPSG:3585
ll 31.855639383411898 -88.60092373838849
- en -1432701.9616138376 -106485.2890752788
- ll2 31.855639383410068 -88.60092373838849
+ en -1432701.9616138374 -106485.2890752774
+ ll2 31.85563938341007 -88.60092373838849
EPSG:3586
ll 66.48302236704848 -75.54976828665345
- en -4859.192213472593 1.2097437956325646E7
- ll2 66.48302236704929 -75.54976828665346
+ en -4859.192213470302 1.2097437956325646E7
+ ll2 66.48302236704929 -75.54976828665345
EPSG:3587
ll 41.369154248668984 -160.81911776815153
en 499682.08141631074 2586410.041114721
- ll2 41.36915424866905 -160.8191177681515
+ ll2 41.36915424866906 -160.81911776815156
EPSG:3588
ll 47.18436247742534 -108.80175821561852
- en 1.3696207870541202E7 2319404.8728381568
- ll2 47.18436247742548 -108.80175821561852
+ en 1.369620787054121E7 2319404.8728381586
+ ll2 47.18436247742551 -108.8017582156185
EPSG:3589
ll 37.28284815989783 -146.42378592584734
- en 3154034.375096215 1069647.9599439956
- ll2 37.28284815989796 -146.42378592584734
+ en 3154034.375096216 1069647.9599439893
+ ll2 37.28284815989797 -146.4237859258473
EPSG:3590
ll 30.465837040951016 -15.88503950310573
- en 4.646549931837821E7 4448310.600148394
- ll2 30.465837040949516 -15.88503950310573
+ en 4.646549931837821E7 4448310.600148364
+ ll2 30.465837040949516 -15.885039503105718
EPSG:3591
ll 42.46233270434987 -86.7053522716931
- en 441880.19829270244 212613.54240777437
- ll2 42.462332704349784 -86.70535227169312
+ en 441880.19829270244 212613.54240777623
+ ll2 42.46233270434979 -86.70535227169312
EPSG:3592
ll -12.534396778183787 -63.32235346680068
en 7463249.494951844 -6534657.958745243
@@ -10359,10 +10359,10 @@ EPSG:3592
EPSG:3593
ll 40.29076763266216 -132.4627381359023
en 412255.6704835428 3291935.148241166
- ll2 40.290767632662245 -132.4627381359023
+ ll2 40.29076763266224 -132.4627381359023
EPSG:3594
ll 42.15949511507187 -41.200710791689545
- en 4873865.323169148 1201726.5149230952
+ en 4873865.323169148 1201726.5149230945
ll2 42.15949511507196 -41.20071079168955
EPSG:3595
ll 2.8932183560733318 -14.208527313911503
@@ -10374,24 +10374,24 @@ EPSG:3596
ll2 79.73957403349803 -23.644552894512497
EPSG:3597
ll 6.406938619636875 -94.0704127137977
- en -280136.60448265006 -2553124.4260994256
- ll2 6.406938619506088 -94.0704127116974
+ en -280136.60448265006 -2553124.4260994266
+ ll2 6.406938619506088 -94.07041271169743
EPSG:3598
ll -21.24653435260153 -85.1841340493917
- en 2227533.19874459 -1.8435522907087635E7
- ll2 -21.24653435256594 -85.18413404935612
+ en 2227533.198744594 -1.8435522907087635E7
+ ll2 -21.24653435256593 -85.1841340493561
EPSG:3599
ll 61.86458319383692 -94.24612366070996
- en 494166.4535495067 3603171.621662716
+ en 494166.4535495059 3603171.6216627136
ll2 61.864583193565544 -94.24612366057411
EPSG:3600
ll 72.96556142684824 -88.81802042806899
- en 2459181.3679815703 1.586471122120446E7
- ll2 72.96556142684891 -88.818020428069
+ en 2459181.367981569 1.5864711221204454E7
+ ll2 72.96556142684888 -88.81802042806902
EPSG:3601
ll 81.57533849891843 -101.08230812572656
- en 360079.53366644244 5104047.139767486
- ll2 81.57533849857487 -101.08230788001372
+ en 360079.53366644226 5104047.139767484
+ ll2 81.57533849857487 -101.08230788001374
EPSG:3602
ll -69.22985711161998 -90.8495991733654
en 236159.61481109116 -1.1649378379611496E7
@@ -10399,155 +10399,155 @@ EPSG:3602
EPSG:3603
ll -82.4236391035292 -98.79604823701015
en 786798.602048143 -1.3161393388341343E7
- ll2 -82.42363910351207 -98.79604823653978
+ ll2 -82.42363910351209 -98.79604823653979
EPSG:3604
ll 19.918756252814582 -85.02864257392316
- en 3385075.9022226017 -2363177.8876996124
- ll2 19.918756252814557 -85.02864257392315
+ en 3385075.902222601 -2363177.887699614
+ ll2 19.918756252814557 -85.02864257392316
EPSG:3605
ll 31.376770883675277 -153.07932797024552
- en -1.1385949117005022E7 -937645.1822845703
+ en -1.1385949117005026E7 -937645.1822845611
ll2 31.37677088367341 -153.07932797024552
EPSG:3606
ll 61.22145737260993 -160.60868958120668
- en -2708330.5615570494 3600302.428148907
- ll2 61.22145737261051 -160.60868958120662
+ en -2708330.561557052 3600302.42814891
+ ll2 61.22145737261051 -160.6086895812067
EPSG:3607
ll -67.02808767576461 -109.50333758096914
en 811505.6651360723 -5301175.19993842
- ll2 -67.0280876689905 -109.503337620041
+ ll2 -67.0280876689905 -109.50333762004102
EPSG:3608
ll -52.46016874440112 -114.99421916887599
en 2013327.3485358313 -1.2013608066286618E7
ll2 -52.46016874439923 -114.99421916887518
EPSG:3609
ll 78.47566910172716 -114.31096906864977
- en 228383.59157024045 1.2867905059196807E7
- ll2 78.47566910172797 -114.31096906864977
+ en 228383.59157024042 1.2867905059196807E7
+ ll2 78.47566910172797 -114.31096906864978
EPSG:3610
ll 86.64558556371384 -115.73764001089761
en 652858.4370372633 4.520944743438677E7
ll2 86.64558556371416 -115.73764001089761
EPSG:3611
ll 12.237460956150585 -122.65949211260886
- en 356189.05601508514 1510094.612709703
- ll2 12.237460956108867 -122.65949211232227
+ en 356189.0560150806 1510094.612709703
+ ll2 12.237460956108865 -122.65949211232231
EPSG:3612
ll 56.82623949166222 -119.41959620695135
- en 2457172.535756424 2.1173751491342667E7
- ll2 56.8262394916626 -119.41959620695137
+ en 2457172.535756427 2.1173751491342667E7
+ ll2 56.82623949166259 -119.41959620695134
EPSG:3613
ll -83.47615147152405 -72.91687617477749
- en 284136.90096998046 -1.3980204767690936E7
- ll2 -83.47615147152466 -72.9168761747775
+ en 284136.90096998063 -1.3980204767690936E7
+ ll2 -83.47615147152463 -72.91687617477749
EPSG:3614
ll -16.28935187832539 -80.24801629439142
en -2034300.052256327 -2.1417451942044254E7
- ll2 -16.289351871245785 -80.24801627859902
+ ll2 -16.289351871245778 -80.24801627859902
EPSG:3615
ll 43.515415746278876 -75.93228466960605
- en 34201.984293161266 520924.44059511845
- ll2 43.515415746278265 -75.93228466960683
+ en 34201.984293161266 520924.44059511775
+ ll2 43.51541574627825 -75.93228466960683
EPSG:3616
ll -4.072818026918426 -67.16494127390702
en 3171356.126123919 -1.5595806341864634E7
- ll2 -4.072818026042511 -67.16494129373643
+ ll2 -4.072818026042505 -67.16494129373643
EPSG:3617
ll -45.889604222199345 -105.82075422615553
- en 533313.5185689161 -8514027.852500856
- ll2 -45.88960422219945 -105.82075422615553
+ en 533313.5185689151 -8514027.852500856
+ ll2 -45.889604222199445 -105.82075422615554
EPSG:3618
ll -59.10670177163181 -113.79424470946174
- en 224312.15371779978 -3.2837762899782315E7
+ en 224312.15371780266 -3.2837762899782315E7
ll2 -59.10670175674978 -113.79424465867628
EPSG:3619
ll -51.941247980423185 -106.37524313695208
- en 24602.048633265018 -9188915.670018338
- ll2 -51.94124798041637 -106.3752431369543
+ en 24602.048633264058 -9188915.67001834
+ ll2 -51.94124798041641 -106.3752431369543
EPSG:3620
ll -35.64957645504849 -96.72882296636764
- en 2802683.1767819254 -2.429035682233992E7
- ll2 -35.649576445634445 -96.72882296836444
+ en 2802683.176781929 -2.429035682233992E7
+ ll2 -35.64957644563444 -96.72882296836441
EPSG:3621
ll -41.80904907090286 -111.87692084650686
- en 493982.5948620219 -8068641.702705471
- ll2 -41.80904907057701 -111.87692084666988
+ en 493982.59486202186 -8068641.702705471
+ ll2 -41.80904907057701 -111.87692084666989
EPSG:3622
ll 57.98063861620432 -100.91836574834193
- en 4063811.45657949 9904344.54580488
- ll2 57.98063860687883 -100.91836577035025
+ en 4063811.456579496 9904344.545804875
+ ll2 57.98063860687881 -100.91836577035022
EPSG:3623
ll 7.30652526428203 -82.6488037353071
- en -420938.64641463594 -3616815.811361076
- ll2 7.306525263886664 -82.64880373040313
+ en -420938.64641463757 -3616815.811361076
+ ll2 7.306525263886663 -82.64880373040313
EPSG:3624
ll -26.94495154365029 -74.6805254400642
- en 1440166.6493418554 -2.431759823674085E7
- ll2 -26.944951543648607 -74.68052544006144
+ en 1440166.6493418599 -2.431759823674085E7
+ ll2 -26.9449515436486 -74.68052544006142
EPSG:3625
ll -7.2867268740106255 -74.98036704897757
- en 96959.49310551415 -5105287.324029927
- ll2 -7.286726874010685 -74.98036704897756
+ en 96959.49310551415 -5105287.324029928
+ ll2 -7.286726874010689 -74.98036704897756
EPSG:3626
ll -77.69806979947857 -68.32837378090503
- en 973017.6954409183 -4.243612123651732E7
- ll2 -77.69806979889366 -68.32837379281955
+ en 973017.6954409183 -4.243612123651733E7
+ ll2 -77.69806979889368 -68.32837379281953
EPSG:3627
ll -18.87441777107169 -77.1875595844288
- en -255939.3059880035 -7808471.323389343
- ll2 -18.874417771071617 -77.18755958442878
+ en -255939.30598800606 -7808471.323389343
+ ll2 -18.874417771071617 -77.1875595844288
EPSG:3628
ll 3.108505522230793 -141.30927324373334
en -2.606130473954278E7 -3497937.5383234927
- ll2 3.1085055222308413 -141.30927324373334
+ ll2 3.1085055222308418 -141.30927324373334
EPSG:3629
ll 78.97097179817723 -81.77143157829946
- en 281922.70397604915 4342301.542437978
- ll2 78.97097179816902 -81.77143157826832
+ en 281922.703976049 4342301.54243798
+ ll2 78.97097179816905 -81.77143157826833
EPSG:3630
ll -7.841181195605785 -80.51273716928688
en 450094.2093160325 -1.7377832893173665E7
ll2 -7.8411811956056265 -80.51273716927858
EPSG:3631
ll 63.8032099154039 -92.15471774203877
- en -143527.5829036081 3549715.058305626
- ll2 63.803209915404565 -92.15471774203877
+ en -143527.58290360798 3549715.0583056286
+ ll2 63.803209915404594 -92.15471774203877
EPSG:3632
ll -13.708544479920494 -50.821499610690694
- en 1.590757673788273E7 -1.748905202592322E7
- ll2 -13.70854447992049 -50.82149961069071
+ en 1.5907576737882737E7 -1.748905202592321E7
+ ll2 -13.708544479920466 -50.821499610690694
EPSG:3633
ll -3.67588713568464 -39.34013946954295
- en 9331369.899329878 -2720249.8510686024
- ll2 -3.6758871356845852 -39.34013946954295
+ en 9331369.899329862 -2720249.851068613
+ ll2 -3.6758871356845986 -39.34013946954295
EPSG:3634
ll 16.70314520666345 -138.76945231977663
- en -1.2704827728967836E7 -7835191.853193661
- ll2 16.703145206663457 -138.7694523197766
+ en -1.2704827728967825E7 -7835191.853193659
+ ll2 16.703145206663468 -138.76945231977663
EPSG:3635
ll 37.14969105446345 -82.00887554225122
- en 2249636.5983845973 -755710.6922388359
+ en 2249636.5983845973 -755710.6922388372
ll2 37.149691054463595 -82.0088755422512
EPSG:3636
ll 87.32845524126627 -156.7201219109955
- en 330347.41716408805 1.820232959059651E7
- ll2 87.32845524126644 -156.7201219109955
+ en 330347.4171641499 1.8202329590596575E7
+ ll2 87.32845524126657 -156.72012191099543
EPSG:3637
ll 21.233899709727815 -57.08997346243595
- en 3349184.7626976585 -1682054.9572650928
- ll2 21.23389970972774 -57.08997346243596
+ en 3349184.762697663 -1682054.95726509
+ ll2 21.233899709727748 -57.08997346243595
EPSG:3638
ll 9.225052421335405 -40.811771492563906
- en 5619719.186582641 -2156290.036911037
- ll2 9.225052421335429 -40.81177149256391
+ en 5619719.186582645 -2156290.036911037
+ ll2 9.225052421335429 -40.811771492563906
EPSG:3639
ll -3.387826086706191 -153.19090901146978
- en -6645982.852382877 -2478719.999357401
- ll2 -3.3878260867061423 -153.19090901146973
+ en -6645982.8523828965 -2478719.9993573865
+ ll2 -3.3878260867061556 -153.19090901146973
EPSG:3640
ll 6.053374645009427 -177.6431984318791
- en -2.735058830578658E7 1742815.6710994388
- ll2 6.0533746450094705 -177.6431984318791
+ en -2.735058830578661E7 1742815.671099555
+ ll2 6.0533746450094705 -177.64319843187909
EPSG:3641
ll 69.35453625993051 -134.64609100039075
en -1205388.354522892 4646758.111131006
@@ -10562,148 +10562,148 @@ EPSG:3643
ll2 -10.953893818191982 -58.56459646733467
EPSG:3644
ll -13.445594680218214 -99.70637168342836
- en 1.2872790677619953E7 -2.2246044081693143E7
- ll2 -13.445594680218196 -99.70637168342834
+ en 1.2872790677619947E7 -2.2246044081693143E7
+ ll2 -13.445594680218196 -99.70637168342836
EPSG:3645
ll 34.911479967921714 -132.2835707480167
en 1410651.9538227038 -898162.3875276017
ll2 34.91147996792188 -132.2835707480167
EPSG:3646
ll 53.49994537435148 -150.7796934173729
- en 1691436.6727026948 4832926.636152357
- ll2 53.49994537435178 -150.7796934173729
+ en 1691436.6727026885 4832926.63615236
+ ll2 53.499945374351775 -150.7796934173729
EPSG:3647
ll 44.95802754296333 -114.98242161018298
en 1935213.9853692227 380021.09462279466
- ll2 44.958027542963436 -114.98242161018298
+ ll2 44.95802754296343 -114.98242161018298
EPSG:3648
ll 84.0914660867763 -41.13898154475558
en 9160095.903900763 1.98415730434255E7
- ll2 84.0914660867768 -41.13898154475557
+ ll2 84.09146608677682 -41.138981544755595
EPSG:3649
ll 47.41555917155678 -93.1291853189262
- en -560985.1878785766 909983.7087710138
- ll2 47.41555917155692 -93.12918531892619
+ en -560985.1878785768 909983.7087710124
+ ll2 47.415559171556936 -93.12918531892619
EPSG:3650
ll 68.70798787848736 -104.85575494485474
en -2133602.8006946477 1.1533915564431021E7
- ll2 68.70798787848824 -104.85575494485477
+ ll2 68.70798787848824 -104.85575494485475
EPSG:3651
ll 83.45908939089627 3.505889111891946
- en 2139288.5413020705 6443345.384885996
- ll2 83.45908939089685 3.505889111891918
+ en 2139288.541302095 6443345.384886029
+ ll2 83.45908939089685 3.50588911189196
EPSG:3652
ll 25.47836475845508 -75.60549236404013
- en 2698982.6839142144 -5091351.018460002
- ll2 25.47836475845473 -75.60549236404013
+ en 2698982.683914213 -5091351.018459988
+ ll2 25.478364758454756 -75.60549236404013
EPSG:3653
ll 49.44831440356114 -63.83386870110801
- en 655630.0297278279 957974.748596117
- ll2 49.44831438548266 -63.833868737598955
+ en 655630.0297278267 957974.748596117
+ ll2 49.44831438548266 -63.833868737598976
EPSG:3654
ll -21.3394937486988 -78.74948755027313
en -2144017.9315986256 -2.2729157002181217E7
- ll2 -21.33949374598681 -78.74948755216133
+ ll2 -21.33949374598681 -78.74948755216134
EPSG:3655
ll 46.94191676023905 -84.74289823590767
- en 316483.290030578 1696310.223687561
- ll2 46.941916760239174 -84.74289823590767
+ en 316483.29003057803 1696310.2236875624
+ ll2 46.94191676023919 -84.74289823590767
EPSG:3656
ll -0.9648874656532662 -149.98091192086696
- en -2.5714290094711117E7 -3057327.926122403
+ en -2.5714290094711117E7 -3057327.926122394
ll2 -0.9648874656532341 -149.98091192086693
EPSG:3657
ll 60.15502042302474 -178.66498973391157
- en -3260879.090550639 3876135.2846779223
- ll2 60.15502042302525 -178.66498973391091
+ en -3260879.090550671 3876135.284677954
+ ll2 60.15502042302526 -178.66498973391165
EPSG:3658
ll 83.99812632567935 -17.56162595557666
- en 6101807.155957585 1.881776128029597E7
- ll2 83.99812632567992 -17.561625955576634
+ en 6101807.155957616 1.8817761280296013E7
+ ll2 83.99812632567992 -17.56162595557665
EPSG:3659
ll 71.67697081602851 -135.36466038798736
en -800422.129062491 3725252.009799915
- ll2 71.67697081602947 -135.36466038798736
+ ll2 71.6769708160295 -135.36466038798736
EPSG:3660
ll -3.7995664411948855 -78.15927245954008
- en 1.2830674536664017E7 -1.725277133266594E7
- ll2 -3.799566441194838 -78.15927245954008
+ en 1.2830674536664013E7 -1.725277133266594E7
+ ll2 -3.7995664411948384 -78.15927245954009
EPSG:3661
ll 70.39679177998151 -13.89353114902633
en 3751856.488746245 5534323.244139523
- ll2 70.39679177998245 -13.89353114902633
+ ll2 70.39679177998244 -13.893531149026344
EPSG:3662
ll -19.372243068353008 -76.28136790966866
- en 7161387.241964176 -2.2565254930148788E7
+ en 7161387.241964178 -2.2565254930148795E7
ll2 -19.372243068352937 -76.28136790966866
EPSG:3663
ll -20.85164434018568 -144.6497638964857
- en -5973466.7272139685 -2085176.3360866578
- ll2 -20.851644340185587 -144.64976389648567
+ en -5973466.7272139685 -2085176.3360866597
+ ll2 -20.85164434018559 -144.64976389648567
EPSG:3664
ll -15.98564115168221 -149.38843883246844
- en -2.0713937218719505E7 -3574485.4700371283
- ll2 -15.985641151682188 -149.38843883246844
+ en -2.0713937218719505E7 -3574485.470037133
+ ll2 -15.985641151682183 -149.38843883246844
EPSG:3665
ll -36.9754083884165 75.45335470412351
en 1.8404116946611833E7 1.8223347406181976E7
- ll2 -36.97540838841659 75.45335470412353
+ ll2 -36.97540838841659 75.45335470412354
EPSG:3666
ll 51.0372842926152 -106.88933036684116
- en 985344.7297354931 8733773.644299781
+ en 985344.7297354923 8733773.644299783
ll2 51.03728429261543 -106.88933036684116
EPSG:3667
ll -13.266743278428503 -61.54162946037272
- en 6113848.161725851 -3690913.831475786
- ll2 -13.266743278428468 -61.54162946037272
+ en 6113848.161725852 -3690913.831475786
+ ll2 -13.266743278428464 -61.5416294603727
EPSG:3668
ll 80.81901919161061 -173.24606199369535
en -6005529.67333911 2.574443802803588E7
- ll2 80.81901919161137 -173.24606199369532
+ ll2 80.81901919161136 -173.24606199369543
EPSG:3669
ll 88.00620773952149 -173.10629343105657
- en -381689.5121355052 1.0822497575421643E7
- ll2 88.00620773952164 -173.10629343105657
+ en -381689.512135506 1.0822497575421643E7
+ ll2 88.00620773952164 -173.1062934310565
EPSG:3670
ll 54.036758823688004 -54.95335229802278
en 1.1775016258903617E7 1.696573091019663E7
- ll2 54.036758823688324 -54.95335229802278
+ ll2 54.03675882368833 -54.95335229802278
EPSG:3671
ll 30.775000423405515 -158.07652001471826
- en -5205078.6322353445 6890479.694053512
- ll2 30.775000423403903 -158.07652001471826
+ en -5205078.632235345 6890479.694053512
+ ll2 30.7750004234039 -158.07652001471826
EPSG:3672
ll -28.181832627307212 -176.5139416921641
en -3.645472737585875E7 5335143.9545752425
- ll2 -28.181832627306402 -176.51394169216442
+ ll2 -28.18183262730641 -176.51394169216445
EPSG:3673
ll 67.77958772907544 -73.04080887355795
- en 2066605.0791221468 9025052.505858257
- ll2 67.77958772907628 -73.04080887355794
+ en 2066605.0791221457 9025052.505858261
+ ll2 67.7795877290763 -73.04080887355795
EPSG:3674
ll 4.592057006207398 -112.55241736577344
- en -3410089.9080498223 4723290.1226581205
- ll2 4.592057006207438 -112.55241736577345
+ en -3410089.9080498177 4723290.1226581205
+ ll2 4.592057006207438 -112.55241736577344
EPSG:3675
ll 41.93176472091506 -42.015598612275966
en 5703548.451874283 4528960.256284947
ll2 41.931764720915154 -42.01559861227599
EPSG:3676
ll 44.75318443703005 -110.74155243462366
- en 1838180.1356804627 8903880.142458975
- ll2 44.753184437030164 -110.74155243462364
+ en 1838180.1356804594 8903880.142458975
+ ll2 44.75318443703016 -110.74155243462364
EPSG:3677
ll 1.52600228020626 -115.69024707131162
- en -235146.4401815081 -7780796.329636008
- ll2 1.5260022802062936 -115.6902470713116
+ en -235146.4401815146 -7780796.329636008
+ ll2 1.5260022802062936 -115.69024707131162
EPSG:3678
ll 56.69331807525461 -139.9972445234684
- en -1285405.4254442493 3137200.4308893676
- ll2 56.69331807525501 -139.99724452346837
+ en -1285405.4254442486 3137200.4308893695
+ ll2 56.69331807525506 -139.9972445234684
EPSG:3679
ll 88.08569084210266 -160.39072975560916
en 191745.11268361987 2.5212136094415266E7
- ll2 88.08569084210282 -160.39072975560916
+ ll2 88.08569084210282 -160.39072975560913
EPSG:3680
ll -15.616324647221756 -68.07892471484683
en 2.4692744023044657E7 -1.471916597011572E7
@@ -10711,231 +10711,231 @@ EPSG:3680
EPSG:3681
ll 33.12405772638357 -179.76541270964347
en -5338300.383991289 4837364.948031733
- ll2 33.12405772638381 -179.76541270964722
+ ll2 33.12405772638381 -179.7654127096472
EPSG:3682
ll 25.785330835128256 -152.01557837721245
- en -1.1550860531022234E7 8756748.499226991
- ll2 25.785330835127873 -152.01557837721245
+ en -1.1550860531022234E7 8756748.499226995
+ ll2 25.78533083512787 -152.0155783772125
EPSG:3683
ll -21.99751624659211 -156.12914762847583
en -2.2719402777919754E7 -9833415.377121547
ll2 -21.99751624659198 -156.12914762847586
EPSG:3684
ll 40.53382865316976 -82.33064003038486
- en -333500.88864498877 -171643.25514623258
- ll2 40.53382860114604 -82.33063983763489
+ en -333500.88864498877 -171643.25514623328
+ ll2 40.533828601146034 -82.33063983763489
EPSG:3685
ll 35.35711184043322 -154.93062031082135
- en -2681101.277834161 4476284.570247449
+ en -2681101.277834162 4476284.570247448
ll2 35.35711184043338 -154.93062031082138
EPSG:3686
ll 7.248875341185478 -42.60143588780778
- en 2.6035218097120326E7 -2160447.3505155873
- ll2 7.248875341185562 -42.60143588780777
+ en 2.6035218097120322E7 -2160447.350515592
+ ll2 7.248875341185562 -42.60143588780778
EPSG:3687
ll 64.7895571223315 -35.980788889094015
- en 5751260.097480979 4820983.791326931
- ll2 64.78955712233225 -35.980788889094
+ en 5751260.097480988 4820983.791326934
+ ll2 64.78955712233224 -35.98078888909402
EPSG:3688
ll 67.97080969438282 -45.124332385351536
- en 1.688314444302065E7 1.6458650908214655E7
- ll2 67.97080969438369 -45.12433238535155
+ en 1.688314444302068E7 1.6458650908214677E7
+ ll2 67.97080969438369 -45.12433238535152
EPSG:3689
ll 2.0097742344901377 -45.11248939557302
en 9968895.696859535 -443129.13166452793
- ll2 2.0097742344901617 -45.112489395573036
+ ll2 2.0097742344901626 -45.11248939557304
EPSG:3690
ll 81.76252077072057 -176.68293658230644
- en -1961057.4729946235 1.5146147141296197E7
- ll2 81.76252077072127 -176.6829365823064
+ en -1961057.472994625 1.5146147141296197E7
+ ll2 81.7625207707213 -176.6829365823066
EPSG:3691
ll 40.33211900850598 -80.86064304583363
- en 3746780.4384297943 276581.561198382
+ en 3746780.438429793 276581.5611983806
ll2 40.332119008506055 -80.86064304583363
EPSG:3692
ll 29.637832246294558 -137.63159054496793
- en -3981426.8815769353 -5187126.869899011
+ en -3981426.8815769334 -5187126.869899013
ll2 29.63783224629335 -137.63159054496796
EPSG:3693
ll 87.55209168409688 -15.85690230025753
- en 1299706.4118259465 7021133.515867511
- ll2 87.5520916840971 -15.856902300257545
+ en 1299706.4118259524 7021133.515867528
+ ll2 87.5520916840971 -15.85690230025753
EPSG:3694
ll -10.795462864158345 -24.304151190127328
en 8764932.748199001 -3388543.9904940943
- ll2 -10.79546286415831 -24.30415119012731
+ ll2 -10.795462864158313 -24.30415119012731
EPSG:3695
ll 84.23052589950566 -108.10826615755235
- en 279291.12134824763 5117708.645561938
+ en 279291.1213482469 5117708.645561943
ll2 84.2305258995062 -108.10826615755236
EPSG:3696
ll 88.50767253153474 -118.85930797400471
- en 1331218.685444034 1.9713257271867793E7
- ll2 88.5076725315348 -118.85930797400465
+ en 1331218.6854440316 1.9713257271867823E7
+ ll2 88.50767253153482 -118.85930797400474
EPSG:3697
ll 2.2557181309781704 -119.13823652159917
- en -3510657.10040406 -4452829.810998507
- ll2 2.2557181309782144 -119.13823652159918
+ en -3510657.1004040684 -4452829.810998508
+ ll2 2.2557181309782015 -119.13823652159918
EPSG:3698
ll 10.56658958938321 -154.6211967098849
- en -2.264127743749537E7 -2770849.329074924
- ll2 10.56658958938322 -154.62119670988497
+ en -2.2641277437495388E7 -2770849.3290748703
+ ll2 10.566589589383232 -154.62119670988497
EPSG:3699
ll 52.61148693880423 -69.43140110840507
en 1998111.4718802224 1357610.3476671593
ll2 52.61148693880449 -69.43140110840507
EPSG:3700
ll 36.175327229524044 -105.71381023190375
- en -2677212.893230141 -1689076.5538199712
- ll2 36.17532722952418 -105.71381023190379
+ en -2677212.8932301374 -1689076.5538199712
+ ll2 36.17532722952418 -105.71381023190375
EPSG:3701
ll -1.1795487736640808 -85.36982732554884
- en 1035678.739771858 -4610805.4080115985
- ll2 -1.1795487736527683 -85.36982732674295
+ en 1035678.7397718581 -4610805.4080115985
+ ll2 -1.1795487736527683 -85.36982732674296
EPSG:3702
ll -15.7106037443897 -99.37836380858138
- en 821300.8820405216 -6230798.236383325
- ll2 -15.710603743895792 -99.37836380958471
+ en 821300.8820405201 -6230798.236383325
+ ll2 -15.710603743895796 -99.37836380958471
EPSG:3703
ll 38.404674354348515 -111.23940616019382
- en 58774.3438519286 -125385.40375117603
- ll2 38.40467435412886 -111.23940616038031
+ en 58774.34385192732 -125385.40375117597
+ ll2 38.40467435412885 -111.23940616038034
EPSG:3704
ll 21.9727785242016 -106.99491091344011
- en 781278.0628643358 -2053095.0366745926
- ll2 21.972778524201058 -106.99491091343981
+ en 781278.0628643373 -2053095.0366745926
+ ll2 21.97277852420106 -106.99491091343981
EPSG:3705
ll -80.00304130610263 -102.9041703129287
- en 938836.2767710232 -1.3278270489707334E7
- ll2 -80.00304130544262 -102.90417036086102
+ en 938836.2767710234 -1.3278270489707334E7
+ ll2 -80.00304130544262 -102.90417036086099
EPSG:3706
ll -45.57492962030648 173.80175634565813
- en 718600.0918216269 -5050639.584560066
- ll2 -45.57492962026456 173.8017563456786
+ en 718600.091821627 -5050639.584560066
+ ll2 -45.57492962026457 173.8017563456786
EPSG:3707
ll -5.937273042562978 168.08986873446423
- en -490130.60857410415 -664283.1858320854
- ll2 -5.937273037685681 168.0898688049974
+ en -490130.60857410415 -664283.1858320856
+ ll2 -5.9372730376856815 168.0898688049974
EPSG:3708
ll -31.51498544672544 -171.5738406131928
- en 1015561.0513549342 -3499462.4006787734
+ en 1015561.0513549342 -3499462.400678774
ll2 -31.51498544577983 -171.57384061187665
EPSG:3709
ll 30.10855903359898 -172.16405301930607
- en 387848.316611864 3331386.224347212
- ll2 30.10855903359754 -172.16405301930635
+ en 387848.31661186676 3331386.224347212
+ ll2 30.108559033597547 -172.16405301930644
EPSG:3710
ll -6.066857729644525 -165.4420307975396
- en 451086.21704422374 -670615.1171437355
- ll2 -6.066857729644541 -165.4420307975396
+ en 451086.21704422374 -670615.1171437356
+ ll2 -6.066857729644543 -165.4420307975396
EPSG:3711
ll -16.683562269167624 -165.8993146282233
- en -237105.1577217274 -1857334.8526387443
- ll2 -16.68356226751857 -165.899314625912
+ en -237105.15772173041 -1857334.8526387443
+ ll2 -16.68356226751857 -165.89931462591207
EPSG:3712
ll -29.192180691569504 -144.07650689910434
- en 1369385.9126106668 -3262469.783324904
- ll2 -29.19218067697118 -144.076506901016
+ en 1369385.912610664 -3262469.783324904
+ ll2 -29.192180676971184 -144.07650690101605
EPSG:3713
ll 41.6506148330804 -144.4036957374126
- en 716200.6906071918 4614242.216090048
- ll2 41.65061483305769 -144.4036957373938
+ en 716200.6906071919 4614242.216090047
+ ll2 41.65061483305768 -144.4036957373938
EPSG:3714
ll 52.992509498212826 -139.75015125726895
en 583890.5025653322 5872167.995416821
- ll2 52.992509498212705 -139.75015125726878
+ ll2 52.99250949821272 -139.75015125726878
EPSG:3715
ll 0.8595134539767884 -136.872777478755
- en 291592.6998984263 95053.23998638937
+ en 291592.6998984263 95053.23998638935
ll2 0.859513453976762 -136.87277747874623
EPSG:3716
ll -10.899736459559094 -120.97705570749714
- en 1379441.9199425774 -1216593.0504230475
- ll2 -10.899736455885272 -120.97705573041307
+ en 1379441.9199425743 -1216593.0504230475
+ ll2 -10.89973645588527 -120.9770557304131
EPSG:3717
ll 37.15849308331704 -113.18659333182968
- en 1372492.8464038856 4157840.623376216
- ll2 37.158493041389534 -113.18659345938757
+ en 1372492.8464038856 4157840.6233762167
+ ll2 37.158493041389534 -113.18659345938755
EPSG:3718
ll -63.142776783186775 -113.22011851397703
- en 690443.1656927065 -7007104.317986524
- ll2 -63.1427767829813 -113.2201185140818
+ en 690443.1656927066 -7007104.317986524
+ ll2 -63.14277678298131 -113.22011851408179
EPSG:3719
ll 0.36747717042503325 -120.54698885364996
- en -567302.6494965064 41191.63839595305
- ll2 0.36747716989389817 -120.5469887207827
+ en -567302.6494965064 41191.63839595306
+ ll2 0.3674771698938982 -120.5469887207827
EPSG:3720
ll 22.987721745292447 -108.05818153050636
- en 186460.3710595877 2545430.5317181563
- ll2 22.987721745278495 -108.05818153052772
+ en 186460.3710595877 2545430.531718156
+ ll2 22.987721745278495 -108.05818153052773
EPSG:3721
ll 73.89081141915287 -102.36108378084504
- en 395953.86128344416 8202789.60185356
- ll2 73.89081141911963 -102.36108378079753
+ en 395953.86128344364 8202789.601853559
+ ll2 73.89081141911963 -102.36108378079754
EPSG:3722
ll -22.970725663163847 -100.88235291230043
- en -309757.45102578134 -2562110.8765342175
+ en -309757.45102578297 -2562110.8765342175
ll2 -22.97072565821782 -100.88235291615023
EPSG:3723
ll 82.16493012702566 -96.93047820751049
- en 349592.90028174565 9136185.961711094
- ll2 82.16493012913787 -96.93047727447183
+ en 349592.9002817458 9136185.961711094
+ ll2 82.16493012913789 -96.93047727447181
EPSG:3724
ll 4.556624986855425 -85.80254692315148
- en -33346.56334743323 505433.56983210513
- ll2 4.556624986801516 -85.80254692178353
+ en -33346.56334743486 505433.56983210513
+ ll2 4.556624986801515 -85.80254692178353
EPSG:3725
ll 11.062739518423228 -66.17995526140089
- en 1466898.0122651015 1237281.313791984
- ll2 11.062739511229623 -66.17995530617975
+ en 1466898.0122651015 1237281.3137919842
+ ll2 11.062739511229625 -66.17995530617975
EPSG:3726
ll 82.96975113738165 -66.89448798770013
- en 528764.3624899182 9213606.869105812
- ll2 82.96975113738208 -66.8944879877009
+ en 528764.3624899184 9213606.869105812
+ ll2 82.96975113738206 -66.89448798770091
EPSG:3727
ll -77.76809592711867 51.23716493358032
- en 59029.79991003475 -6252952.468500746
- ll2 -77.76809435818427 51.237170451978734
+ en 59029.799910034926 -6252952.468500746
+ ll2 -77.76809435818427 51.237170451978756
EPSG:3728
ll 47.80635921452516 -63.304027256845984
- en 6681248.331679901 3493547.5791421095
- ll2 47.806359214525315 -63.30402725684597
+ en 6681248.331679897 3493547.579142114
+ ll2 47.806359214525294 -63.30402725684598
EPSG:3729
ll 2.803211291869161 -92.34741144192587
- en -2351844.249221363 -1.343270208684045E7
- ll2 2.8032112918691987 -92.34741144192589
+ en -2351844.2492213603 -1.3432702086840456E7
+ ll2 2.8032112918692116 -92.34741144192587
EPSG:3730
ll 4.426436369791304 -106.59247979501411
en 136952.21909932207 -1.3107543553175267E7
- ll2 4.426436369791282 -106.59247979501205
+ ll2 4.426436369791283 -106.59247979501208
EPSG:3731
ll 13.877480100084867 -109.16447004555333
- en 662902.1570605056 -9348128.636494014
- ll2 13.877480100084554 -109.16447004554969
+ en 662902.1570605005 -9348128.636494014
+ ll2 13.877480100084552 -109.16447004554969
EPSG:3732
ll -58.39725830101919 -111.44414693960942
- en 1451741.25723093 -3.596793449490583E7
+ en 1451741.2572309275 -3.596793449490583E7
ll2 -58.397258300986145 -111.44414693960897
EPSG:3733
ll -89.75608128789113 -109.22994434723503
en 2625997.853225904 -4.7109057738842316E7
- ll2 -89.75608128788777 -109.22994434723498
+ ll2 -89.75608128788775 -109.22994434723498
EPSG:3734
ll 82.67748171553865 -141.82953204857876
- en -2206952.605619178 1.939794824221589E7
+ en -2206952.6056191484 1.939794824221585E7
ll2 82.67748171553866 -141.82953204857876
EPSG:3735
ll 8.863360088267768 -10.665023081774564
- en 2.848150815849602E7 45460.85227852574
- ll2 8.863360088267797 -10.66502308177455
+ en 2.8481508158496022E7 45460.85227854432
+ ll2 8.863360088267797 -10.665023081774578
EPSG:3736
ll 80.31260716733146 -98.4450121762795
- en 1069684.4350664085 1.4573516115149966E7
- ll2 80.31260716689498 -98.44501220274115
+ en 1069684.435066408 1.4573516115149967E7
+ ll2 80.31260716689499 -98.44501220274115
EPSG:3737
ll -27.170923129641544 -98.2073145998973
- en 4286796.391908376 -2.4357905291848827E7
- ll2 -27.170923115007305 -98.2073146004876
+ en 4286796.3919083765 -2.4357905291848827E7
+ ll2 -27.170923115007305 -98.20731460048759
EPSG:3738
ll -11.781293614084234 -100.32761180921258
en 4990018.002679481 -1.9033665155279994E7
@@ -10943,83 +10943,83 @@ EPSG:3738
EPSG:3739
ll 66.12322596902581 -100.71891896966295
en 4008651.4610785064 9786623.694418568
- ll2 66.12322593728375 -100.71891940655203
+ ll2 66.12322593728373 -100.71891940655203
EPSG:3740
ll 87.02850135599053 -113.62074230455607
en 554044.0251368819 9670629.67015111
- ll2 87.02850135700562 -113.62074287219258
+ ll2 87.02850135700562 -113.6207428721926
EPSG:3741
ll -79.42741436563367 -125.64095103666496
- en 323631.1235731186 -8830777.726155082
- ll2 -79.42741436410688 -125.64095078000095
+ en 323631.123573118 -8830777.726155082
+ ll2 -79.4274143641069 -125.64095078000098
EPSG:3742
ll -82.37549892015865 -107.22141503112992
en 555932.2032362026 -9148574.042615153
- ll2 -82.37549892015073 -107.22141503127766
+ ll2 -82.37549892015075 -107.22141503127766
EPSG:3743
ll -26.046996587912425 -100.40340842382578
- en 960138.2583707653 -2889004.766604249
- ll2 -26.046996587694593 -100.40340842338937
+ en 960138.2583707666 -2889004.76660425
+ ll2 -26.046996587694615 -100.40340842338937
EPSG:3744
ll -55.369220034735974 -104.18248186818056
- en 171694.2485577126 -6148110.1509809485
- ll2 -55.369220032935026 -104.1824818668722
+ en 171694.24855771352 -6148110.150980948
+ ll2 -55.369220032935004 -104.18248186687217
EPSG:3745
ll 78.19223040850522 -99.82620510065222
en 344403.9473007807 8688907.101070087
ll2 78.19223040761364 -99.8262050708229
EPSG:3746
ll -53.0927065797573 -91.06445074313764
- en 227881.43200837407 -5890306.68792615
- ll2 -53.09270657932575 -91.06445074306554
+ en 227881.43200837605 -5890306.68792615
+ ll2 -53.09270657932575 -91.06445074306552
EPSG:3747
ll -88.91155369972483 -77.02074924547345
- en 508432.6894573007 -9876733.715521658
- ll2 -88.91155369972499 -77.02074924571514
+ en 508432.68945730047 -9876733.71552166
+ ll2 -88.91155369972498 -77.02074924571515
EPSG:3748
ll -9.33630793571102 -80.62560861225198
- en -118700.1450094108 -1036973.1650134727
- ll2 -9.336307935423326 -80.6256086096439
+ en -118700.1450094108 -1036973.1650134723
+ ll2 -9.336307935423324 -80.6256086096439
EPSG:3749
ll -26.311853362441575 -73.88359828270063
- en 12197.565892029379 -2919449.9304953306
- ll2 -26.311853362119237 -73.88359828333702
+ en 12197.565892029495 -2919449.9304953306
+ ll2 -26.311853362119237 -73.88359828333704
EPSG:3750
ll -10.793107677337616 -157.70466323570486
en 641616.6244948045 -1193403.2208277662
- ll2 -10.793107677337588 -157.70466323570574
+ ll2 -10.793107677337586 -157.7046632357057
EPSG:3751
ll 28.90991696994557 -144.19328983794028
- en 1360328.364301711 3230131.4666872094
- ll2 28.909916956633218 -144.1932898375605
+ en 1360328.3643017085 3230131.466687209
+ ll2 28.909916956633204 -144.19328983756054
EPSG:3753
ll 22.523557845385618 -164.44842120878977
- en -2.2983538613700487E7 6320479.6255525565
- ll2 22.52355784538552 -164.44842120878977
+ en -2.2983538613700483E7 6320479.62555263
+ ll2 22.523557845385522 -164.44842120878977
EPSG:3754
ll 28.475736303258195 -10.248745965062568
- en 2.314421785161007E7 5466149.43670123
- ll2 28.47573630325734 -10.248745965062554
+ en 2.314421785161006E7 5466149.436701245
+ ll2 28.47573630325733 -10.248745965062568
EPSG:3755
ll -30.764084859031527 -100.19347285228571
- en 2219102.304026902 -2.591847344766105E7
- ll2 -30.76408485850448 -100.19347285144812
+ en 2219102.304026911 -2.591847344766105E7
+ ll2 -30.76408485850448 -100.1934728514481
EPSG:3756
ll -83.44460788050341 -101.29986670627622
- en 1564263.7792637998 -4.480965324430223E7
- ll2 -83.44460788043712 -101.299866716458
+ en 1564263.7792638 -4.480965324430223E7
+ ll2 -83.44460788043712 -101.29986671645803
EPSG:3757
ll -54.67022382492301 -115.40978573247861
- en 559949.637394492 -3.4663001131698966E7
- ll2 -54.67022381690687 -115.40978571909109
+ en 559949.637394492 -3.466300113169896E7
+ ll2 -54.670223816906834 -115.40978571909109
EPSG:3758
ll 53.52292350641798 -108.66834859891597
- en 2932532.643507482 5080730.367357948
- ll2 53.52292350641748 -108.66834859891564
+ en 2932532.643507482 5080730.36735795
+ ll2 53.52292350641748 -108.66834859891566
EPSG:3759
ll -37.88992734369315 -148.0138854071332
- en 4525892.450066377 -2.1601292035860654E7
- ll2 -37.88992729570161 -148.01388557583368
+ en 4525892.450066378 -2.1601292035860654E7
+ ll2 -37.88992729570162 -148.01388557583368
EPSG:3760
ll -71.54776365570049 -152.8220987457414
en 2240120.190873933 -3.3762844262599096E7
@@ -11030,40 +11030,40 @@ EPSG:3761
ll2 -78.8357925922792 -48.37033089075301
EPSG:3762
ll -12.554893465266986 -111.52424332602115
- en -8362836.874655569 205652.3533266847
- ll2 -12.55489346526695 -111.52424332602115
+ en -8362836.874655603 205652.35332661745
+ ll2 -12.554893465266963 -111.52424332602116
EPSG:3763
ll 63.419910070935686 -4.083068606785014
en 202172.53796120523 2648888.5323343575
ll2 63.41991007062998 -4.083068606985985
EPSG:3764
ll 55.141179600590675 -175.43672300221016
- en 467803.01343098975 1.1787285745788956E7
- ll2 55.14117960059088 -175.4367230022103
+ en 467803.01343099156 1.1787285745788956E7
+ ll2 55.14117960059088 -175.4367230022102
EPSG:3765
ll -86.25519215405177 6.537675468109941
en 427695.3223532208 -9589029.449395085
- ll2 -86.25519215634175 6.53767644998073
+ ll2 -86.25519215634174 6.53767644998073
EPSG:3766
ll 2.5142350676665437 58.43909543717504
en 5671042.432441632 1846246.4533617804
ll2 2.514235067666576 58.43909543717504
EPSG:3767
ll -14.377889716134533 21.563823888789027
- en 1209028.523358677 -1599636.9453317788
- ll2 -14.377889715050093 21.563823885501783
+ en 1209028.5233586773 -1599636.9453317786
+ ll2 -14.377889715050088 21.563823885501783
EPSG:3768
ll 33.72068886191519 17.104080381424833
en 138939.48284311884 3738008.1918382416
- ll2 33.720688861760316 17.104080381207808
+ ll2 33.72068886176034 17.10408038120781
EPSG:3769
ll -15.376166757871587 -71.02017803825917
en -363142.9749102092 -1716272.878902562
- ll2 -15.376166633284946 -71.02017802691145
+ ll2 -15.376166633284946 -71.02017802691144
EPSG:3770
ll -75.23952199395359 -71.15885081687225
- en 367992.462631934 -1.180538032508048E7
- ll2 -75.23952199274167 -71.1588508005807
+ en 367992.4626319341 -1.1805380325080482E7
+ ll2 -75.2395219927417 -71.15885080058071
EPSG:3775
ll 40.82851735775199 -107.64190575657177
en 283260.35891076026 4526508.080372334
@@ -11078,28 +11078,28 @@ EPSG:3777
ll2 -47.61853918109603 -116.98741417747958
EPSG:3779
ll -72.8899390298231 -118.67498820933837
- en -251487.41307776744 -8106756.335182669
- ll2 -72.88993902492713 -118.67498812854363
+ en -251487.4130777677 -8106756.33518267
+ ll2 -72.88993902492716 -118.67498812854365
EPSG:3780
ll -4.929009522720165 -112.21287212854425
- en 198223.4207461141 -545246.3209166557
- ll2 -4.929009522720058 -112.2128721285506
+ en 198223.42074611253 -545246.3209166557
+ ll2 -4.929009522720059 -112.21287212855063
EPSG:3781
ll 3.367585317244007 -117.65237093478365
en -72491.35239397579 372359.6163841729
- ll2 3.3675853172440067 -117.65237093478358
+ ll2 3.367585317244007 -117.65237093478359
EPSG:3783
ll 86.09534183120127 -125.23695054055392
- en 51241.862802228236 1.2356567191537505E7
- ll2 86.09534183119783 -125.23695054205761
+ en 51241.86280222836 1.2356567191537503E7
+ ll2 86.09534183119783 -125.2369505420576
EPSG:3784
ll 58.41793124961657 -126.92594811974351
- en 621113.7823152811 1.6477108960928053E7
+ en 621113.782315281 1.6477108960928055E7
ll2 58.417931230276935 -126.92594813191018
EPSG:3788
ll 64.12021814528876 169.74187252503532
- en 3682229.041839028 1.7118612189221863E7
- ll2 64.1202181451069 169.74187252493581
+ en 3682229.0418390273 1.7118612189221863E7
+ ll2 64.12021814510689 169.7418725249358
EPSG:3789
ll 71.66729637293002 167.75143169640864
en 3456153.2094831183 1.795545837109234E7
@@ -11110,16 +11110,16 @@ EPSG:3790
ll2 62.278186516545055 171.26689236016307
EPSG:3791
ll 63.75176546428233 -177.30143846234577
- en 3534484.2294796724 1.707237060153111E7
- ll2 63.75176546428303 -177.30143846234543
+ en 3534484.229479674 1.707237060153111E7
+ ll2 63.75176546428303 -177.30143846234546
EPSG:3793
ll 85.93657475368585 -173.81549410494375
- en 3521239.0450324547 1.9548609679664537E7
- ll2 85.93657475368606 -173.8154941049507
+ en 3521239.045032454 1.9548609679664537E7
+ ll2 85.93657475368606 -173.81549410495074
EPSG:3794
ll 55.803481916041335 8.313442236873524
- en 81086.29573610926 1206319.72241952
- ll2 55.803481907972404 8.313442251587139
+ en 81086.29573610949 1206319.7224195208
+ ll2 55.80348190797241 8.31344225158714
EPSG:3798
ll 28.883388315278047 1.4305003204430875
en 7122469.942490678 1445502.1573646409
@@ -11134,11 +11134,11 @@ EPSG:3801
ll2 -30.168744770966793 -112.37325655273531
EPSG:3802
ll 82.00996919049021 -114.9616566076954
- en 78113.27278151485 9112078.091801798
- ll2 82.0099691904392 -114.9616566096729
+ en 78113.27278151498 9112078.091801796
+ ll2 82.00996919043918 -114.96165660967293
EPSG:3812
ll 50.76787953358437 3.4513353977071453
- en 585284.6677650047 662323.5758590293
+ en 585284.6677650047 662323.5758590279
ll2 50.76787953358439 3.451335397707146
EPSG:3814
ll -83.19650146321193 -83.23854905677338
@@ -11146,44 +11146,44 @@ EPSG:3814
ll2 -83.19650146310795 -83.23854907704545
EPSG:3815
ll 23.36132067896645 -95.14162679208137
- en -51751.24158942257 297737.9039928622
- ll2 23.361320678495595 -95.14162679287587
+ en -51751.241589424084 297737.9039928622
+ ll2 23.3613206784956 -95.1416267928759
EPSG:3816
ll 67.41565048688412 -89.15221584998808
- en 525624.8041460669 5182887.963674545
- ll2 67.41565048688499 -89.15221584998808
+ en 525624.8041460669 5182887.963674547
+ ll2 67.41565048688499 -89.1522158499881
EPSG:3819
ll -17.852955196024325 9.46986115872187
- en 9.46909821336857 -17.859718440072427
- ll2 -17.852954895442757 9.469861187342588
+ en 9.469098213368573 -17.859718440072427
+ ll2 -17.852954895442757 9.469861187342591
EPSG:3821
ll 52.89964388987394 -103.99773949046475
- en -103.99773949046475 52.89964388987394
- ll2 52.89964388987394 -103.99773949046475
+ en -103.99773949046477 52.89964388987394
+ ll2 52.89964388987394 -103.99773949046477
EPSG:3824
ll 52.97107538568454 158.70999765140675
- en 158.70999765140675 52.971075386591224
- ll2 52.97107538568482 158.70999765140675
+ en 158.70999765140675 52.97107538659122
+ ll2 52.97107538568482 158.70999765140678
EPSG:3825
ll -24.58274012791422 120.90039982730858
- en 442492.34623661416 -2720890.748648343
- ll2 -24.582740127913063 120.90039982731034
+ en 442492.3462366127 -2720890.748648343
+ ll2 -24.582740127913066 120.90039982731035
EPSG:3826
ll -21.324181692327215 120.49799839793808
- en 197924.9362672319 -2358817.05078884
- ll2 -21.32418169232713 120.49799839793808
+ en 197924.93626723337 -2358817.0507888403
+ ll2 -21.324181692327134 120.49799839793809
EPSG:3827
ll -3.6266181059801 116.05097971220967
en -77743.38833872986 -401511.1985869441
ll2 -3.626618105978248 116.05097971230121
EPSG:3828
ll 16.305665000052528 122.75290825914679
- en 437340.29383984266 1804098.8506619283
- ll2 16.305665000052254 122.75290825914486
+ en 437340.29383984266 1804098.8506619288
+ ll2 16.305665000052258 122.75290825914486
EPSG:3829
ll 85.44012862143103 132.01291914953174
- en 578839.8963415996 9495341.810721355
- ll2 85.4401286193869 132.0129193956132
+ en 578839.8963415998 9495341.810721356
+ ll2 85.44012861938691 132.01291939561332
EPSG:3832
ll 73.69237557115602 34.57071836335369
en -1.284952885442483E7 1.23513911708691E7
@@ -11194,60 +11194,60 @@ EPSG:3833
ll2 -40.1220155764155 8.310180266636102
EPSG:3834
ll -73.17421876122998 10.975394224355204
- en 2563963.802942512 -8124340.522587924
- ll2 -73.17421875557748 10.975394335564083
+ en 2563963.802942512 -8124340.522587926
+ ll2 -73.17421875557753 10.975394335564083
EPSG:3835
ll -16.619912390591494 19.961191732577422
en 4030041.646810881 -1844772.3728443906
ll2 -16.619912377195234 19.96119175289271
EPSG:3836
ll -19.25199664983134 23.747451525823024
- en 4789061.218122198 -2131804.266984545
- ll2 -19.25199663668117 23.7474515457836
+ en 4789061.218122198 -2131804.2669845447
+ ll2 -19.251996636681174 23.747451545783598
EPSG:3837
ll 6.649046018760174 13.282919650701793
- en 3974150.460844278 737391.2195092333
- ll2 6.649046028952265 13.282919670037924
+ en 3974150.4608442783 737391.2195092333
+ ll2 6.649046028952265 13.282919670037925
EPSG:3838
ll 80.12181009063411 10.216733748299736
- en 4465973.081149788 8899433.773525387
- ll2 80.12181009094343 10.216733787264273
+ en 4465973.081149788 8899433.773525389
+ ll2 80.12181009094344 10.216733787264275
EPSG:3839
ll -23.345450258379103 27.36092529312652
en 9537034.919314299 -2582796.7488463987
- ll2 -23.345450245628033 27.36092531540742
+ ll2 -23.345450245628044 27.360925315407428
EPSG:3840
ll 65.14834791511055 27.89840501220244
en 1.0401543494024077E7 7229639.777154705
- ll2 65.1483479143737 27.89840502163271
+ ll2 65.14834791437369 27.898405021632716
EPSG:3841
ll 17.19315214687842 11.673647903368986
- en 5826003.964659104 1912820.1174982255
- ll2 17.193152154927375 11.673647920002368
+ en 5826003.964659104 1912820.1174982262
+ ll2 17.19315215492738 11.673647920002368
EPSG:3844
ll -77.33946844440612 -43.285826176239055
- en -6860183.124622559 -2.5919834170710035E7
- ll2 -77.33946847448564 -43.28582606705963
+ en -6860183.124622563 -2.591983417071004E7
+ ll2 -77.33946847448563 -43.28582606705958
EPSG:3845
ll -28.88432879346309 15.593295087674015
- en 1918426.4867557138 -3204705.522512642
- ll2 -28.884328793279725 15.593295088022558
+ en 1918426.486755713 -3204705.522512642
+ ll2 -28.884328793279725 15.593295088022549
EPSG:3846
ll 74.05526093235983 5.993413147266688
en 1268619.985355141 8235582.98219971
- ll2 74.05526092863481 5.993413219139582
+ ll2 74.05526092863482 5.993413219139582
EPSG:3847
ll -79.05230797406935 22.928205755139697
en 1650756.9153129985 -8789248.606882177
ll2 -79.05230797320259 22.928205710954114
EPSG:3848
ll 44.524416439304986 14.487657266653233
- en 1216384.6117095747 4937651.237086001
- ll2 44.524416439132246 14.487657266584163
+ en 1216384.6117095742 4937651.237086002
+ ll2 44.524416439132274 14.487657266584156
EPSG:3849
ll -13.873537614356351 25.600859564126516
- en 2073134.6902123005 -1541394.394099621
- ll2 -13.873537614104288 25.6008595631745
+ en 2073134.6902123005 -1541394.3940996218
+ ll2 -13.873537614104295 25.6008595631745
EPSG:3850
ll 42.80952460181774 20.387262690705548
en 1322704.1951752987 4743193.219635792
@@ -11255,23 +11255,23 @@ EPSG:3850
EPSG:3851
ll -12.160567804907686 94.41441210874157
en -5344257.923178489 6286582.315409496
- ll2 -12.16056780490766 94.41441210874159
+ ll2 -12.160567804907659 94.4144121087416
EPSG:3852
ll -66.38471821642153 117.34890419717863
- en -1168174.6306723843 2075670.4229920444
- ll2 -66.38471821642231 117.34890419717864
+ en -1168174.630672379 2075670.4229920497
+ ll2 -66.38471821642234 117.34890419717865
EPSG:3854
ll 27.87326054549858 20.109422366147136
- en 302236.34887607605 -3414547.011764363
- ll2 27.873260545495903 20.109422366151808
+ en 302236.34887607675 -3414547.0117643625
+ ll2 27.87326054549591 20.109422366151822
EPSG:3857
ll 26.19321910736396 -57.05540747306637
en -6351378.906904483 3023031.7049287064
- ll2 26.19321910736395 -57.05540747306636
+ ll2 26.193219107363955 -57.05540747306637
EPSG:3873
ll -7.666177951489999 17.06421431896607
- en 1.9286383170033634E7 -848214.2247453575
- ll2 -7.666177951489815 17.06421431897459
+ en 1.9286383170033634E7 -848214.2247453578
+ ll2 -7.666177951489818 17.06421431897459
EPSG:3874
ll -74.21560093578528 17.25822007594924
en 2.0416744894898023E7 -8241304.619338861
@@ -11283,11 +11283,11 @@ EPSG:3875
EPSG:3876
ll 46.237683675004746 14.649671427171338
en 2.1933130978477847E7 5148836.916866951
- ll2 46.23768366175106 14.649671445520905
+ ll2 46.237683661751056 14.649671445520905
EPSG:3877
ll 37.201308582823216 32.94050721480718
- en 2.438367149970276E7 4165467.3951804293
- ll2 37.201308537979855 32.940507067386726
+ en 2.438367149970276E7 4165467.395180431
+ ll2 37.20130853797986 32.94050706738673
EPSG:3878
ll 38.007527118846355 24.310108829737366
en 2.452723486993383E7 4208378.887502061
@@ -11298,16 +11298,16 @@ EPSG:3879
ll2 73.18149317875702 34.29316342320523
EPSG:3880
ll -65.07822633006244 17.65964354269714
- en 2.6108586074353553E7 -7245958.519935789
- ll2 -65.07822631130075 17.659643691628176
+ en 2.6108586074353553E7 -7245958.5199357895
+ ll2 -65.0782263113008 17.659643691628176
EPSG:3881
ll -33.804381653858734 29.242838263969915
en 2.7707698260857176E7 -3744225.7199672232
ll2 -33.80438165385308 29.242838263980143
EPSG:3882
ll -50.569679908812766 32.59066814048468
- en 2.8825158692636855E7 -5614286.329871496
- ll2 -50.56967990792348 32.590668140295655
+ en 2.8825158692636855E7 -5614286.329871497
+ ll2 -50.56967990792349 32.59066814029565
EPSG:3883
ll 28.316824024986104 37.63125934388273
en 3.0348264169222012E7 3164008.8806213755
@@ -11315,107 +11315,107 @@ EPSG:3883
EPSG:3884
ll 8.654445032292514 26.260530275776965
en 3.0088151608510774E7 959056.2666093517
- ll2 8.654445032274138 26.260530276037006
+ ll2 8.654445032274138 26.260530276037002
EPSG:3885
ll -89.55952837259606 27.331012011112286
- en 3.1496851742981926E7 -9952868.542334279
- ll2 -89.55952837258998 27.33101201122966
+ en 3.1496851742981926E7 -9952868.54233428
+ ll2 -89.55952837259 27.331012011229443
EPSG:3889
ll 80.53453424889145 -129.40834019942696
- en -129.40834019942696 80.53453424919734
- ll2 80.5345342488922 -129.40834019942696
+ en -129.40834019942696 80.53453424919735
+ ll2 80.53453424889221 -129.40834019942696
EPSG:3890
ll 89.00501637294758 48.563598776346296
- en 518455.7233273467 9888419.464316374
- ll2 89.00501637341051 48.56359809596609
+ en 518455.7233273465 9888419.464316376
+ ll2 89.00501637341053 48.56359809596608
EPSG:3891
ll -83.69266017067842 52.77048842030145
- en 595023.8340566979 -9300198.202602806
- ll2 -83.69266017064584 52.77048831929847
+ en 595023.834056698 -9300198.202602804
+ ll2 -83.69266017064581 52.77048831929845
EPSG:3892
ll -20.82303165960832 46.75374687282746
- en 57869.35715236288 -2308393.7151883976
- ll2 -20.82303165951971 46.75374687274452
+ en 57869.35715236218 -2308393.7151883976
+ ll2 -20.823031659519724 46.75374687274452
EPSG:3893
ll 44.78211205611123 38.51811540003024
- en 168640.69220923015 1778711.882843384
- ll2 44.78211203924304 38.518115437557476
+ en 168640.69220923004 1778711.8828433834
+ ll2 44.78211203924302 38.51811543755747
EPSG:3901
ll -7.677156335272784 26.582676055752938
- en 3454009.7482458274 -848922.5765295731
- ll2 -7.677156306575635 26.582676074281167
+ en 3454009.7482458274 -848922.5765295734
+ ll2 -7.677156306575639 26.582676074281167
EPSG:3902
ll -66.25175602814141 26.90729002178849
- en 495833.7351649153 -7347975.032346045
- ll2 -66.25175602814221 26.907290021788487
+ en 495833.7351649155 -7347975.032346047
+ ll2 -66.25175602814225 26.90729002178849
EPSG:3903
ll 28.26672624173618 24.453833312859597
- en 250227.94312533957 3129378.9548565894
- ll2 28.26672624172795 24.453833312843177
+ en 250227.9431253395 3129378.954856589
+ ll2 28.266726241727945 24.453833312843177
EPSG:3906
ll -75.66460930265524 153.61901244396347
- en 153.62339319918323 -75.6593018085461
- ll2 -75.66461039508218 153.61901154232433
+ en 153.62339319918323 -75.65930180854609
+ ll2 -75.66461039508216 153.6190115423243
EPSG:3907
ll -73.8670622010268 5.760370534278085
- en 5214808.666784386 -8221637.782064308
- ll2 -73.86706121223833 5.760369669342896
+ en 5214808.666784386 -8221637.782064309
+ ll2 -73.86706121223835 5.760369669342889
EPSG:3908
ll -14.73982237325815 8.10669896063613
- en 5430588.654334034 -1654141.6523317492
- ll2 -14.739822157734935 8.106698930020547
+ en 5430588.654334035 -1654141.6523317497
+ ll2 -14.739822157734942 8.106698930020556
EPSG:3909
ll 51.49896144940104 23.14443558681199
en 7649325.941806131 5708698.241167463
- ll2 51.49896145095878 23.14443560441987
+ ll2 51.49896145095879 23.144435604419872
EPSG:3910
ll 25.632095373698817 14.986894492667172
- en 7593038.725363784 2866307.5688138553
- ll2 25.632095352715023 14.986894506225942
+ en 7593038.725363784 2866307.568813855
+ ll2 25.63209535271502 14.986894506225942
EPSG:3911
ll 12.134671694715038 20.364115231876923
- en 1084969.2799619478 1347113.1412750364
- ll2 12.134671737486478 20.364115181192524
+ en 1084969.2799619478 1347113.1412750366
+ ll2 12.13467173748648 20.36411518119252
EPSG:3912
ll 67.35426520206741 10.226837513502618
- en 295389.2658350193 2480533.9804851273
+ en 295389.2658350192 2480533.9804851264
ll2 67.35426520359464 10.226837519488715
EPSG:3920
ll -70.22034222830817 -56.565340908750514
- en 742584.9738269903 -7803169.996006523
+ en 742584.97382699 -7803169.996006523
ll2 -70.22034221961282 -56.565340911405855
EPSG:3942
ll 42.50224953559769 -0.5066786018577263
en 1411858.985481917 1261685.9957595589
- ll2 42.50224953559774 -0.5066786018577272
+ ll2 42.50224953559774 -0.5066786018577267
EPSG:3943
ll 43.90555462555216 9.09689182480521
en 2189372.9132868364 2318369.8170038997
ll2 43.9055546255522 9.096891824805208
EPSG:3944
ll 43.19615820273569 -2.2408194587228754
- en 1274301.655593946 3124223.7388553144
- ll2 43.19615820273572 -2.240819458722875
+ en 1274301.6555939459 3124223.7388553144
+ ll2 43.19615820273572 -2.2408194587228767
EPSG:3945
ll 42.57364172140781 -4.367440068101999
- en 1095466.1808782574 3957858.4306936576
- ll2 42.57364172140783 -4.367440068101998
+ en 1095466.1808782571 3957858.430693656
+ ll2 42.57364172140783 -4.367440068102
EPSG:3946
ll 46.450766039756 -1.5829952343218343
en 1348093.5108619956 5260228.6829278115
ll2 46.450766039756004 -1.5829952343218343
EPSG:3947
ll 45.274573855216566 8.148993756717044
- en 2103893.8135509207 6021477.631196574
+ en 2103893.8135509207 6021477.631196575
ll2 45.27457385521657 8.148993756717044
EPSG:3948
ll 47.57690494420086 8.633366759947714
en 2123416.1310845516 7168437.373686953
- ll2 47.576904944200855 8.633366759947712
+ ll2 47.57690494420085 8.633366759947712
EPSG:3949
ll 47.36655471156381 -1.410864163556286
en 1366910.6256544283 8028041.335254104
- ll2 47.36655471156381 -1.410864163556286
+ ll2 47.366554711563836 -1.410864163556286
EPSG:3950
ll 48.0634969752751 -5.238953399372484
en 1086868.313881684 9018423.494770935
@@ -11426,76 +11426,76 @@ EPSG:3968
ll2 -8.741088380975802 -34.72993580188111
EPSG:3969
ll 15.911857570495506 -67.71564828042057
- en 1350450.8215997515 -2199290.3115677023
- ll2 15.91185757049553 -67.71564828042057
+ en 1350450.821599752 -2199290.3115677023
+ ll2 15.911857570495522 -67.71564828042057
EPSG:3970
ll 54.424196668543715 -96.78338500410385
- en -1165170.92007724 2182203.5152833266
- ll2 54.42419666854405 -96.78338500410386
+ en -1165170.9200772392 2182203.5152833266
+ ll2 54.42419666854404 -96.78338500410385
EPSG:3976
ll -61.485142666969146 135.3681857020244
en 2214248.697965832 -2242890.906471596
- ll2 -61.485142666968244 135.3681857020244
+ ll2 -61.48514266696824 135.3681857020244
EPSG:3978
ll 54.734228094373535 -58.59865067673286
en 2178380.2356662564 1272691.530374487
- ll2 54.73422809437355 -58.59865067673286
+ ll2 54.73422809437355 -58.59865067673285
EPSG:3979
ll 69.23983545594258 -177.94783977512023
- en -2363496.081103235 4008420.1513068117
- ll2 69.2398354559435 -177.94783977512034
+ en -2363496.0811032364 4008420.1513068103
+ ll2 69.23983545594348 -177.94783977511972
EPSG:3986
ll -66.34953454343625 38.06570083809839
- en 560351.1803637771 -5889712.464152392
- ll2 -66.34953452848947 38.06570071166237
+ en 560351.1803637778 -5889712.464152392
+ ll2 -66.34953452848947 38.065700711662394
EPSG:3987
ll -14.26709124115925 23.32666940550432
- en -304827.4369270689 -87534.61641797493
- ll2 -14.267091236039128 23.326669404906447
+ en -304827.4369270686 -87534.61641797528
+ ll2 -14.267091236039132 23.326669404906447
EPSG:3988
ll -43.371210143894125 16.353382657316505
- en -582088.75939914 -3353973.903520521
- ll2 -43.37121008727649 16.353382862902055
+ en -582088.75939914 -3353973.9035205194
+ ll2 -43.37121008727648 16.353382862902052
EPSG:3989
ll 84.31010060227743 32.04398058021249
en 288748.66361986776 1.086772496856159E7
- ll2 84.31010061447638 32.043980726693654
+ ll2 84.3101006144764 32.043980726693654
EPSG:3991
ll 6.112939262628494 -11.378257242302851
- en 2.0629473379546147E7 -1236516.7982228228
- ll2 6.112939273900082 -11.3782572477182
+ en 2.062947337954615E7 -1236516.7982227765
+ ll2 6.1129392739000705 -11.378257247718208
EPSG:3992
ll 41.94796516192595 -20.193469576887168
- en 1.4153229331611961E7 1.0871084774314871E7
- ll2 41.9479651127952 -20.193469561386244
+ en 1.415322933161192E7 1.0871084774314882E7
+ ll2 41.94796511279522 -20.193469561386255
EPSG:3994
ll -50.71638723313427 160.46719257754955
en 5087418.440840361 -4941555.3324789135
ll2 -50.716387233124316 160.46719257754955
EPSG:3995
ll -58.51924034223759 170.25401704511552
- en 7385615.258124021 4.2999811593550265E7
- ll2 -58.51924034223564 170.25401704511552
+ en 7385615.258124002 4.299981159355027E7
+ ll2 -58.51924034223564 170.25401704511555
EPSG:3996
ll 24.772353705533575 -34.19646314317066
- en -4506888.8362823045 -6632566.198773273
- ll2 24.77235370553283 -34.19646314317066
+ en -4506888.836282304 -6632566.198773271
+ ll2 24.77235370553283 -34.196463143170654
EPSG:3997
ll -27.792837420424938 58.19549642287275
- en 782131.0582266948 -3078771.982676276
- ll2 -27.792837420410585 58.195496422903716
+ en 782131.0582266948 -3078771.9826762765
+ ll2 -27.79283742041059 58.195496422903716
EPSG:4001
ll 71.01693608544761 140.00358876713972
- en 140.00358876713972 71.0169360854476
- ll2 71.0169360854476 140.00358876713972
+ en 140.00358876713972 71.01693608544761
+ ll2 71.01693608544761 140.00358876713972
EPSG:4002
ll 17.867600957489373 -85.13444393847377
- en -85.13444393847377 17.867600957489373
- ll2 17.867600957489373 -85.13444393847377
+ en -85.13444393847377 17.867600957489376
+ ll2 17.867600957489376 -85.13444393847377
EPSG:4003
ll 58.734480155782194 -106.16569287757386
- en -106.16569287757386 58.73448015578218
- ll2 58.73448015578218 -106.16569287757386
+ en -106.16569287757386 58.7344801557822
+ ll2 58.734480155782194 -106.16569287757386
EPSG:4004
ll -8.343223475007804 152.5884302292837
en 152.5884302292837 -8.343223475007804
@@ -11506,8 +11506,8 @@ EPSG:4005
ll2 88.08569939821885 116.19542396643016
EPSG:4006
ll -25.959653653934254 119.41354396996707
- en 119.41354396996708 -25.959653653934257
- ll2 -25.959653653934257 119.41354396996708
+ en 119.41354396996707 -25.959653653934257
+ ll2 -25.959653653934257 119.41354396996707
EPSG:4007
ll -88.18280335034964 131.869560192365
en 131.869560192365 -88.18280335034964
@@ -11522,12 +11522,12 @@ EPSG:4009
ll2 73.88974233519943 -71.97343716599325
EPSG:4010
ll 68.17821099997497 46.15087196827352
- en 46.15087196827351 68.17821099997498
- ll2 68.17821099997498 46.15087196827351
+ en 46.15087196827352 68.17821099997497
+ ll2 68.17821099997497 46.15087196827352
EPSG:4011
ll -78.8330043877763 22.597852096305104
- en 22.597852096305107 -78.8330043877763
- ll2 -78.8330043877763 22.597852096305107
+ en 22.597852096305104 -78.8330043877763
+ ll2 -78.8330043877763 22.597852096305104
EPSG:4012
ll 76.9957115549764 -45.96403558979418
en -45.96403558979418 76.9957115549764
@@ -11538,20 +11538,20 @@ EPSG:4013
ll2 -82.40231517780272 -177.2191940811351
EPSG:4014
ll -48.018477867111486 117.22280853547664
- en 117.22280853547666 -48.01847786711149
- ll2 -48.01847786711149 117.22280853547666
+ en 117.22280853547666 -48.018477867111486
+ ll2 -48.018477867111486 117.22280853547666
EPSG:4015
ll 50.63794640973708 103.60608854433775
- en 103.60608854433772 50.637946409737076
- ll2 50.637946409737076 103.60608854433772
+ en 103.60608854433775 50.63794640973708
+ ll2 50.63794640973708 103.60608854433775
EPSG:4016
ll -12.774605970805652 -72.60226007551469
en -72.60226007551469 -12.774605970805652
ll2 -12.774605970805652 -72.60226007551469
EPSG:4018
ll 61.39880539239306 -178.46023565024547
- en -178.46023565024547 61.39880539239307
- ll2 61.398805392393065 -178.46023565024547
+ en -178.4602356502455 61.39880539239307
+ ll2 61.39880539239308 -178.4602356502455
EPSG:4019
ll -35.38214903778745 -171.01416984138268
en -171.01416984138268 -35.38214903778745
@@ -11566,12 +11566,12 @@ EPSG:4021
ll2 -58.38343284811388 -118.53885273386545
EPSG:4022
ll 9.536244843970934 -133.7428163178167
- en -133.74281631781668 9.536244843970934
- ll2 9.536244843970934 -133.74281631781668
+ en -133.7428163178167 9.536244843970934
+ ll2 9.536244843970934 -133.7428163178167
EPSG:4023
ll 9.25066655746869 49.68311425881345
- en 49.68311425881344 9.25066655776848
- ll2 9.250666557468689 49.68311425881345
+ en 49.683114258813454 9.250666557768481
+ ll2 9.25066655746869 49.683114258813454
EPSG:4024
ll 49.39708044354248 135.30007608262247
en 135.30007608262247 49.39708044354248
@@ -11582,48 +11582,48 @@ EPSG:4025
ll2 47.853739384731625 -91.53852911503012
EPSG:4026
ll -74.5237725756009 37.935577399474056
- en 482990.2968090169 -1.3296041359305294E7
- ll2 -74.52377256580579 37.93557680432611
+ en 482990.2968090168 -1.3296041359305296E7
+ ll2 -74.52377256580581 37.93557680432614
EPSG:4027
ll 75.06725870170939 108.21623802590636
- en 108.21623802590634 75.06725870170939
- ll2 75.06725870170939 108.21623802590635
+ en 108.21623802590636 75.06725870170939
+ ll2 75.06725870170939 108.21623802590636
EPSG:4028
ll -56.02596376075079 -25.37120867823603
en -25.37120867823603 -56.025963760750784
ll2 -56.025963760750784 -25.37120867823603
EPSG:4029
ll 48.3317633016035 20.513157669302757
- en 20.513157669302757 48.33176330160351
- ll2 48.33176330160351 20.513157669302757
+ en 20.513157669302757 48.3317633016035
+ ll2 48.3317633016035 20.513157669302757
EPSG:4030
ll -76.45862687113987 -129.25486208149928
- en -129.25486208149925 -76.45862687113987
- ll2 -76.45862687113987 -129.25486208149925
+ en -129.25486208149928 -76.45862687113987
+ ll2 -76.45862687113987 -129.25486208149928
EPSG:4031
ll -7.615977032876955 25.419334104651114
en 25.419334104651117 -7.615977032876956
- ll2 -7.615977032876957 25.41933410465112
+ ll2 -7.615977032876957 25.419334104651117
EPSG:4032
ll -89.65164035725745 37.439569275205514
- en 37.43956927520551 -89.65164035725745
- ll2 -89.65164035725745 37.43956927520551
+ en 37.439569275205514 -89.65164035725745
+ ll2 -89.65164035725745 37.439569275205514
EPSG:4033
ll 51.20412666146876 -2.962479565101262
- en -2.962479565101262 51.204126661468756
- ll2 51.204126661468756 -2.962479565101262
+ en -2.962479565101262 51.20412666146877
+ ll2 51.20412666146878 -2.962479565101262
EPSG:4034
ll -13.6637468450526 53.19000922683276
en 53.19000922683275 -13.663746845052602
- ll2 -13.663746845052602 53.190009226832736
+ ll2 -13.663746845052604 53.19000922683275
EPSG:4035
ll 13.407290389433342 -30.758060676734658
- en -30.75806067673466 13.407290389433342
- ll2 13.407290389433342 -30.75806067673466
+ en -30.75806067673465 13.407290389433342
+ ll2 13.407290389433342 -30.75806067673465
EPSG:4036
ll -4.0929944795323365 40.349619680678586
- en 40.349619680678586 -4.0929944795323365
- ll2 -4.0929944795323365 40.349619680678586
+ en 40.34961968067859 -4.0929944795323365
+ ll2 -4.0929944795323365 40.34961968067859
EPSG:4037
ll -69.7491550095972 27.030682029108085
en 501185.23693169764 -7737900.250982583
@@ -11634,8 +11634,8 @@ EPSG:4038
ll2 64.29330903726243 38.827600490750946
EPSG:4041
ll 76.22780164777004 -94.75324746141776
- en -94.75324746141777 76.22780164777004
- ll2 76.22780164777004 -94.75324746141777
+ en -94.75324746141776 76.22780164777004
+ ll2 76.22780164777004 -94.75324746141776
EPSG:4042
ll -0.5348624204934396 -174.0107060221089
en -174.0107060221089 -0.5348624204934396
@@ -11643,15 +11643,15 @@ EPSG:4042
EPSG:4043
ll -46.355969566316 -62.77086442338046
en -62.770864423380466 -46.355969566316
- ll2 -46.355969566316 -62.77086442338046
+ ll2 -46.355969566316 -62.77086442338047
EPSG:4044
ll -41.33273795929097 108.26299574494828
- en 108.2629957449483 -41.33273795929096
- ll2 -41.33273795929096 108.2629957449483
+ en 108.2629957449483 -41.33273795929097
+ ll2 -41.33273795929097 108.2629957449483
EPSG:4045
ll -25.373068308340706 -16.171373698478135
en -16.171373698478135 -25.373068308340706
- ll2 -25.373068308340702 -16.171373698478135
+ ll2 -25.373068308340706 -16.171373698478135
EPSG:4046
ll -79.45472058960766 21.10545313982084
en 21.10545313982084 -79.45472058994694
@@ -11663,67 +11663,67 @@ EPSG:4047
EPSG:4048
ll 74.3061238979127 2.6484739030865905
en 218631.70503906725 1.82708278685378E7
- ll2 74.30612388829208 2.6484743998764158
+ ll2 74.30612388829206 2.648474399876416
EPSG:4049
ll 1.272806296050092 21.53116400504091
en 1340513.8649680433 1.014195824656353E7
- ll2 1.2728062957112152 21.531163979861695
+ ll2 1.2728062957112152 21.53116397986169
EPSG:4050
ll 38.47223437952647 10.011464141470562
- en -22760.906878187496 1.427652164804699E7
- ll2 38.47223437671274 10.011464140755558
+ en -22760.90687818738 1.427652164804699E7
+ ll2 38.47223437671274 10.011464140755562
EPSG:4051
ll 18.62119088723047 8.61099988411268
en -494271.45891701686 1.2085710812052011E7
- ll2 18.62119087380624 8.610999905029864
+ ll2 18.621190873806242 8.610999905029864
EPSG:4052
ll 33.52693956354072 47.251334328748015
en 47.251334328748015 33.52693956354072
ll2 33.52693956354072 47.251334328748015
EPSG:4053
ll 56.88445806026462 -43.92418521988637
- en -43.92418521988637 56.884458060264606
- ll2 56.8844580602646 -43.92418521988637
+ en -43.92418521988637 56.88445806026462
+ ll2 56.88445806026462 -43.92418521988637
EPSG:4054
ll -24.888291851444365 -17.34572300718696
- en -17.34572300718696 -24.88829185144436
- ll2 -24.888291851444357 -17.34572300718696
+ en -17.34572300718696 -24.888291851444365
+ ll2 -24.888291851444365 -17.34572300718696
EPSG:4055
ll 88.53052705733165 -51.400329791500155
- en -51.400329791500155 88.52062793548181
- ll2 88.530494110469 -51.400329791500155
+ en -51.40032979150016 88.52062793548181
+ ll2 88.53049411046901 -51.40032979150016
EPSG:4056
ll -72.57558002572465 26.987425387065414
- en 733135.3856090483 1930864.190177571
+ en 733135.3856090482 1930864.190177571
ll2 -72.5755800226548 26.98742535271282
EPSG:4057
ll -57.05788628907728 24.882442860102483
- en 674852.6694164836 3670580.1625958467
+ en 674852.6694164835 3670580.1625958476
ll2 -57.057886289025504 24.88244286010173
EPSG:4058
ll -79.91908036200206 19.83956373217317
en 418743.80421779037 1121877.2481719255
- ll2 -79.91908036196872 19.83956373251879
+ ll2 -79.91908036196872 19.839563732518794
EPSG:4059
ll -29.49786435219829 35.85413579936921
- en 1457885.0425784714 6695058.581185353
- ll2 -29.497864326805974 35.854135765663145
+ en 1457885.0425784704 6695058.581185352
+ ll2 -29.49786432680598 35.85413576566314
EPSG:4060
ll 25.94051632671757 27.31253020445846
- en 431143.32849543367 1.2870138206378058E7
- ll2 25.940516326717155 27.31253020445845
+ en 431143.3284954333 1.2870138206378058E7
+ ll2 25.94051632671716 27.312530204458447
EPSG:4061
ll 0.5217320615330863 14.363396688961585
- en 429163.44025882764 1.0057670668314097E7
- ll2 0.5217320615330809 14.363396688961611
+ en 429163.4402588279 1.0057670668314097E7
+ ll2 0.5217320615330809 14.363396688961613
EPSG:4062
ll 42.25924820635802 16.180579576273516
- en 102445.97903333273 1.4689818937038984E7
- ll2 42.259248205408696 16.180579576021245
+ en 102445.97903333325 1.4689818937038984E7
+ ll2 42.259248205408696 16.180579576021252
EPSG:4063
ll 3.040823075067877 26.191540232474424
en 410161.50498474407 1.0336139106139634E7
- ll2 3.0408230750678777 26.191540232474548
+ ll2 3.040823075067878 26.191540232474548
EPSG:4071
ll 33.02315964676016 -35.07046087788009
en 1429151.2443878695 1.3698021640987365E7
@@ -11734,24 +11734,24 @@ EPSG:4075
ll2 42.83195556734075 -47.43334247231155
EPSG:4081
ll -83.57298086929686 6.620527722150115
- en 6.620527722150115 -83.57298086950662
- ll2 -83.57298086929741 6.620527722150115
+ en 6.620527722150115 -83.57298086950664
+ ll2 -83.57298086929742 6.620527722150114
EPSG:4082
ll 72.86379003266742 -22.84311659777252
- en 439393.6722709376 8086216.911247756
- ll2 72.8637900326673 -22.843116597772326
+ en 439393.67227093765 8086216.911247759
+ ll2 72.86379003266732 -22.84311659777233
EPSG:4083
ll -81.79781909759004 -12.202668772943063
- en 544537.6120507447 -9083336.46905435
- ll2 -81.79781909758896 -12.202668772952853
+ en 544537.6120507446 -9083336.469054352
+ ll2 -81.79781909758896 -12.20266877295285
EPSG:4093
ll -25.968414559608703 9.473380853796215
en 247405.86271755665 -7873363.578621129
- ll2 -25.968414559608295 9.473380853796218
+ ll2 -25.96841455960829 9.473380853796218
EPSG:4094
ll 18.86064548021288 19.588938901466406
- en 1414228.2105903956 -2886180.5149361743
- ll2 18.86064546476606 19.588938876549225
+ en 1414228.2105903956 -2886180.514936174
+ ll2 18.860645464766076 19.58893887654922
EPSG:4095
ll 68.13766100629559 2.566408242474058
en 219402.62884225993 2589471.4892409137
@@ -11759,87 +11759,87 @@ EPSG:4095
EPSG:4096
ll 80.91062874574274 7.869649207527861
en 674505.0357701173 3994544.5499043036
- ll2 80.91062874528859 7.869649252934207
+ ll2 80.91062874528859 7.869649252934205
EPSG:4097
ll -48.09433317955421 4.702631317102562
- en -120068.96210013248 -1.0337751266263563E7
- ll2 -48.09433317897478 4.7026313170968885
+ en -120068.96210013243 -1.0337751266263563E7
+ ll2 -48.09433317897477 4.7026313170968885
EPSG:4098
ll 10.712149343507988 15.51790233254346
en 1004479.753893412 -3809975.0788651416
- ll2 10.712149343228957 15.517902330539139
+ ll2 10.712149343228957 15.517902330539137
EPSG:4099
ll 81.23821998232779 3.459422422812139
- en 459427.31889245764 4033293.9209876154
- ll2 81.23821998178599 3.4594226017434178
+ en 459427.3188924574 4033293.9209876135
+ ll2 81.23821998178597 3.4594226017434178
EPSG:4100
ll 88.87957657640285 5.775899955155078
- en 779941.0191573526 4878439.186108857
- ll2 88.87957657676158 5.775900444434963
+ en 779941.0191573529 4878439.186108859
+ ll2 88.87957657676161 5.775900444434859
EPSG:4120
ll -23.02162690812908 94.4866195447159
- en 94.48661954471591 -23.02162690812908
- ll2 -23.02162690812908 94.48661954471591
+ en 94.4866195447159 -23.02162690812908
+ ll2 -23.02162690812908 94.4866195447159
EPSG:4121
ll -86.99876375517756 63.47786523012732
- en 63.44157586750427 -86.99867910087836
- ll2 -86.99876375842814 63.47786663344327
+ en 63.441575867504255 -86.99867910087836
+ ll2 -86.99876375842817 63.47786663344327
EPSG:4122
ll 86.11094655680029 157.02076209987717
- en 157.02076209987717 86.11094655680027
- ll2 86.11094655680027 157.02076209987717
+ en 157.02076209987717 86.11094655680029
+ ll2 86.11094655680029 157.02076209987717
EPSG:4123
ll -43.06549943922359 155.62374130759514
en 155.62380603716508 -43.06648615973683
- ll2 -43.06549947005911 155.62374122532088
+ ll2 -43.065499470059116 155.62374122532088
EPSG:4124
ll -84.35922281675634 -92.13319503810129
- en -92.16290830460433 -84.35938855723501
- ll2 -84.35922280999378 -92.13318743282984
+ en -92.16290830460434 -84.35938855723504
+ ll2 -84.35922280999381 -92.13318743282987
EPSG:4125
ll 62.0480757969614 -93.07439484118267
en -93.06596763842002 62.0421345756893
ll2 62.04807668901479 -93.07439610492693
EPSG:4126
ll -59.689466846927765 126.27153910283829
- en 126.27153910283832 -59.68946684692776
- ll2 -59.68946684692776 126.27153910283832
+ en 126.27153910283829 -59.68946684692777
+ ll2 -59.68946684692777 126.27153910283829
EPSG:4127
ll 57.5214557508053 106.30289386394549
en 106.30114397806176 57.523936200360005
- ll2 57.521455621907926 106.30289395469622
+ ll2 57.52145562190794 106.30289395469623
EPSG:4128
ll -70.12837750316056 -17.321507962443462
en -17.321507962443462 -70.12837750316056
ll2 -70.12837750316056 -17.321507962443462
EPSG:4129
ll -80.82515424998273 105.98749796289286
- en 105.97867146372583 -80.82473525364853
+ en 105.97867146372585 -80.82473525364853
ll2 -80.8251542396913 105.98749774605173
EPSG:4130
ll 66.79747353183984 -61.98796529443487
- en -61.987965294434886 66.79747353184025
- ll2 66.79747353184067 -61.98796529443489
+ en -61.987965294434865 66.79747353184027
+ ll2 66.79747353184068 -61.987965294434865
EPSG:4131
ll -60.70894450638639 -20.23899843416416
- en -20.25539104079409 -60.70799422639848
- ll2 -60.70894466339562 -20.238995727151046
+ en -20.255391040794088 -60.70799422639848
+ ll2 -60.70894466339562 -20.23899572715104
EPSG:4132
ll 71.12925238327946 138.83920550575317
- en 138.83139156276007 71.13065533352588
- ll2 71.1292524267514 138.8392052638511
+ en 138.83139156276007 71.1306553335259
+ ll2 71.12925242675144 138.83920526385114
EPSG:4133
ll -6.49578471743699 7.353422275664457
en 7.3534285656174125 -6.495783777956876
- ll2 -6.495784717436902 7.35342227566444
+ ll2 -6.495784717436903 7.353422275664441
EPSG:4134
ll -24.4301436369321 -164.13832838286726
- en -164.1424589949117 -24.43437830889843
- ll2 -24.430143826923512 -164.13832849696882
+ en -164.14245899491166 -24.43437830889843
+ ll2 -24.430143826923512 -164.1383284969688
EPSG:4135
ll -24.931544205071503 53.881678910207484
en 53.88382990407203 -24.930961602168956
- ll2 -24.93154421173798 53.88167888572837
+ ll2 -24.931544211737982 53.88167888572837
EPSG:4136
ll 0.9928121496124618 93.85421177757456
en 93.85421177757456 0.9928121496124618
@@ -11850,20 +11850,20 @@ EPSG:4137
ll2 21.68286895074324 -85.50497761467177
EPSG:4138
ll -69.79151242887825 173.08037131804218
- en 173.08037131804215 -69.79151242887825
- ll2 -69.79151242887825 173.08037131804215
+ en 173.08037131804218 -69.79151242887825
+ ll2 -69.79151242887825 173.08037131804218
EPSG:4139
ll 85.53749064344007 26.93368271917805
en 26.92686911275734 85.53827114900804
- ll2 85.53749061118148 26.93368300071858
+ ll2 85.53749061118148 26.933683000718577
EPSG:4140
ll 26.130819484194248 -74.62029520063342
en -74.62029520063342 26.130819484940716
- ll2 26.13081948419381 -74.62029520063342
+ ll2 26.130819484193815 -74.62029520063342
EPSG:4141
ll -86.64177565679351 118.49614705346204
- en 118.49370966738893 -86.64243964008789
- ll2 -86.64177565184052 118.49614707164066
+ en 118.49370966738893 -86.6424396400879
+ ll2 -86.64177565184055 118.49614707164066
EPSG:4142
ll -50.586523436229825 42.535362320165234
en 42.533617643924096 -50.59188180572301
@@ -11871,95 +11871,95 @@ EPSG:4142
EPSG:4143
ll 89.9669654989288 -11.05055346324724
en -11.471813344024861 89.96577860664961
- ll2 89.96696545642435 -11.050569103092283
+ ll2 89.96696545642433 -11.050569103092283
EPSG:4144
ll 0.17528300076082814 -59.805278501571905
- en -59.81057206890791 0.17283328724432687
- ll2 0.17528356045494595 -59.80527730023083
+ en -59.810572068907895 0.17283328724432684
+ ll2 0.17528356045494592 -59.805277300230806
EPSG:4145
ll -63.76358598810526 137.20599084462629
- en 137.22003033446512 -63.765249251415014
- ll2 -63.763585784275755 137.20598912717907
+ en 137.22003033446512 -63.76524925141503
+ ll2 -63.76358578427578 137.20598912717904
EPSG:4146
ll -81.38962078906229 -62.47025793540122
- en -62.506228343494094 -81.38490365047392
- ll2 -81.38962151862856 -62.47025236796109
+ en -62.506228343494115 -81.38490365047393
+ ll2 -81.38962151862857 -62.4702523679611
EPSG:4147
ll -19.692606914930565 117.12945641916735
en 117.1288367000254 -19.69179168721118
ll2 -19.69260690900759 117.12945641469159
EPSG:4148
ll 70.07944198628243 40.98798679715384
- en 40.987986797153845 70.0794419862829
- ll2 70.07944198628336 40.987986797153845
+ en 40.98798679715384 70.0794419862829
+ ll2 70.07944198628336 40.98798679715384
EPSG:4149
ll 79.54974239412778 76.62131933244655
- en 76.65354028241829 79.55037309373579
+ en 76.65354028241832 79.5503730937358
ll2 79.54974236981002 76.62131809359339
EPSG:4150
ll -48.29591769525581 -60.10087009836607
- en -60.10885105559438 -48.29991768700148
- ll2 -48.295917198824064 -60.10086911095532
+ en -60.1088510555944 -48.299917687001475
+ ll2 -48.295917198824064 -60.100869110955344
EPSG:4151
ll 79.98616125538126 -25.821195442760995
- en -25.82119544276099 79.98616125570418
- ll2 79.98616125538206 -25.82119544276099
+ en -25.821195442760995 79.98616125570418
+ ll2 79.98616125538204 -25.821195442760995
EPSG:4152
ll 89.5372735273811 -147.6340729313511
en -147.63407293135114 89.5372735273931
ll2 89.53727352737468 -147.63407293135114
EPSG:4153
ll 19.76162794629556 -1.5961448831670566
- en -1.5946071741970758 19.763105724567577
- ll2 19.761627961525523 -1.5961448674136482
+ en -1.5946071741970758 19.763105724567588
+ ll2 19.761627961525534 -1.5961448674136485
EPSG:4154
ll 8.058480792470348 141.7826641074604
en 141.78106659083733 8.060190670513753
ll2 8.058480856251295 141.7826640482623
EPSG:4155
ll 13.729319172604505 178.48206539115762
- en 178.482387035692 13.72986288698009
- ll2 13.729319190063537 178.4820654014199
+ en 178.48238703569197 13.72986288698009
+ ll2 13.729319190063539 178.48206540141993
EPSG:4156
ll -32.95708345714404 -122.51182728578547
- en -122.51670236038669 -32.95830097377776
- ll2 -32.95708320784195 -122.51182629235774
+ en -122.51670236038666 -32.95830097377775
+ ll2 -32.95708320784194 -122.51182629235771
EPSG:4157
ll 77.33726400337281 107.43925161526602
en 107.43925161526602 77.33726400337281
ll2 77.33726400337281 107.43925161526602
EPSG:4158
ll -25.219855416072548 17.47453286031532
- en 17.471009286849977 -25.222320546137638
- ll2 -25.219855517808195 17.474532715700423
+ en 17.471009286849977 -25.22232054613764
+ ll2 -25.219855517808202 17.474532715700423
EPSG:4159
ll -40.261860791963656 -54.97716129727955
- en -54.9753776854951 -40.26170933681637
- ll2 -40.2618607842848 -54.97716120719427
+ en -54.97537768549511 -40.26170933681636
+ ll2 -40.2618607842848 -54.97716120719429
EPSG:4160
ll 21.16806904309773 86.73671631608482
- en 86.73671631608484 21.168069043097734
- ll2 21.168069043097734 86.73671631608484
+ en 86.73671631608482 21.16806904309773
+ ll2 21.16806904309773 86.73671631608482
EPSG:4161
ll -1.5919176546830585 -16.656244297314515
- en -16.65643566651131 -1.593654140442604
- ll2 -1.59191772815578 -16.6562443053574
+ en -16.656435666511314 -1.5936541404426043
+ ll2 -1.5919177281557806 -16.6562443053574
EPSG:4162
ll 29.384027565974577 31.76233236383274
en 31.762332363832737 29.384027565974577
- ll2 29.384027565974577 31.762332363832734
+ ll2 29.384027565974577 31.76233236383274
EPSG:4163
ll -39.451518790330155 -74.04583396375052
- en -74.04583396375052 -39.45151879033017
- ll2 -39.45151879033018 -74.04583396375052
+ en -74.04583396375052 -39.45151879033018
+ ll2 -39.45151879033019 -74.04583396375052
EPSG:4164
ll -79.36441273089866 -10.175009280576461
- en -10.167768425530987 -79.36407071783269
- ll2 -79.36441272900451 -10.175009240455658
+ en -10.167768425530996 -79.36407071783267
+ ll2 -79.36441272900451 -10.175009240455667
EPSG:4165
ll 0.15810412196304924 -150.17507016347764
- en -150.17232550436287 0.15786508550403794
- ll2 0.15810411157557994 -150.17507004500519
+ en -150.1723255043629 0.1578650855040379
+ ll2 0.15810411157557996 -150.1750700450052
EPSG:4166
ll 62.91941964897515 -138.84154991307048
en -138.84154991307048 62.919419648975506
@@ -11970,72 +11970,72 @@ EPSG:4167
ll2 -46.09881237579195 69.72608178471589
EPSG:4168
ll 51.76729341099207 12.75321320496559
- en 12.75212479686733 51.765612900065264
- ll2 51.76729335844076 12.75321317101604
+ en 12.752124796867335 51.76561290006525
+ ll2 51.76729335844075 12.753213171016045
EPSG:4169
ll -76.23963461747563 125.80256961012788
- en 125.80165695180402 -76.24294774427224
- ll2 -76.2396343428961 125.80256968571906
+ en 125.80165695180402 -76.24294774427226
+ ll2 -76.23963434289612 125.80256968571908
EPSG:4170
ll 48.63419850124956 -65.56911299261024
- en -65.56911299261023 48.63419850218508
- ll2 48.63419850124969 -65.56911299261023
+ en -65.56911299261024 48.63419850218509
+ ll2 48.63419850124971 -65.56911299261024
EPSG:4171
ll -10.048414257335807 -52.323518847570966
- en -52.32351884757095 -10.048414257660419
- ll2 -10.048414257335805 -52.32351884757095
+ en -52.32351884757095 -10.048414257660417
+ ll2 -10.048414257335802 -52.32351884757095
EPSG:4172
ll 20.884205806624706 131.01610722039777
en 131.01610722039777 20.884205807253768
ll2 20.88420580662464 131.01610722039777
EPSG:4173
ll -56.308478022120546 -87.80380994665103
- en -87.80380994665101 -56.308478022990876
- ll2 -56.30847802212094 -87.80380994665101
+ en -87.80380994665103 -56.308478022990876
+ ll2 -56.30847802212094 -87.80380994665103
EPSG:4174
ll 46.25556436195683 128.83947811188108
- en 128.83947811188108 46.25556436195682
- ll2 46.25556436195682 128.83947811188108
+ en 128.83947811188108 46.25556436195683
+ ll2 46.25556436195683 128.83947811188108
EPSG:4175
ll -33.85381794356434 86.991751403237
- en 86.99079953336964 -33.85748273900543
+ en 86.99079953336962 -33.85748273900543
ll2 -33.85381791308323 86.99175141111697
EPSG:4176
ll 24.237301585217622 80.46932905640074
- en 80.46932905640074 24.237301585924456
- ll2 24.237301585217395 80.46932905640074
+ en 80.46932905640074 24.237301585924452
+ ll2 24.23730158521739 80.46932905640074
EPSG:4178
ll 27.25272318112542 -161.7147967875419
- en -161.71603929453332 27.25338399156679
- ll2 27.252723189935384 -161.71479680402024
+ en -161.71603929453335 27.253383991566785
+ ll2 27.252723189935384 -161.7147968040202
EPSG:4179
ll 16.96532397619444 -11.51593816777509
- en -11.514915180492737 16.9660986590058
- ll2 16.96532399417245 -11.515938139359575
+ en -11.51491518049274 16.966098659005805
+ ll2 16.965323994172458 -11.515938139359578
EPSG:4180
ll 56.09478994942023 58.943115253411435
- en 58.94311525341142 56.094789950293254
- ll2 56.094789949420615 58.94311525341142
+ en 58.94311525341144 56.09478995029325
+ ll2 56.09478994942061 58.94311525341144
EPSG:4181
ll 63.046879476190526 157.260847728106
- en 157.25854784112522 63.04999807567302
- ll2 63.04687955254434 157.26084767200078
+ en 157.25854784112525 63.049998075673045
+ ll2 63.046879552544375 157.26084767200086
EPSG:4182
ll 63.124951330789486 21.54815228156096
en 21.54817394387815 63.12162521192795
- ll2 63.124951307956806 21.54815228170948
+ ll2 63.1249513079568 21.54815228170948
EPSG:4183
ll 29.14790838385275 -118.8293430876129
- en -118.82757910720387 29.148485352706412
- ll2 29.147908395380252 -118.82934305254754
+ en -118.82757910720392 29.148485352706412
+ ll2 29.147908395380252 -118.82934305254756
EPSG:4184
ll -6.233916823150508 -38.694751846849044
- en -38.69459949302206 -6.234328902578206
- ll2 -6.2339168230881485 -38.69475184687196
+ en -38.69459949302207 -6.234328902578206
+ ll2 -6.2339168230881485 -38.694751846871974
EPSG:4185
ll -53.77126666899477 -91.76649915826079
- en -91.76649915826077 -53.77126666899478
- ll2 -53.77126666899477 -91.76649915826077
+ en -91.76649915826079 -53.77126666899478
+ ll2 -53.77126666899478 -91.76649915826079
EPSG:4188
ll -77.21313277868869 -175.11284031359375
en -175.12087455970234 -77.2098129921906
@@ -12043,23 +12043,23 @@ EPSG:4188
EPSG:4189
ll 39.9891919471182 80.20195866940924
en 80.20195866940924 39.98919194804733
- ll2 39.989191947118236 80.20195866940924
+ ll2 39.98919194711823 80.20195866940924
EPSG:4190
ll -80.66521448899688 143.86318000668473
en 143.86318000668473 -80.66521448929872
- ll2 -80.66521448899765 143.86318000668473
+ ll2 -80.66521448899763 143.86318000668473
EPSG:4191
ll 8.385178597193274 23.20502030475606
- en 23.203756808072598 8.385028829887082
- ll2 8.38517861572447 23.20502030799358
+ en 23.203756808072594 8.385028829887082
+ ll2 8.385178615724472 23.205020307993575
EPSG:4192
ll 23.623365250711373 65.14390343075053
- en 65.14279049880031 23.623808128093053
- ll2 23.62336524907938 65.14390343482806
+ en 65.14279049880031 23.62380812809306
+ ll2 23.623365249079388 65.14390343482806
EPSG:4193
ll -76.99569594631555 -112.50156959832279
en -112.50127480653592 -76.9984501782165
- ll2 -76.99569588535802 -112.5015696048437
+ ll2 -76.99569588535802 -112.50156960484372
EPSG:4194
ll -41.99139968384419 -124.08612053984115
en -124.08682630587599 -41.98971075394404
@@ -12067,15 +12067,15 @@ EPSG:4194
EPSG:4195
ll -4.3608510021083475 -129.4682842094754
en -129.46737375217717 -4.359832694311073
- ll2 -4.360851012173553 -129.4682842205746
+ ll2 -4.360851012173553 -129.46828422057456
EPSG:4196
ll -52.447104515584215 136.81331933933666
- en 136.8171124183828 -52.450146432278274
- ll2 -52.44710469956233 136.8133195824969
+ en 136.8171124183828 -52.45014643227827
+ ll2 -52.44710469956231 136.8133195824969
EPSG:4197
ll -83.42752460042053 84.45616511508666
- en 84.45616511508668 -83.42752460042053
- ll2 -83.42752460042053 84.45616511508668
+ en 84.45616511508666 -83.42752460042053
+ ll2 -83.42752460042053 84.45616511508666
EPSG:4198
ll 68.16298985008027 64.66867882878333
en 64.66867882878333 68.16298985008027
@@ -12083,142 +12083,142 @@ EPSG:4198
EPSG:4199
ll -83.11064128258694 127.36210713365273
en 127.36210713365274 -83.11064128258694
- ll2 -83.11064128258694 127.36210713365277
+ ll2 -83.11064128258694 127.36210713365274
EPSG:4200
ll -85.99824737816041 -115.13862162364317
en -115.14863564953059 -85.99915846729024
- ll2 -85.99824740637816 -115.13862193257809
+ ll2 -85.99824740637816 -115.13862193257808
EPSG:4201
ll -86.44285886592803 -153.05214498868918
- en -153.04321540867045 -86.44474380523556
- ll2 -86.44285873925774 -153.052145588423
+ en -153.0432154086705 -86.44474380523555
+ ll2 -86.44285873925772 -153.0521455884231
EPSG:4202
ll -59.888053053510276 103.46284927952632
en 103.46035085865918 -59.88861220341583
- ll2 -59.888053045744996 103.46284931841015
+ ll2 -59.888053045745 103.46284931841015
EPSG:4203
ll 43.06482378912881 -114.01321792008957
- en -114.01195500238644 43.06445391371638
- ll2 43.064823777720605 -114.01321788127545
+ en -114.01195500238644 43.0644539137164
+ ll2 43.064823777720626 -114.01321788127545
EPSG:4204
ll 51.05335013266844 -49.44699475478316
- en -49.44325681857059 51.05471772145297
- ll2 51.05335018749139 -49.446994605348884
+ en -49.44325681857059 51.05471772145295
+ ll2 51.05335018749137 -49.44699460534888
EPSG:4205
ll 17.08931728957893 -129.1269426802258
- en -129.12759569820196 17.089322745695718
- ll2 17.089317289809767 -129.12694270768188
+ en -129.127595698202 17.08932274569572
+ ll2 17.089317289809774 -129.12694270768188
EPSG:4206
ll 31.842880945683874 -101.32142178185327
- en -101.32142178185326 31.842880945683866
- ll2 31.842880945683866 -101.32142178185327
+ en -101.32142178185326 31.842880945683877
+ ll2 31.842880945683877 -101.32142178185327
EPSG:4207
ll -18.0433035880491 27.69062840976838
- en 27.689800608787806 -18.043846638904743
- ll2 -18.04330358183284 27.69062841918667
+ en 27.689800608787813 -18.043846638904743
+ ll2 -18.04330358183284 27.690628419186677
EPSG:4208
ll 13.600739899143306 164.19660278345953
- en 164.19877253888436 13.60288876887923
- ll2 13.600740044699789 164.19660292949894
+ en 164.19877253888438 13.60288876887923
+ ll2 13.60074004469979 164.19660292949897
EPSG:4209
ll -27.407517833230308 144.66403759114831
- en 144.66245885596285 -27.40800356007876
- ll2 -27.40751785089971 144.66403753402088
+ en 144.66245885596283 -27.408003560078754
+ ll2 -27.407517850899712 144.66403753402082
EPSG:4210
ll 13.043735046795746 -145.71249438906088
en -145.71170907304375 13.04805643579989
- ll2 13.04373515471291 -145.71249436957433
+ ll2 13.043735154712909 -145.71249436957436
EPSG:4211
ll 41.20565895303389 -94.4861517122551
- en -94.48103620530786 41.201552474772235
- ll2 41.20565974863278 -94.4861526996676
+ en -94.48103620530786 41.20155247477223
+ ll2 41.20565974863279 -94.48615269966761
EPSG:4212
ll -77.66962984969763 -31.28873286587165
- en -31.300212958680255 -77.67061250286386
- ll2 -77.66962974851425 -31.288731684505
+ en -31.300212958680255 -77.67061250286388
+ ll2 -77.66962974851427 -31.288731684505006
EPSG:4213
ll -8.872998103435194 -24.846591461726774
- en -24.8454688221305 -8.875554742410653
- ll2 -8.872998109885692 -24.84659145891284
+ en -24.845468822130506 -8.875554742410655
+ ll2 -8.872998109885692 -24.846591458912847
EPSG:4214
ll -66.24954170999192 -37.08078665293971
- en -37.078258743762085 -66.25009412660178
- ll2 -66.24954172972029 -37.08078656276848
+ en -37.07825874376208 -66.25009412660178
+ ll2 -66.24954172972029 -37.08078656276847
EPSG:4215
ll 37.02296413232911 27.327799250430644
- en 27.327799250430644 37.02296413232911
- ll2 37.02296413232911 27.32779925043064
+ en 27.327799250430648 37.02296413232911
+ ll2 37.02296413232911 27.327799250430648
EPSG:4216
ll 42.36531922570825 -92.07695712755987
- en -92.07597785268345 42.36420718826465
- ll2 42.3653192247112 -92.07695712668502
+ en -92.07597785268348 42.36420718826465
+ ll2 42.36531922471121 -92.07695712668504
EPSG:4217
ll -55.86770972501465 172.78052005052774
- en 2005965.6001918556 -2.031750990216201E7
- ll2 -55.86770972501165 172.7805200505284
+ en 2005965.6001918556 -2.0317509902162015E7
+ ll2 -55.86770972501166 172.7805200505284
EPSG:4218
ll -61.05701444804126 -37.638199768070564
en -37.64612817455504 -61.056780155507006
ll2 -61.05701443018345 -37.63820037204598
EPSG:4219
ll -68.77679680924246 120.63215819827997
- en 120.63235395616861 -68.78264784931783
- ll2 -68.77679647990016 120.63215818727377
+ en 120.63235395616861 -68.78264784931784
+ ll2 -68.7767964799002 120.63215818727377
EPSG:4220
ll 85.39601538897347 63.49642913287258
en 63.50864244803728 85.39370512862276
- ll2 85.39601556665495 63.49642819308028
+ ll2 85.39601556665495 63.49642819308027
EPSG:4221
ll 74.64477562016353 -124.4518172592141
- en -124.44508828997073 74.64473572516958
- ll2 74.64477561863804 -124.4518170012193
+ en -124.44508828997076 74.64473572516958
+ ll2 74.64477561863804 -124.45181700121933
EPSG:4222
ll -24.58219012932753 86.40085893350977
- en 86.39958584672266 -24.581737892691052
- ll2 -24.582190124515922 86.40085892004026
+ en 86.39958584672267 -24.58173789269106
+ ll2 -24.582190124515932 86.40085892004032
EPSG:4223
ll 64.14702398918922 50.47941793532212
en 50.47517170071345 64.1464902030276
- ll2 64.1470239769715 50.479417838236216
+ ll2 64.14702397697151 50.47941783823624
EPSG:4224
ll -35.87329429040237 54.4073437584575
- en 54.4044797373427 -35.87443364058721
- ll2 -35.873294349873014 54.40734360962945
+ en 54.4044797373427 -35.874433640587206
+ ll2 -35.873294349873014 54.407343609629436
EPSG:4225
ll -64.93016878014222 49.11989454761138
en 49.11427317890844 -64.93072705811285
ll2 -64.93016879560285 49.11989439216513
EPSG:4226
ll 82.26528573108916 -131.0969508372282
- en -131.09695083722818 82.26528573108916
- ll2 82.26528573108916 -131.09695083722818
+ en -131.0969508372282 82.26528573108916
+ ll2 82.26528573108916 -131.0969508372282
EPSG:4227
ll 56.051807079247254 -8.066897348688485
- en -8.06660408444037 56.05210840390835
- ll2 56.05180707754662 -8.066897350340533
+ en -8.06660408444037 56.052108403908356
+ ll2 56.051807077546634 -8.06689735034053
EPSG:4228
ll -87.13433856534711 -97.13610132553731
en -97.13610132553731 -87.13433856534711
ll2 -87.13433856534711 -97.13610132553731
EPSG:4229
ll 46.58578369302276 174.4906447134785
- en 174.4919105227085 46.586753005268825
- ll2 46.585783716040915 174.4906447434412
+ en 174.49191052270854 46.586753005268825
+ ll2 46.585783716040915 174.49064474344115
EPSG:4230
ll -78.72017592951684 110.05060755002677
- en 110.04532842314062 -78.71973221644478
- ll2 -78.72017591081868 110.05060732757866
+ en 110.04532842314062 -78.7197322164448
+ ll2 -78.7201759108187 110.05060732757866
EPSG:4231
ll -5.451455508098761 -51.53400647758363
- en -51.532885975496704 -5.450583652077064
- ll2 -5.451455468383505 -51.534006426653015
+ en -51.53288597549672 -5.450583652077063
+ ll2 -5.451455468383504 -51.53400642665304
EPSG:4232
ll -86.91266406982677 80.58118546162711
- en 80.52671487143068 -86.9125271049442
- ll2 -86.91266407973825 80.58118944125472
+ en 80.52671487143068 -86.91252710494419
+ ll2 -86.91266407973824 80.58118944125474
EPSG:4233
ll 20.258143763837012 -5.389314846767036
- en -5.386136424505301 20.25793500108273
+ en -5.386136424505301 20.257935001082725
ll2 20.258143758524362 -5.389314766348286
EPSG:4234
ll 28.63103850967744 -116.3670785567957
@@ -12226,128 +12226,128 @@ EPSG:4234
ll2 28.63103850967744 -116.3670785567957
EPSG:4235
ll 10.662925261554903 -122.29556299349001
- en -122.29556299349 10.662925261554903
- ll2 10.662925261554903 -122.29556299348998
+ en -122.29556299349002 10.662925261554903
+ ll2 10.662925261554903 -122.29556299349002
EPSG:4236
ll 27.794571243249152 -140.68377683454403
- en -140.68399134750328 27.800408819862547
- ll2 27.794572052368178 -140.68377686411912
+ en -140.68399134750328 27.800408819862554
+ ll2 27.79457205236819 -140.68377686411912
EPSG:4237
ll 64.94213487970765 -134.6153125932421
en -134.61716504455407 64.94231464998934
- ll2 64.94213488013006 -134.61531259758118
+ ll2 64.94213488013004 -134.6153125975812
EPSG:4238
ll -65.87597899629426 -5.698490228026856
en -5.698110858741522 -65.87581947886103
- ll2 -65.87597899608006 -5.698490227516149
+ ll2 -65.87597899608006 -5.698490227516148
EPSG:4239
ll -28.90114232055769 -24.07483083375766
- en -24.08344251598518 -28.901503261886425
- ll2 -28.90114225895114 -24.07482937258135
+ en -24.08344251598518 -28.901503261886432
+ ll2 -28.90114225895115 -24.074829372581355
EPSG:4240
ll 53.508966099636694 19.56953285543233
- en 19.559031296690506 53.50923996442071
- ll2 53.50896608974612 19.569533233165654
+ en 19.559031296690506 53.509239964420715
+ ll2 53.508966089746124 19.569533233165654
EPSG:4241
ll 72.05170038147702 -145.55288649247126
en -145.55288649247126 72.05170038147702
ll2 72.05170038147702 -145.55288649247126
EPSG:4242
ll 39.376856038693745 -96.30535182565195
- en -96.30589543735223 39.37502486581583
- ll2 39.37685602258628 -96.30535183041464
+ en -96.30589543735225 39.37502486581583
+ ll2 39.37685602258628 -96.30535183041465
EPSG:4243
ll -20.717501991840763 42.710822473272
en 42.710822473272 -20.717501991840763
ll2 -20.717501991840763 42.710822473272
EPSG:4244
ll 3.7175563731665733 -138.6406350931714
- en -138.63474100035998 3.7163038628492258
- ll2 3.7175566303378798 -138.6406362953254
+ en -138.63474100035998 3.716303862849226
+ ll2 3.7175566303378793 -138.6406362953254
EPSG:4245
ll 52.27308477391816 24.549395306724904
en 24.537987178487697 52.27389988835354
- ll2 52.27308470942586 24.549396206450012
+ ll2 52.273084709425866 24.54939620645002
EPSG:4246
ll -28.756508781090837 74.3378661946935
en 74.33551403536175 -28.762138730633335
ll2 -28.75650837320064 74.33786636421924
EPSG:4247
ll 82.76491238609648 177.17034726115907
- en 177.17724306514498 82.76799589897402
- ll2 82.76491230952665 177.17034709001513
+ en 177.17724306514498 82.76799589897404
+ ll2 82.76491230952666 177.17034709001513
EPSG:4248
ll -77.39609122817798 150.97500328583948
- en 150.9755486375556 -77.39864963137356
- ll2 -77.3960914699004 150.97500333733825
+ en 150.9755486375556 -77.39864963137354
+ ll2 -77.39609146990038 150.97500333733825
EPSG:4249
ll -15.698871769496208 -122.03483149800388
en -122.03483149800388 -15.698871769496208
- ll2 -15.698871769496208 -122.03483149800388
+ ll2 -15.698871769496206 -122.03483149800388
EPSG:4250
ll 31.810093487319307 170.22653497430508
- en 170.2266037412961 31.81075573569689
- ll2 31.81009352069391 170.22653497775403
+ en 170.22660374129617 31.810755735696883
+ ll2 31.810093520693897 170.22653497775406
EPSG:4251
ll -30.43849263227726 107.130624250869
en 107.12985154003796 -30.442222522860177
ll2 -30.438492652175064 107.13062424676724
EPSG:4252
ll -87.10823061095999 -32.38473331196502
- en -32.38473331196502 -87.10823061095999
- ll2 -87.10823061095999 -32.38473331196502
+ en -32.38473331196502 -87.10823061096
+ ll2 -87.10823061096 -32.38473331196502
EPSG:4253
ll 60.676363175013876 68.3198786985208
- en 68.31813798502465 60.67746955758444
- ll2 60.67636313777414 68.31987875701527
+ en 68.31813798502465 60.67746955758442
+ ll2 60.676363137774125 68.31987875701529
EPSG:4254
ll -8.706995199707038 -157.00308996386119
- en -157.00150725113303 -8.707947863685986
- ll2 -8.706995221442428 -157.00308992798745
+ en -157.00150725113306 -8.707947863685986
+ ll2 -8.706995221442428 -157.00308992798747
EPSG:4255
ll 21.006375945051275 -57.294427263967805
- en -57.29057833614085 21.005987888292836
- ll2 21.00637592752394 -57.29442709111952
+ en -57.290578336140875 21.00598788829283
+ ll2 21.00637592752394 -57.29442709111956
EPSG:4256
ll 46.629393346089216 -16.181436244370957
en -16.178826393039312 46.634018922820815
- ll2 46.62939327307849 -16.18143628543099
+ ll2 46.629393273078485 -16.181436285430987
EPSG:4257
ll 20.801104377041867 -143.74912031236886
- en -143.74175537434044 20.800010341581025
- ll2 20.801104467399878 -143.7491209171798
+ en -143.74175537434047 20.800010341581014
+ ll2 20.801104467399863 -143.7491209171798
EPSG:4258
ll 68.95423702701359 -136.7642652058481
- en -136.76426520584806 68.95423702701359
- ll2 68.95423702701359 -136.76426520584806
+ en -136.76426520584812 68.95423702701359
+ ll2 68.95423702701359 -136.76426520584812
EPSG:4259
ll -44.83352924376652 -77.40830530104544
- en -77.40515443428666 -44.83339309960606
- ll2 -44.83352923861986 -77.4083051822955
+ en -77.40515443428666 -44.833393099606056
+ ll2 -44.83352923861986 -77.40830518229549
EPSG:4260
ll -86.30038194671872 -164.35112739842376
- en -164.3687604903386 -86.30173789614594
- ll2 -86.30038190697708 -164.3511268818797
+ en -164.36876049033856 -86.30173789614595
+ ll2 -86.3003819069771 -164.35112688187976
EPSG:4261
ll 52.74264487100439 -36.40935363655484
en -36.41136587807478 52.74497725232763
ll2 52.74264483116794 -36.40935360227282
EPSG:4262
ll 86.21259055856089 75.30438150377702
- en 75.37432519723482 86.21742177440674
- ll2 86.21259012248181 75.30437520235299
+ en 75.37432519723484 86.21742177440673
+ ll2 86.2125901224818 75.304375202353
EPSG:4263
ll -18.151817761967834 121.32662015068667
- en 121.32542050277618 -18.154640832923167
- ll2 -18.151817766542063 121.32662014875467
+ en 121.32542050277617 -18.154640832923167
+ ll2 -18.15181776654206 121.32662014875467
EPSG:4264
ll 8.125856166696124 75.89669327577383
en 75.8944763871702 8.126865472822379
- ll2 8.125856193866783 75.89669321648722
+ ll2 8.125856193866783 75.89669321648724
EPSG:4265
ll -19.814940245949003 -47.86356302546369
en -47.86298994416237 -19.815622782793618
- ll2 -19.814940254572896 -47.86356299285863
+ ll2 -19.814940254572893 -47.863562992858625
EPSG:4266
ll -61.80865385016633 -135.52450012665423
en -135.52527618227583 -61.8125862401465
@@ -12358,39 +12358,39 @@ EPSG:4268
ll2 32.270842461159646 -109.73597543217174
EPSG:4269
ll 6.521963413569182 6.706571929204529
- en 6.706571929204528 6.521963413569183
- ll2 6.521963413569183 6.706571929204528
+ en 6.70657192920453 6.521963413569181
+ ll2 6.521963413569181 6.70657192920453
EPSG:4270
ll 20.512925997587118 -38.89795544895878
- en -38.89529245439068 20.511466178477033
- ll2 20.51292597155838 -38.89795540175537
+ en -38.89529245439068 20.511466178477036
+ ll2 20.512925971558385 -38.89795540175537
EPSG:4271
ll -37.21713723393305 -6.202436549566556
- en -6.206624578993477 -37.2188384681374
- ll2 -37.217137254709016 -6.2024366004908815
+ en -6.206624578993475 -37.218838468137385
+ ll2 -37.21713725470901 -6.202436600490881
EPSG:4272
ll 77.66783837931462 156.79987098425192
en 156.79977963333215 77.66730056088817
- ll2 77.6678383541611 156.7998710266464
+ ll2 77.66783835416109 156.79987102664637
EPSG:4273
ll 27.57224493272767 -10.201254492224763
en -10.19972724098487 27.569439532521507
- ll2 27.572245056436017 -10.201254450065964
+ ll2 27.572245056436024 -10.201254450065964
EPSG:4274
ll 58.71356253035597 -116.76668984748143
en -116.76239416282988 58.71413727229153
- ll2 58.7135625498788 -116.76668970185465
+ ll2 58.71356254987881 -116.76668970185466
EPSG:4275
ll 33.3107435621088 139.38701896598172
- en 139.38535550052669 33.311659254870825
- ll2 33.31074359909914 139.3870188991006
+ en 139.3853555005267 33.311659254870825
+ ll2 33.31074359909914 139.3870188991007
EPSG:4276
ll 56.90110948114719 162.37043037727528
en 162.37043037727528 56.90110948114719
ll2 56.90110948114719 162.37043037727528
EPSG:4277
ll -69.49093826266983 -58.09380575171451
- en -58.10194257087154 -69.49497839438375
+ en -58.10194257087154 -69.49497839438376
ll2 -69.49093760566299 -58.09380446862803
EPSG:4278
ll -73.88513880819241 20.35712277116332
@@ -12402,200 +12402,200 @@ EPSG:4279
ll2 -34.54057521126112 -125.64986908148765
EPSG:4280
ll -40.34055552521494 -90.81524414406175
- en -90.81524414406174 -40.34055552521493
- ll2 -40.34055552521493 -90.81524414406174
+ en -90.81524414406175 -40.34055552521494
+ ll2 -40.34055552521494 -90.81524414406175
EPSG:4281
ll -33.80282061725201 -65.86040334246859
en -65.85496167803902 -33.80982294666828
ll2 -33.80282032087359 -65.86040333940375
EPSG:4282
ll -65.79570266253137 178.59171510790577
- en 178.59274967978138 -65.79820271262399
- ll2 -65.7957027205203 178.59171513187232
+ en 178.5927496797822 -65.79820271262399
+ ll2 -65.79570272052031 178.59171513187317
EPSG:4283
ll 65.00460563790946 -88.04220284259128
en -88.04220284259128 65.00460563863153
ll2 65.00460563791023 -88.04220284259128
EPSG:4284
ll -3.1447936425312832 94.88935949172253
- en 94.88923251665494 -3.1439979763875514
- ll2 -3.1447936467957 94.88935949124861
+ en 94.88923251665493 -3.143997976387551
+ ll2 -3.1447936467956987 94.88935949124858
EPSG:4285
ll -62.22017331920739 155.57347237889667
- en 155.56751043427326 -62.22094149727911
- ll2 -62.2201733384676 155.57347222966735
+ en 155.56751043427326 -62.220941497279114
+ ll2 -62.220173338467625 155.57347222966735
EPSG:4286
ll 53.185470247645384 54.692225436350924
- en 54.692225436350924 53.185470247645384
- ll2 53.18547024764539 54.692225436350924
+ en 54.69222543635094 53.185470247645384
+ ll2 53.185470247645384 54.69222543635094
EPSG:4287
ll 53.26949935938322 -132.50538470382932
en -132.5057992897472 53.269772126764195
- ll2 53.26949935569581 -132.50538469823783
+ ll2 53.269499355695814 -132.50538469823783
EPSG:4288
ll -35.45230643175253 144.07122035889017
- en 144.07122035889014 -35.45230643175253
- ll2 -35.45230643175253 144.07122035889014
+ en 144.07122035889017 -35.45230643175253
+ ll2 -35.45230643175253 144.07122035889017
EPSG:4289
ll 38.46466226759557 152.45982826241243
- en 152.46396864587834 38.458083689757814
- ll2 38.46466306118809 152.45982784041288
+ en 152.46396864587837 38.458083689757814
+ ll2 38.4646630611881 152.45982784041297
EPSG:4291
ll -75.8997138457321 127.43773794076725
- en 127.43609665312933 -75.89993570725497
- ll2 -75.89971384818377 127.43773792264496
+ en 127.43609665312933 -75.89993570725498
+ ll2 -75.89971384818378 127.43773792264497
EPSG:4292
ll -79.61495655835229 55.18856690414478
- en 55.17349602718005 -79.61373017981862
- ll2 -79.61495654716954 55.188566766685476
+ en 55.17349602718006 -79.61373017981862
+ ll2 -79.61495654716956 55.188566766685476
EPSG:4293
ll 12.72125439713463 75.505478998281
- en 75.51074708891342 12.7237050416456
- ll2 12.72125421801723 75.50547861570213
+ en 75.51074708891343 12.723705041645596
+ ll2 12.721254218017226 75.50547861570215
EPSG:4294
ll -80.97224369210724 -135.52461173902373
- en -135.48065882211236 -80.97041851290747
- ll2 -80.97224390453027 -135.52461686196781
+ en -135.48065882211233 -80.97041851290749
+ ll2 -80.9722439045303 -135.5246168619678
EPSG:4295
ll -41.65500070482143 -162.0338506341101
en -162.0338506341101 -41.65500070482143
ll2 -41.65500070482143 -162.0338506341101
EPSG:4297
ll 1.4322046383291251 166.6274892828721
- en 166.62498080001953 1.4330974600955497
- ll2 1.4322046913878455 166.62748913479527
+ en 166.62498080001944 1.4330974600955488
+ ll2 1.4322046913878443 166.62748913479518
EPSG:4298
ll 35.24621348607333 154.05392809628398
- en 154.05727420422969 35.24970668940522
- ll2 35.24621344900723 154.05392806093963
+ en 154.05727420422966 35.249706689405215
+ ll2 35.24621344900722 154.05392806093954
EPSG:4299
ll -37.38625911342885 29.408891447880478
- en 29.413240741612405 -37.39147483450833
- ll2 -37.38625846606017 29.40889097042192
+ en 29.41324074161239 -37.39147483450833
+ ll2 -37.38625846606016 29.408890970421897
EPSG:4300
ll 43.40813127446236 12.962926843252376
- en 12.965732364766751 43.40646558405542
- ll2 43.408131274814785 12.962926842741282
+ en 12.965732364766751 43.40646558405543
+ ll2 43.40813127481481 12.962926842741284
EPSG:4301
ll -44.45554103450822 7.068629355914453
en 7.062077162287018 -44.458791318685655
ll2 -44.45554039975408 7.068630630980759
EPSG:4302
ll -17.64915841100583 -73.87928908078929
- en -73.87947487182645 -17.65394218899767
- ll2 -17.649158192280133 -73.87928907234638
+ en -73.87947487182646 -17.65394218899767
+ ll2 -17.649158192280133 -73.87928907234642
EPSG:4303
ll -30.589815932845923 -22.30553900572218
- en -22.305539005722185 -30.589815932845926
- ll2 -30.58981593284593 -22.305539005722185
+ en -22.305539005722185 -30.58981593284592
+ ll2 -30.58981593284592 -22.305539005722185
EPSG:4304
ll -21.34154670728209 14.610225431216321
- en 14.612352010872083 -21.345154241255344
+ en 14.612352010872085 -21.345154241255344
ll2 -21.34154662743403 14.610225384422241
EPSG:4306
ll -26.951365245878563 -3.9524941953104644
- en -3.952494195310465 -26.951365245878566
- ll2 -26.951365245878566 -3.952494195310465
+ en -3.9524941953104644 -26.951365245878566
+ ll2 -26.951365245878566 -3.9524941953104644
EPSG:4307
ll 21.932385852076905 127.57134534141318
- en 127.5693655063217 21.930780481744026
- ll2 21.932385813233463 127.57134526330346
+ en 127.56936550632172 21.93078048174403
+ ll2 21.93238581323347 127.57134526330347
EPSG:4308
ll 38.774390788949574 -71.8024903737281
- en -71.80249037372812 38.774390788949574
- ll2 38.774390788949574 -71.80249037372812
+ en -71.8024903737281 38.774390788949574
+ ll2 38.774390788949574 -71.8024903737281
EPSG:4309
ll 50.01114942649622 -8.797545626705045
en -8.799572374279128 50.010509763378344
ll2 50.01114941540169 -8.797545661762111
EPSG:4310
ll 20.722181448820393 -51.30767698279601
- en -51.308592465724594 20.7229799790703
- ll2 20.72218144174754 -51.307676974734925
+ en -51.30859246572461 20.722979979070303
+ ll2 20.72218144174754 -51.30767697473494
EPSG:4311
ll 61.03539312260139 -116.97857131901442
- en -116.97319451005134 61.03774904276651
- ll2 61.03539307621878 -116.97857142469307
+ en -116.97319451005134 61.0377490427665
+ ll2 61.03539307621877 -116.97857142469306
EPSG:4312
ll 21.39070569910588 -133.34073245125944
- en -133.34615294328486 21.385637346975127
+ en -133.34615294328486 21.385637346975123
ll2 21.39070661876937 -133.3407319187681
EPSG:4313
ll 17.300266395639852 -27.665403002809626
- en -27.66583981809371 17.301239601638677
- ll2 17.300266408336253 -27.66540300141586
+ en -27.66583981809371 17.301239601638684
+ ll2 17.30026640833626 -27.665403001415868
EPSG:4314
ll 0.2450455314900779 144.15023540185894
- en 144.15460025832488 0.24119835885430424
- ll2 0.2450462135419004 144.15023474972753
+ en 144.1546002583249 0.24119835885430424
+ ll2 0.24504621354190043 144.15023474972756
EPSG:4315
ll -16.17467925127613 65.40114386360054
- en 65.39994012029193 -16.17685531632352
- ll2 -16.174679355826417 65.40114380612401
+ en 65.39994012029193 -16.176855316323515
+ ll2 -16.174679355826413 65.40114380612401
EPSG:4316
ll 79.03646342380443 138.20628838500863
- en 138.20600394835242 79.03602804590402
- ll2 79.03646343510314 138.20628839238816
+ en 138.2060039483524 79.03602804590402
+ ll2 79.03646343510314 138.2062883923881
EPSG:4317
ll 53.18559347873506 -117.43043630402019
- en -117.43164193504616 53.18666450957781
- ll2 53.185593496322966 -117.43043632376973
+ en -117.43164193504613 53.18666450957782
+ ll2 53.18559349632297 -117.43043632376973
EPSG:4318
ll -40.0757823978669 137.53167076449995
- en 137.53159614272778 -40.075793065807254
- ll2 -40.07578239786199 137.53167076453434
+ en 137.53159614272775 -40.075793065807254
+ ll2 -40.07578239786199 137.5316707645343
EPSG:4319
ll 27.385703588384942 14.701973090290522
- en 14.701809222347938 27.385612747108095
- ll2 27.38570358858768 14.701973090655457
+ en 14.701809222347938 27.385612747108105
+ ll2 27.385703588587695 14.701973090655454
EPSG:4322
ll 74.5347056312838 -24.668833359024433
- en -24.66898724791332 74.53469395236075
+ en -24.66898724791332 74.53469395236074
ll2 74.53470563117124 -24.668833359059256
EPSG:4324
ll 17.422103496395664 -42.50922169228073
- en -42.50944780339183 17.42208601498172
- ll2 17.422103496149763 -42.50922169219481
+ en -42.50944780339184 17.42208601498172
+ ll2 17.42210349614976 -42.509221692194814
EPSG:4326
ll -7.087221454568692 41.43170492812351
en 41.43170492812351 -7.087221454568692
ll2 -7.087221454568692 41.43170492812351
EPSG:4390
ll 4.38070991853283 102.79257259360517
- en -85298.94847439097 258600.44925709756
- ll2 4.380709918462232 102.79257259318189
+ en -85298.94847439097 258600.44925709764
+ ll2 4.380709918462233 102.79257259318189
EPSG:4391
ll 53.79035670623006 101.5532768364465
- en -25639.509295466512 5661745.498124668
- ll2 53.79035655545008 101.55327675468199
+ en -25639.509295464635 5661745.498124668
+ ll2 53.79035655545008 101.55327675468202
EPSG:4392
ll -51.21957204259063 103.06169141535572
- en 43872.62772667216 -6086958.076508542
- ll2 -51.219571906682944 103.06169133235761
+ en 43872.627726672166 -6086958.076508541
+ ll2 -51.21957190668293 103.06169133235761
EPSG:4393
ll -84.22951048205402 101.63065414939489
- en -20225.941063279006 -9708159.821689617
- ll2 -84.22950984537417 101.63065286908211
+ en -20225.941063279002 -9708159.821689617
+ ll2 -84.22950984537417 101.63065286908213
EPSG:4394
ll 57.486169263799724 102.97966538945819
en 5244.510169607323 5827083.25166244
ll2 57.48616907572676 102.97966527124204
EPSG:4395
ll 1.2334932100400238 99.48506411454036
- en -95660.45130114866 -463029.236341201
- ll2 1.2334932101003964 99.48506411603935
+ en -95660.45130115024 -463029.236341201
+ ll2 1.2334932101003975 99.48506411603935
EPSG:4396
ll -21.678813828276617 101.19001058658777
- en 57317.114196970855 -3057907.280065038
- ll2 -21.678813819749365 101.19001057917268
+ en 57317.11419697233 -3057907.280065038
+ ll2 -21.678813819749358 101.19001057917268
EPSG:4397
ll -67.21610819277629 101.21540378117679
- en 17381.838076767493 -7862224.402783495
- ll2 -67.21610787069005 101.21540358114504
+ en 17381.838076768723 -7862224.402783495
+ ll2 -67.21610787069007 101.21540358114508
EPSG:4398
ll -74.33078874939213 101.47705702179655
- en -20947.856603040625 -8903877.816985674
- ll2 -74.33078830956099 101.47705665886218
+ en -20947.856603040218 -8903877.816985672
+ ll2 -74.33078830956096 101.47705665886222
EPSG:4414
ll 84.76915747653666 137.07105156402255
en 22037.552611324936 8129911.919785018
@@ -12603,11 +12603,11 @@ EPSG:4414
EPSG:4415
ll 18.77793502339297 75.49444395509215
en 6351032.260805202 3298027.372706329
- ll2 18.77793498540576 75.49444396543818
+ ll2 18.777934985405764 75.49444396543818
EPSG:4417
ll 59.47178759214739 20.597257918600498
en 7477291.976036254 6595431.052940518
- ll2 59.47178759316474 20.5972579299331
+ ll2 59.47178759316474 20.597257929933104
EPSG:4420
ll -24.679975238157084 175.5238922827717
en 1150430.9735619014 -8957711.84332698
@@ -12615,27 +12615,27 @@ EPSG:4420
EPSG:4421
ll 54.99612244093845 -170.03819346460847
en 3100397.8921891563 2.006738230778005E7
- ll2 54.996122430591484 -170.03819348516123
+ ll2 54.99612243059148 -170.03819348516123
EPSG:4422
ll 24.914573191627483 -167.4734911692188
en 2809215.9578561187 9055464.38175663
- ll2 24.91457319158847 -167.4734911691412
+ ll2 24.914573191588467 -167.4734911691412
EPSG:4423
ll 32.2580110240076 -164.4140330286182
- en 1821494.3196631626 1.1709902726678029E7
- ll2 32.258011024007594 -164.4140330286182
+ en 1821494.3196631626 1.1709902726678032E7
+ ll2 32.2580110240076 -164.4140330286182
EPSG:4424
ll 54.22378354796527 -156.05053100812458
en 2271226.0663573346 1.972580350767019E7
ll2 54.22378354790245 -156.05053100812074
EPSG:4425
ll -71.96038777104071 -162.6815780263502
- en 546772.780232647 -2.628396724276403E7
+ en 546772.7802326465 -2.628396724276403E7
ll2 -71.96038775352987 -162.6815773678306
EPSG:4426
ll 50.90602886207628 -151.92387166643775
- en 504866.90068761515 1.8539760736423735E7
- ll2 50.90602886072203 -151.92387166596274
+ en 504866.900687615 1.8539760736423735E7
+ ll2 50.906028860722024 -151.92387166596274
EPSG:4427
ll 64.10938849156071 -148.94433869304237
en 373077.4888338823 2.3403330659370825E7
@@ -12646,32 +12646,32 @@ EPSG:4428
ll2 -63.16221093030652 -135.77610375560485
EPSG:4429
ll 64.14900279956132 -129.31310292867693
- en 1590440.0886612802 2.3338718357587207E7
- ll2 64.1490027995613 -129.31310292867693
+ en 1590440.0886612802 2.333871835758721E7
+ ll2 64.14900279956132 -129.31310292867693
EPSG:4430
ll 89.32257077903222 -131.4469802471236
- en 1603966.5719687578 3.2556204145518392E7
- ll2 89.32257077912155 -131.44698002748615
+ en 1603966.571968757 3.2556204145518385E7
+ ll2 89.32257077912152 -131.44698002748595
EPSG:4431
ll -44.47131982754194 -111.85998506801229
en 2981720.7438252554 -1.6197762203758538E7
ll2 -44.47131982601705 -111.85998506803412
EPSG:4432
ll -44.77266862372167 -102.13997331548667
- en 3940537.5348476893 -1.6391137628736103E7
- ll2 -44.77266858733194 -102.1399734177978
+ en 3940537.5348476893 -1.6391137628736107E7
+ ll2 -44.77266858733195 -102.1399734177978
EPSG:4433
ll 0.6485140849865871 -114.58753836201674
- en -1876084.121091087 238525.16889242126
- ll2 0.6485140840208234 -114.58753822515004
+ en -1876084.121091087 238525.16889242132
+ ll2 0.6485140840208236 -114.58753822515004
EPSG:4434
ll 85.58592084438166 15.022592737463446
en 8423260.414279168 9515109.434462167
- ll2 85.58592084510742 15.022593183830047
+ ll2 85.58592084510745 15.022593183830043
EPSG:4437
ll -1.1907792941031445 -44.68053754599093
- en 2754727.4495173027 -1793203.5571223325
- ll2 -1.1907792941031217 -44.68053754599096
+ en 2754727.4495173083 -1793203.557122324
+ ll2 -1.190779294103096 -44.68053754599094
EPSG:4438
ll 34.32262450200949 -71.56457319025687
en 2677551.3818035615 1.247791610394572E7
@@ -12679,71 +12679,71 @@ EPSG:4438
EPSG:4439
ll 4.938641454928188 -63.95378669856227
en 3478225.119279759 1797928.2028190012
- ll2 4.938641454847396 -63.953786700369434
+ ll2 4.938641454847397 -63.953786700369434
EPSG:4457
ll 32.108700747436544 -17.221303296024274
- en 2.387905183258365E7 7984288.61206031
- ll2 32.1087007474368 -17.22130329602429
+ en 2.3879051832583666E7 7984288.612060265
+ ll2 32.1087007474368 -17.22130329602426
EPSG:4462
ll -77.98539656767616 115.52925408984188
- en -722288.0508293676 -6841198.533039651
+ en -722288.0508293677 -6841198.533039651
ll2 -77.98539656767615 115.52925408984188
EPSG:4463
ll -21.245856770547277 77.67429752138827
- en 77.67429752138827 -21.245856771185164
- ll2 -21.245856770547196 77.67429752138827
+ en 77.67429752138827 -21.24585677118516
+ ll2 -21.245856770547192 77.67429752138827
EPSG:4467
ll 81.31714108060419 -56.627176177748396
- en 506283.4753289592 9028624.685496762
- ll2 81.31714108060491 -56.62717617774839
+ en 506283.4753289588 9028624.685496762
+ ll2 81.31714108060491 -56.62717617774841
EPSG:4470
ll 22.934578149962334 74.13383048761551
- en 74.13383048761553 22.934578150640068
- ll2 22.934578149962196 74.13383048761553
+ en 74.13383048761551 22.934578150640068
+ ll2 22.934578149962203 74.13383048761551
EPSG:4471
ll 49.416691633997914 50.178378314621916
en 875511.3957461121 1.5486682913681362E7
- ll2 49.41669163219658 50.17837831396611
+ ll2 49.41669163219658 50.1783783139661
EPSG:4475
ll -38.15259214574662 -10.136365006526376
- en -10.134952733452359 -38.14953756978653
- ll2 -38.15259210387847 -10.136364987248237
+ en -10.13495273345236 -38.14953756978653
+ ll2 -38.15259210387847 -10.136364987248239
EPSG:4483
ll 71.69775393027132 -155.8965013515438
en -155.8965013515438 71.69775393083347
ll2 71.69775393027227 -155.89650135154383
EPSG:4484
ll 26.153555805417582 -122.13178264636548
- en -13329.737682252307 2902840.1582861245
- ll2 26.15355580498703 -122.13178264720194
+ en -13329.737682250678 2902840.158286124
+ ll2 26.15355580498703 -122.13178264720192
EPSG:4485
ll -48.7719538834897 -112.74721852019753
- en 371624.198637281 -5403577.8341665575
- ll2 -48.77195388348717 -112.747218520199
+ en 371624.19863728003 -5403577.834166558
+ ll2 -48.771953883487164 -112.74721852019903
EPSG:4486
ll -59.394711137372425 -111.92559093488228
- en 107134.75422060059 -6604478.649043755
- ll2 -59.39471112840016 -111.92559091137835
+ en 107134.75422060076 -6604478.649043757
+ ll2 -59.394711128400196 -111.92559091137834
EPSG:4487
ll 35.30473846328101 -96.17453364722502
- en 756903.8053345248 3910500.829637733
- ll2 35.30473846325557 -96.17453364718868
+ en 756903.8053345236 3910500.829637733
+ ll2 35.30473846325557 -96.1745336471887
EPSG:4488
ll -61.341638427361914 -86.53197009633692
en 845667.603390358 -6817988.92873171
ll2 -61.34163842183053 -86.53197010977948
EPSG:4489
ll 41.05115123999502 -87.65174394482521
- en 445229.56886295497 4544639.942873664
- ll2 41.05115123999505 -87.6517439448252
+ en 445229.5688629538 4544639.942873665
+ ll2 41.051151239995065 -87.65174394482523
EPSG:4490
ll 5.506011391573949 88.39664120403756
- en 88.39664120403758 5.506011391573949
- ll2 5.506011391573949 88.39664120403758
+ en 88.39664120403756 5.506011391573949
+ ll2 5.506011391573949 88.39664120403756
EPSG:4491
ll -42.578639455606925 81.83883893481922
en 1.4061553341437062E7 -4738643.486066903
- ll2 -42.578639447981644 81.83883892993576
+ ll2 -42.57863944798164 81.83883892993576
EPSG:4492
ll -43.667803735486906 82.12403819048066
en 1.4590656598688684E7 -4837526.426982111
@@ -12771,11 +12771,11 @@ EPSG:4497
EPSG:4498
ll 81.14827671233226 111.17173425310666
en 2.0400000736568756E7 9018390.710313706
- ll2 81.14827671217489 111.1717342604349
+ ll2 81.1482767121749 111.1717342604349
EPSG:4499
ll 10.10528577643099 125.83521501864566
- en 2.181087046361647E7 1118850.6539225618
- ll2 10.105285776427415 125.83521501859364
+ en 2.181087046361647E7 1118850.6539225616
+ ll2 10.10528577642741 125.83521501859364
EPSG:4500
ll -16.60533428622429 125.54184124414425
en 2.213080420499496E7 -1839817.4507161572
@@ -12786,8 +12786,8 @@ EPSG:4501
ll2 9.136412343458375 135.0798346083621
EPSG:4502
ll 67.38688094781043 66.53013623417621
- en 137359.66051724885 7502302.497094396
- ll2 67.38688093115827 66.53013641404104
+ en 137359.66051724897 7502302.497094397
+ ll2 67.38688093115829 66.53013641404104
EPSG:4503
ll 3.588484466792522 72.65676621882028
en -430245.23914900597 401061.411146474
@@ -12810,7 +12810,7 @@ EPSG:4507
ll2 -6.462216385126359 95.26581507984888
EPSG:4508
ll 52.87626809266001 114.12899535971705
- en 710643.74752543 5865438.910524783
+ en 710643.7475254299 5865438.910524783
ll2 52.876268092569745 114.12899535972358
EPSG:4509
ll -15.788761978353833 113.84125717503757
@@ -12839,15 +12839,15 @@ EPSG:4514
EPSG:4515
ll 42.544298209577335 79.3007072331386
en 2.736041666250515E7 4713496.545646839
- ll2 42.544298209575466 79.30070723313663
+ ll2 42.54429820957546 79.30070723313663
EPSG:4516
ll -74.01969620528908 74.13847310167772
en 2.819810495986183E7 -8242570.218784651
ll2 -74.01969619303811 74.13847390481493
EPSG:4517
ll -37.36789081001677 85.96679851990409
- en 2.9408476666135944E7 -4137840.7751334487
- ll2 -37.36789081001669 85.96679851990393
+ en 2.9408476666135944E7 -4137840.775133449
+ ll2 -37.367890810016696 85.96679851990393
EPSG:4518
ll 2.222302146175849 82.52118567241999
en 2.966570280696377E7 247851.2781133166
@@ -12858,8 +12858,8 @@ EPSG:4519
ll2 43.41505923911383 95.0359756775174
EPSG:4520
ll -18.32249283471762 99.18798023647074
- en 3.2837144493136145E7 -2029626.9102168803
- ll2 -18.32249283470513 99.18798023645626
+ en 3.2837144493136145E7 -2029626.9102168805
+ ll2 -18.322492834705134 99.18798023645626
EPSG:4521
ll 4.924627520917255 93.81313704015824
en 3.292393736091246E7 546793.6159578406
@@ -12879,7 +12879,7 @@ EPSG:4524
EPSG:4525
ll 35.94508426869402 108.6199331721206
en 3.728523635007123E7 3982068.6207755725
- ll2 35.945084268684475 108.61993317210644
+ ll2 35.94508426868448 108.61993317210644
EPSG:4526
ll -34.285714586892105 118.5623749402579
en 3.892024098091519E7 -3804791.4610365196
@@ -12890,12 +12890,12 @@ EPSG:4527
ll2 71.42611977185543 124.30981998575554
EPSG:4528
ll -9.240771960099664 122.09579365736022
- en 4.073034386593138E7 -1022556.9163456273
- ll2 -9.240771960099156 122.09579365734861
+ en 4.073034386593138E7 -1022556.9163456275
+ ll2 -9.240771960099158 122.09579365734861
EPSG:4529
ll -38.21361130070164 116.06392926898725
en 4.089220965133252E7 -4254028.669449601
- ll2 -38.21361129414627 116.06392927012077
+ ll2 -38.21361129414626 116.06392927012077
EPSG:4530
ll 4.231867328244618 130.21850315618468
en 4.296875174033891E7 469219.3452313065
@@ -12903,7 +12903,7 @@ EPSG:4530
EPSG:4531
ll 64.40742409179094 138.20540995224232
en 4.394266541019464E7 7177440.499423074
- ll2 64.40742405822512 138.20540959237775
+ ll2 64.4074240582251 138.20540959237775
EPSG:4532
ll -64.84216889503563 122.77733732195081
en 4.406356143557161E7 -7225629.916873951
@@ -12918,12 +12918,12 @@ EPSG:4534
ll2 -82.89942905772526 75.78142979015782
EPSG:4535
ll 43.596451834883595 74.8326530558047
- en 244237.07610821107 4833862.236217249
+ en 244237.07610821107 4833862.23621725
ll2 43.596451834801925 74.83265305576008
EPSG:4536
ll 5.533981983768811 78.04984127962602
en 172967.51519175078 612747.6054195662
- ll2 5.533981983766054 78.04984127971197
+ ll2 5.533981983766053 78.04984127971197
EPSG:4537
ll -20.10639095634444 79.98685448259414
en 80054.86408407998 -2229205.8092593136
@@ -12934,7 +12934,7 @@ EPSG:4538
ll2 64.04213948903495 89.4322339302827
EPSG:4539
ll 81.64733716386777 86.18278468898008
- en 438112.81964049366 9071130.57212875
+ en 438112.8196404936 9071130.57212875
ll2 81.64733716385588 86.18278468914122
EPSG:4540
ll -44.63769895273001 96.52117414728517
@@ -12966,11 +12966,11 @@ EPSG:4546
ll2 -47.43635647014851 106.86189811227163
EPSG:4547
ll 64.88924297870562 116.82064280267797
- en 633581.4956035825 7201968.755680972
- ll2 64.88924297867372 116.82064280267079
+ en 633581.4956035826 7201968.75568097
+ ll2 64.8892429786737 116.82064280267079
EPSG:4548
ll 10.382069651135168 110.90183071759803
- en -168993.46207882825 1154549.1075580698
+ en -168993.46207882836 1154549.10755807
ll2 10.3820696505986 110.90183072146687
EPSG:4549
ll -62.48547513176247 111.96312273091233
@@ -12987,31 +12987,31 @@ EPSG:4551
EPSG:4552
ll -12.347517170923538 130.37117956088235
en 649144.1011053738 -1365909.7752631248
- ll2 -12.347517170923492 130.37117956088133
+ ll2 -12.34751717092349 130.37117956088133
EPSG:4553
ll 88.13758895105502 133.64772509289799
en 505980.39214598754 9794032.32133061
ll2 88.137588951055 133.64772509289787
EPSG:4554
ll 79.58016150941125 143.14940534967857
- en 664089.0038362173 8849759.058976732
- ll2 79.58016150815655 143.14940519877942
+ en 664089.0038362176 8849759.05897673
+ ll2 79.58016150815654 143.14940519877942
EPSG:4555
ll 78.6751377428231 -61.56588045473465
en -61.56588045473466 78.6751377428231
ll2 78.6751377428231 -61.56588045473466
EPSG:4558
ll -8.062451085694136 157.27630106098604
- en 157.27630106098607 -8.062451085956583
- ll2 -8.062451085694255 157.27630106098604
+ en 157.27630106098607 -8.062451085956585
+ ll2 -8.062451085694258 157.2763010609861
EPSG:4559
ll -28.64646658487689 -55.78280197864944
- en 1206348.2193066543 -3190218.2192560663
- ll2 -28.646466580759053 -55.782801973889136
+ en 1206348.2193066548 -3190218.2192560663
+ ll2 -28.646466580759043 -55.78280197388912
EPSG:4568
ll -56.99742660975438 73.45100188237937
en 1.3405860597687926E7 -6320805.262286385
- ll2 -56.9974266097531 73.45100188237907
+ ll2 -56.99742660975309 73.45100188237907
EPSG:4569
ll 64.49855889003786 72.21214359537495
en 1.4078711292663898E7 7184797.726341863
@@ -13019,31 +13019,31 @@ EPSG:4569
EPSG:4570
ll 59.71160168158221 84.34390393902783
en 1.5350525598658621E7 6625050.661481358
- ll2 59.71160168155279 84.34390393902903
+ ll2 59.711601681552786 84.34390393902903
EPSG:4571
ll 11.31079665603663 84.34323951805732
en 1.5551554644398822E7 1265000.0910088986
ll2 11.31079664964768 84.34323955602834
EPSG:4572
ll -78.1761601242114 104.97923328590889
- en 1.763659896185751E7 -8688635.081933452
- ll2 -78.17616012377403 104.97923327691771
+ en 1.7636598961857505E7 -8688635.081933454
+ ll2 -78.17616012377405 104.97923327691755
EPSG:4573
ll -6.431669638212625 100.67622320970024
en 1.80212343462848E7 -713246.3551409552
- ll2 -6.431669638175832 100.67622321038104
+ ll2 -6.4316696381758325 100.67622321038104
EPSG:4574
ll -83.79014279407507 110.04905407929243
en 1.948851146834006E7 -9308644.590624835
ll2 -83.79014279407507 110.04905407929238
EPSG:4575
ll 19.89472525682777 117.66999449842373
- en 2.0570161886403944E7 2200890.8216016027
- ll2 19.894725256827773 117.66999449842375
+ en 2.0570161886403944E7 2200890.8216016022
+ ll2 19.89472525682777 117.66999449842375
EPSG:4576
ll -8.24699446189939 114.61165920310468
- en 2.0572588093281697E7 -921775.3514701776
- ll2 -8.24699445775021 114.61165924305313
+ en 2.0572588093281697E7 -921775.3514701778
+ ll2 -8.246994457750212 114.61165924305313
EPSG:4577
ll -23.252751205772995 132.09855766888944
en 2.281718994067023E7 -2575962.827909751
@@ -13051,23 +13051,23 @@ EPSG:4577
EPSG:4578
ll -19.15895808502806 125.074949907596
en 2.245180756329146E7 -2149308.939206177
- ll2 -19.15895806567719 125.0749499420539
+ ll2 -19.158958065677187 125.0749499420539
EPSG:4579
ll -61.41906246296371 71.83427749794745
- en 331015.761313576 -6816410.71768723
- ll2 -61.4190624628855 71.83427749796417
+ en 331015.7613135759 -6816410.717687229
+ ll2 -61.419062462885485 71.83427749796417
EPSG:4580
ll 59.53830966773117 89.04388290156925
- en 954365.7274663891 6630312.950147373
- ll2 59.538309646623446 89.0438828091542
+ en 954365.7274663888 6630312.950147374
+ ll2 59.53830964662346 89.0438828091542
EPSG:4581
ll -37.42994051870873 88.338765990087
en 618496.3215758696 -4145141.3906342927
ll2 -37.42994051870839 88.33876599008767
EPSG:4582
ll -44.732762437753856 98.7630560667272
- en 956520.9705697752 -4971520.342555952
- ll2 -44.732762434718985 98.76305606588173
+ en 956520.9705697752 -4971520.342555953
+ ll2 -44.73276243471901 98.76305606588173
EPSG:4583
ll 72.81917998423162 99.13349740915483
en 504403.2668012718 8083687.428854159
@@ -13078,36 +13078,36 @@ EPSG:4584
ll2 -81.80877976552875 106.1238003667711
EPSG:4585
ll 59.17186527836125 110.57301709443821
- en 475581.13842456415 6562007.1483834125
- ll2 59.17186527836124 110.57301709443821
+ en 475581.1384245642 6562007.148383413
+ ll2 59.171865278361246 110.57301709443821
EPSG:4586
ll -49.520898801583776 117.06841239571744
en 504953.5299319162 -5487658.044300037
ll2 -49.520898801583776 117.06841239571744
EPSG:4587
ll -63.4741457412747 113.91941690097956
- en 48475.97681133798 -7073465.947164477
- ll2 -63.47414570786813 113.91941721180198
+ en 48475.97681133804 -7073465.947164479
+ ll2 -63.47414570786814 113.91941721180198
EPSG:4588
ll -83.7551137384461 133.71245806007005
- en 557191.3806131807 -9306977.005294384
- ll2 -83.75511373842956 133.71245805897695
+ en 557191.3806131806 -9306977.005294386
+ ll2 -83.75511373842959 133.71245805897695
EPSG:4589
ll 31.98927003023951 127.01749946230348
en -255468.84854082856 3568716.4305472653
ll2 31.98927002073203 127.01749946072508
EPSG:4600
ll -25.80544012040943 -24.851806030897052
- en -24.85180603089705 -25.80544012040943
- ll2 -25.805440120409433 -24.85180603089705
+ en -24.851806030897055 -25.80544012040943
+ ll2 -25.80544012040943 -24.851806030897055
EPSG:4601
ll 89.26328047998643 -21.67446323134905
en -21.59938984492951 89.26128076180103
ll2 89.26328053286613 -21.674465222572035
EPSG:4602
ll -15.124906064530379 7.193682576724342
- en 7.1882038367087615 -15.13306887877301
- ll2 -15.124906998762054 7.193681953626404
+ en 7.1882038367087615 -15.133068878773011
+ ll2 -15.124906998762054 7.193681953626403
EPSG:4603
ll 42.3123265905343 -155.34170408105157
en -155.33971281187235 42.31390208040188
@@ -13115,31 +13115,31 @@ EPSG:4603
EPSG:4604
ll -55.090871198001416 -14.922473778143342
en -14.928608648963639 -55.09625453688617
- ll2 -55.0908708783747 -14.92247341475685
+ ll2 -55.090870878374695 -14.922473414756848
EPSG:4605
ll 53.68388387323023 -95.42665020657108
- en -95.42652388153088 53.684302985060526
- ll2 53.68388387107921 -95.42665020721796
+ en -95.42652388153091 53.68430298506053
+ ll2 53.68388387107922 -95.42665020721799
EPSG:4606
ll -68.28803198776407 -28.757366760658186
en -28.758347985711296 -68.28957172016494
ll2 -68.2880318587388 -28.757366678515158
EPSG:4607
ll 56.76546209405063 171.84712332851785
- en 171.8529592606171 56.765891128522156
- ll2 56.765462095211326 171.84712334426308
+ en 171.85295926061704 56.765891128522156
+ ll2 56.76546209521131 171.84712334426303
EPSG:4608
ll -76.07404069237896 -30.94821845658538
- en -30.948218456585376 -76.07404069237897
- ll2 -76.07404069237897 -30.948218456585376
+ en -30.948218456585376 -76.07404069237896
+ ll2 -76.07404069237896 -30.948218456585376
EPSG:4609
ll 25.81736914358801 106.82861265817235
en 106.82861265817235 25.81736914358801
- ll2 25.81736914358801 106.82861265817235
+ ll2 25.817369143588014 106.82861265817235
EPSG:4610
ll -4.829586011713275 17.536653435368038
- en 17.53665343536804 -4.829586011713275
- ll2 -4.829586011713275 17.53665343536804
+ en 17.536653435368038 -4.829586011713275
+ ll2 -4.829586011713275 17.536653435368038
EPSG:4611
ll 82.79547066585704 149.34290975085554
en 149.317676272825 82.79636708142849
@@ -13147,111 +13147,111 @@ EPSG:4611
EPSG:4612
ll -58.306257348653205 144.60213804999916
en 144.60213804999916 -58.30625734949611
- ll2 -58.30625734865366 144.60213804999916
+ ll2 -58.30625734865367 144.60213804999916
EPSG:4613
ll -84.22092900256692 -13.269766261786913
- en -13.320693282663157 -84.2159510960455
- ll2 -84.22092960150556 -13.269760126646352
+ en -13.320693282663163 -84.2159510960455
+ ll2 -84.22092960150555 -13.269760126646355
EPSG:4614
ll -21.872493613000543 -96.22511297317327
- en -96.22455416049205 -21.873712572165605
- ll2 -21.87249374600967 -96.22511290047026
+ en -96.22455416049203 -21.8737125721656
+ ll2 -21.872493746009663 -96.22511290047025
EPSG:4615
ll 10.244710018804156 130.72286107303597
- en 130.71792627167477 10.242424554528917
+ en 130.71792627167477 10.242424554528915
ll2 10.244709860648712 130.722860733751
EPSG:4616
ll -80.21938781596077 -150.37552371573847
- en -150.37367494437282 -80.22251195704351
- ll2 -80.2193878922496 -150.3755236706166
+ en -150.37367494437285 -80.22251195704351
+ ll2 -80.21938789224961 -150.37552367061664
EPSG:4617
ll -78.5224668916699 37.52648771871978
- en 37.52648771871978 -78.52246689203761
+ en 37.52648771871978 -78.52246689203763
ll2 -78.52246689167075 37.52648771871978
EPSG:4618
ll 4.774937987325956 48.274298113789285
- en 48.27382201902595 4.7752549573524785
- ll2 4.774937986259732 48.274298115380134
+ en 48.27382201902594 4.7752549573524785
+ ll2 4.774937986259732 48.27429811538013
EPSG:4619
ll 44.0876310151946 37.3864530531217
- en 37.38645305312169 44.08763101613744
- ll2 44.087631015194674 37.3864530531217
+ en 37.38645305312169 44.08763101613745
+ ll2 44.08763101519468 37.386453053121684
EPSG:4620
ll 54.81214972552223 -148.04148147053212
en -148.04231116912737 54.8154176564023
ll2 54.812149779311014 -148.04148148415692
EPSG:4621
ll 42.899521381541405 -56.91651894079587
- en -56.9195818028079 42.90236167439804
- ll2 42.89952130058315 -56.91651885381343
+ en -56.9195818028079 42.902361674398044
+ ll2 42.899521300583174 -56.91651885381343
EPSG:4622
ll 49.47461062282616 -109.62956955335417
en -109.62357426176771 49.47835023704565
- ll2 49.47461067092157 -109.62956947647648
+ ll2 49.474610670921564 -109.62956947647648
EPSG:4623
ll 58.4087726210667 -178.78248869261247
- en -178.77848727348615 58.41037314344905
- ll2 58.40877271468932 -178.7824884590029
+ en -178.77848727348615 58.410373143449036
+ ll2 58.40877271468931 -178.7824884590029
EPSG:4624
ll -84.2983732880713 -173.41329993912248
- en -173.41329993912242 -84.29837328825772
- ll2 -84.29837328807177 -173.41329993912245
+ en -173.41329993912242 -84.29837328825774
+ ll2 -84.2983732880718 -173.41329993912242
EPSG:4625
ll -50.44948825538305 155.8023956605216
- en 155.8096591826623 -50.451352870780006
- ll2 -50.44948828407679 155.80239577197352
+ en 155.80965918266227 -50.45135287077999
+ ll2 -50.449488284076786 155.8023957719735
EPSG:4626
ll -68.55443581505419 171.64086968475772
- en 171.6182288677239 -68.54892969327642
- ll2 -68.55443472827868 171.64086521769764
+ en 171.61822886772407 -68.5489296932764
+ ll2 -68.55443472827866 171.64086521769778
EPSG:4627
ll 26.700320483388282 110.60814719467368
- en 110.60814719467369 26.70032048414603
- ll2 26.700320483387763 110.60814719467369
+ en 110.60814719467368 26.700320484146033
+ ll2 26.700320483387777 110.60814719467369
EPSG:4628
ll -49.49939130980256 69.35884457510306
en 69.36036810965199 -49.502241384749844
- ll2 -49.49939139447979 69.35884462023688
+ ll2 -49.49939139447979 69.35884462023691
EPSG:4629
ll -61.37113497647589 -155.1483429288211
en -155.1422741218903 -61.370539837972274
- ll2 -61.37113497714107 -155.14834291295534
+ ll2 -61.37113497714107 -155.1483429129554
EPSG:4630
ll 74.11028824901533 -108.14224768405853
en -108.14206803282676 74.10809202747349
- ll2 74.11028819730738 -108.1422476798303
+ ll2 74.1102881973074 -108.1422476798303
EPSG:4631
ll -51.44263441806412 -63.74931144139521
- en -63.74999230038112 -51.445642195283604
- ll2 -51.44263454034112 -63.749311469000425
+ en -63.74999230038112 -51.44564219528362
+ ll2 -51.442634540341125 -63.749311469000425
EPSG:4632
ll -35.80194759694242 46.1490392444274
- en 46.14644390680815 -35.79919342299239
- ll2 -35.801947543261875 46.149039194063675
+ en 46.146443906808145 -35.79919342299239
+ ll2 -35.801947543261875 46.14903919406367
EPSG:4633
ll -13.4882748914697 36.12023391946403
- en 36.1203997892262 -13.487466417884043
- ll2 -13.488274803346789 36.12023393742927
+ en 36.12039978922621 -13.487466417884038
+ ll2 -13.488274803346782 36.12023393742928
EPSG:4634
ll -47.07137497324855 23.57547863770955
- en 23.579609306148235 -47.07298846127712
- ll2 -47.0713749442093 23.575478563603653
+ en 23.57960930614824 -47.07298846127714
+ ll2 -47.071374944209325 23.575478563603657
EPSG:4635
ll 77.849034946904 43.104008486000794
- en 43.10683126993448 77.84560342621621
- ll2 77.84903486831735 43.10400835741461
+ en 43.10683126993448 77.8456034262162
+ ll2 77.84903486831735 43.1040083574146
EPSG:4636
ll -26.204001443699646 146.35081650558197
- en 146.35445584618066 -26.20521527040923
- ll2 -26.204001440592446 146.35081649631795
+ en 146.35445584618063 -26.205215270409234
+ ll2 -26.204001440592453 146.3508164963179
EPSG:4637
ll 61.130851628190186 -24.70152491751449
- en -24.7066422052121 61.13261560265703
- ll2 61.13085175060817 -24.701525272051
+ en -24.7066422052121 61.13261560265707
+ ll2 61.130851750608215 -24.701525272051
EPSG:4638
ll 20.5473067226347 -120.73998615214576
- en -120.73812584481433 20.544382802855598
- ll2 20.547306810724844 -120.73998620786408
+ en -120.73812584481433 20.544382802855594
+ ll2 20.54730681072484 -120.73998620786408
EPSG:4639
ll -37.556485782072464 -135.0596867418442
en -135.0627667094738 -37.55590207051536
@@ -13262,32 +13262,32 @@ EPSG:4640
ll2 71.99002840370912 139.6170138900817
EPSG:4641
ll 47.81643540559125 35.49257057923057
- en 35.492867323664335 47.82031966396077
- ll2 47.81643560501966 35.49257059441892
+ en 35.49286732366434 47.82031966396077
+ ll2 47.81643560501966 35.492570594418936
EPSG:4642
ll -16.906678754205842 -165.13413777434383
en -165.1372636188623 -16.909929087353838
- ll2 -16.906678885328116 -165.13413789966788
+ ll2 -16.906678885328123 -165.13413789966785
EPSG:4643
ll 70.56521047851896 87.87888653062691
en 87.88376118842312 70.55948081961343
ll2 70.56521133271521 87.87888734347197
EPSG:4644
ll -64.21746237942585 164.7505021541001
- en 164.74348359619847 -64.21857713733502
- ll2 -64.21746235826552 164.75050228713576
+ en 164.74348359619844 -64.21857713733502
+ ll2 -64.21746235826554 164.7505022871358
EPSG:4645
ll 26.18707975201444 100.77895418583171
en 100.77895418583171 26.187731593141226
- ll2 26.18707977596522 100.77895418583172
+ ll2 26.187079775965223 100.77895418583172
EPSG:4646
ll 26.43918288238598 83.76705821816824
- en 83.75690457478757 26.444357552897117
- ll2 26.43918323561367 83.76705752887386
+ en 83.75690457478757 26.44435755289712
+ ll2 26.439183235613676 83.76705752887386
EPSG:4647
ll -76.13792619950138 16.73959791140613
en 3.270643345186227E7 -8464135.292662872
- ll2 -76.13792619672536 16.739597820369706
+ ll2 -76.13792619672535 16.739597820369706
EPSG:4652
ll -78.64295746016069 79.9806684619763
en 2.560941024380873E7 -8738435.447815584
@@ -13299,91 +13299,91 @@ EPSG:4653
EPSG:4654
ll -63.7317423763523 77.94158114325181
en 2.7348954313721642E7 -7073689.517950117
- ll2 -63.73174237629634 77.9415811432663
+ ll2 -63.731742376296346 77.9415811432663
EPSG:4655
ll 22.261276311553345 74.47971261736981
en 2.751545811456073E7 2493960.34383371
- ll2 22.261276296028868 74.47971262605446
+ ll2 22.26127629602887 74.47971262605446
EPSG:4656
ll -28.458413026068648 87.62397083361101
en 2.9561114937990155E7 -3149459.118130602
- ll2 -28.458413026068648 87.623970833611
+ ll2 -28.458413026068644 87.623970833611
EPSG:4657
ll -27.812184622738265 -8.058229172542525
en -8.060189027216676 -27.811039153367417
- ll2 -27.812184828704364 -8.058228821981777
+ ll2 -27.812184828704364 -8.058228821981775
EPSG:4658
ll -79.23171989568206 179.36350293394264
- en 179.3657165174248 -79.2325291699045
- ll2 -79.23171992833265 179.36350302321978
+ en 179.36571651742477 -79.2325291699045
+ ll2 -79.23171992833265 179.36350302321986
EPSG:4659
ll -49.308659018750696 56.16938365861063
en 56.16938365861063 -49.30865901968313
- ll2 -49.30865901875086 56.169383658610634
+ ll2 -49.30865901875085 56.16938365861063
EPSG:4660
ll -12.810660026388447 74.1886625044761
- en 74.20329174466032 -12.812054818863434
- ll2 -12.810660363195476 74.18866357402364
+ en 74.20329174466032 -12.812054818863439
+ ll2 -12.810660363195483 74.18866357402364
EPSG:4661
ll -36.28458761994232 -165.9036539630546
en -165.9036539630546 -36.2845876208427
ll2 -36.284587619942336 -165.9036539630546
EPSG:4662
ll -30.218875325189373 58.36471107008691
- en 58.366507243146536 -30.220491664217576
- ll2 -30.21887527917935 58.36471101921658
+ en 58.36650724314655 -30.220491664217576
+ ll2 -30.218875279179358 58.36471101921661
EPSG:4663
ll 42.74883981346852 116.71563355657185
- en 116.70878850202855 42.747622881306334
- ll2 42.74883973224316 116.7156331012606
+ en 116.70878850202857 42.747622881306334
+ ll2 42.74883973224316 116.71563310126065
EPSG:4664
ll -41.19536888618599 37.57015784343889
- en 37.56734613630679 -41.19610317948217
- ll2 -41.19536889972704 37.57015779178871
+ en 37.567346136306796 -41.196103179482165
+ ll2 -41.195368899727036 37.570157791788716
EPSG:4665
ll -42.92399681954331 -64.91206978148446
- en -64.91175544653277 -42.92336737802378
- ll2 -42.923996810525296 -64.91206977699714
+ en -64.91175544653275 -42.92336737802378
+ ll2 -42.92399681052531 -64.91206977699713
EPSG:4666
ll 29.237052051417265 98.11321809374908
en 98.11811461094253 29.23094227623923
- ll2 29.237052701465558 98.11321757540586
+ ll2 29.23705270146555 98.11321757540588
EPSG:4667
ll -18.61218869191113 14.109155596517212
en 14.109155596517216 -18.61218869191112
- ll2 -18.612188691911108 14.109155596517216
+ ll2 -18.612188691911108 14.109155596517217
EPSG:4668
ll -0.2575842428449846 -171.99190036519758
- en -171.9926645223743 -0.25651942914879333
- ll2 -0.25758418396494137 -171.99190040716965
+ en -171.99266452237433 -0.2565194291487934
+ ll2 -0.25758418396494137 -171.99190040716974
EPSG:4669
ll 43.763571351956244 -76.50397692024245
- en -76.50397692024244 43.763571352898715
- ll2 43.76357135195632 -76.50397692024242
+ en -76.50397692024245 43.7635713528987
+ ll2 43.763571351956315 -76.50397692024245
EPSG:4670
ll 74.70148199798555 -136.1264363794791
en -136.1264363794791 74.70148199798602
- ll2 74.7014819979865 -136.1264363794791
+ ll2 74.70148199798649 -136.1264363794791
EPSG:4671
ll 1.710002127727222 93.20771507217523
en 93.20771507217523 1.710002127727222
ll2 1.710002127727222 93.20771507217523
EPSG:4672
ll -72.690646146816 -111.45255566222512
- en -111.45787649364607 -72.69116878088417
- ll2 -72.690646151014 -111.45255570492188
+ en -111.45787649364607 -72.69116878088418
+ ll2 -72.69064615101401 -111.45255570492189
EPSG:4673
ll -2.755678367401501 -26.3143362886548
- en -26.31497859917188 -2.7568471229689693
- ll2 -2.7556784437379345 -26.314336320385745
+ en -26.314978599171887 -2.7568471229689697
+ ll2 -2.7556784437379362 -26.31433632038576
EPSG:4674
ll -67.13758441728083 138.09996255174707
en 138.09996255174707 -67.13758441795581
ll2 -67.13758441728167 138.09996255174707
EPSG:4675
ll -34.065942648620066 105.70766849081429
- en 105.70589843371909 -34.068795946073244
- ll2 -34.06594250247494 105.70766858105532
+ en 105.70589843371909 -34.06879594607324
+ ll2 -34.06594250247493 105.70766858105532
EPSG:4676
ll 63.09467040874526 -138.03211930511213
en -138.03211930511213 63.09467040874526
@@ -13394,256 +13394,256 @@ EPSG:4677
ll2 -20.642809221975753 -39.683532245988374
EPSG:4678
ll 4.786703643938296 116.22033226986912
- en 116.22017023654605 4.786952245938901
- ll2 4.786703642674418 116.22033227068738
+ en 116.22017023654608 4.786952245938902
+ ll2 4.786703642674419 116.22033227068741
EPSG:4679
ll 85.62180850722928 -83.80286106379651
- en -83.79674186913569 85.61976269883901
- ll2 85.62180849599221 -83.80286103016948
+ en -83.79674186913567 85.61976269883901
+ ll2 85.62180849599221 -83.80286103016947
EPSG:4680
ll -71.14117840391518 -2.4934577717794184
- en -2.4918499723161 -71.14336402296536
- ll2 -71.14117844025358 -2.4934577450705175
+ en -2.4918499723161 -71.14336402296539
+ ll2 -71.1411784402536 -2.4934577450705175
EPSG:4681
ll -61.61457725290575 -139.95844517715292
- en -139.95844517715292 -61.61457725290573
- ll2 -61.61457725290574 -139.95844517715292
+ en -139.95844517715292 -61.614577252905754
+ ll2 -61.614577252905754 -139.95844517715292
EPSG:4682
ll -50.22679411672055 -175.97565303523322
- en -175.96564549959007 -50.224357710421394
- ll2 -50.22679456288099 -175.97565486320994
+ en -175.96564549959004 -50.2243577104214
+ ll2 -50.22679456288102 -175.97565486320997
EPSG:4683
ll -88.76026853662587 -175.14768974221153
- en -175.20519485365062 -88.76295979971599
- ll2 -88.76026850495712 -175.1476897388659
+ en -175.20519485365068 -88.76295979971599
+ ll2 -88.76026850495712 -175.1476897388658
EPSG:4684
ll 19.308181572729836 39.88791860620864
- en 39.88945056658716 19.307349373889334
- ll2 19.30818157706182 39.88791859828149
+ en 39.88945056658716 19.307349373889345
+ ll2 19.308181577061823 39.88791859828149
EPSG:4685
ll -78.62252758794192 141.80269625705012
en 141.80269625705012 -78.62252758794192
ll2 -78.62252758794192 141.80269625705012
EPSG:4686
ll -6.36899362522901 40.56170867852995
- en 40.56170867852995 -6.368993625437339
+ en 40.56170867852995 -6.368993625437337
ll2 -6.3689936252290344 40.56170867852995
EPSG:4687
ll -5.866210917125841 13.182991116758785
en 13.182998170277433 -5.866207422369518
- ll2 -5.866210917126094 13.182991116758808
+ ll2 -5.866210917126094 13.182991116758807
EPSG:4688
ll -1.9161683527315319 169.567099812634
- en 169.57937326769698 -1.957622424257637
- ll2 -1.9161756845501507 169.56710608481836
+ en 169.57937326769704 -1.9576224242576372
+ ll2 -1.9161756845501516 169.56710608481842
EPSG:4689
ll -31.70472801417325 -102.87208195515865
- en -102.87587283625606 -31.704844006553024
- ll2 -31.70472802605345 -102.87208205056133
+ en -102.87587283625606 -31.704844006553028
+ ll2 -31.704728026053456 -102.87208205056132
EPSG:4690
ll 30.21081439784645 20.456970836484885
en 20.456093207056337 30.21120813238217
- ll2 30.21081444941135 20.456970766535626
+ ll2 30.210814449411348 20.456970766535626
EPSG:4691
ll 50.99567573658135 149.23375146449558
- en 149.23813431400396 50.99559168137738
- ll2 50.995675697221394 149.23375164841914
+ en 149.238134314004 50.995591681377384
+ ll2 50.9956756972214 149.23375164841917
EPSG:4692
ll 28.292582375473685 13.092697602799433
- en 13.092335349856231 28.294067348922795
+ en 13.092335349856231 28.2940673489228
ll2 28.292582479620332 13.092697577525524
EPSG:4693
ll -79.43197622450931 -88.16223707215289
- en -88.16223683729925 -79.4319786614021
- ll2 -79.43197622450988 -88.1622370721529
+ en -88.16223683729926 -79.4319786614021
+ ll2 -79.43197622450988 -88.16223707215292
EPSG:4694
ll 10.017634575357135 -120.45293638122666
- en -120.45293638122666 10.017634575357135
- ll2 10.017634575357135 -120.45293638122665
+ en -120.45293638122668 10.017634575357134
+ ll2 10.017634575357132 -120.45293638122668
EPSG:4695
ll -74.10133080758368 -81.35308072326242
- en -81.34968046202412 -74.10177649814347
- ll2 -74.10133081412835 -81.35308067336888
+ en -81.34968046202415 -74.10177649814348
+ ll2 -74.10133081412836 -81.35308067336891
EPSG:4696
ll -66.09163747602487 112.49557549627394
- en 112.49557549627391 -66.09163747602487
- ll2 -66.09163747602487 112.49557549627393
+ en 112.49557549627394 -66.09163747602487
+ ll2 -66.09163747602487 112.49557549627394
EPSG:4697
ll 61.629624533178344 -29.433502503366498
- en -29.4335025033665 61.62962453317834
- ll2 61.62962453317834 -29.433502503366505
+ en -29.4335025033665 61.62962453317835
+ ll2 61.62962453317835 -29.433502503366505
EPSG:4698
ll -65.26709369681447 -162.2521296486472
- en -162.25688927831865 -65.26744366310064
- ll2 -65.2670936994555 -162.25212968450452
+ en -162.2568892783187 -65.26744366310064
+ ll2 -65.26709369945549 -162.25212968450455
EPSG:4699
ll -30.0188085358525 -102.00640203812571
- en -101.9982521419389 -30.01766731746936
- ll2 -30.01880848579792 -102.00640168239026
+ en -101.99825214193895 -30.01766731746936
+ ll2 -30.018808485797912 -102.00640168239029
EPSG:4700
ll -66.6279092662278 -107.39020651797925
- en -107.39020651797925 -66.62790926622782
- ll2 -66.62790926622782 -107.39020651797925
+ en -107.39020651797925 -66.6279092662278
+ ll2 -66.6279092662278 -107.39020651797925
EPSG:4701
ll -47.98211632770738 -64.49546466307707
- en -64.49358727144508 -47.98494982955787
- ll2 -47.982116379936535 -64.49546462857799
+ en -64.49358727144508 -47.984949829557884
+ ll2 -47.98211637993654 -64.49546462857799
EPSG:4702
ll -18.52585316834653 123.05600695292515
- en 123.05600695292513 -18.52585316891561
- ll2 -18.525853168346504 123.05600695292513
+ en 123.05600695292513 -18.525853168915614
+ ll2 -18.525853168346515 123.05600695292513
EPSG:4703
ll 23.856175508865178 116.77901104216909
- en 116.77901104216906 23.856175508865174
- ll2 23.856175508865174 116.77901104216906
+ en 116.77901104216909 23.856175508865178
+ ll2 23.856175508865178 116.77901104216909
EPSG:4704
ll 71.71815175085223 -64.7681683699314
- en -64.76816836993142 71.71815175085223
- ll2 71.71815175085223 -64.76816836993142
+ en -64.7681683699314 71.71815175085223
+ ll2 71.71815175085223 -64.7681683699314
EPSG:4705
ll 66.61360441039855 -169.23171038146913
en -169.23171038146913 66.61360441039855
ll2 66.61360441039855 -169.23171038146913
EPSG:4706
ll 65.6202993264314 30.592177756544345
- en 30.588458940937745 65.61970511063949
- ll2 65.62029932264115 30.59217773284351
+ en 30.58845894093774 65.6197051106395
+ ll2 65.62029932264117 30.592177732843506
EPSG:4707
ll 12.824410434747634 -135.471587689618
en -135.47308584657182 12.82770201728107
- ll2 12.824410524406549 -135.47158773016568
+ ll2 12.824410524406547 -135.4715877301657
EPSG:4708
ll 22.555631948238215 -100.97542879481917
- en -100.97078303505778 22.552406435271433
- ll2 22.555631797761652 -100.97542857931455
+ en -100.97078303505778 22.552406435271436
+ ll2 22.555631797761656 -100.97542857931454
EPSG:4709
ll 86.59769949453096 13.803702046673806
en 13.797931044627324 86.59935959321045
- ll2 86.59769946803122 13.80370213874786
+ ll2 86.59769946803124 13.803702138747862
EPSG:4710
ll -3.969143521035164 120.59218732276537
- en 120.59222738435705 -3.965198375711047
- ll2 -3.969142948551709 120.59218732854002
+ en 120.59222738435705 -3.965198375711046
+ ll2 -3.9691429485517076 120.59218732854004
EPSG:4711
ll -10.030039232793229 -130.64016680812253
en -130.64241531811317 -10.030251538952822
- ll2 -10.030039244448158 -130.6401669307527
+ ll2 -10.03003924444816 -130.6401669307527
EPSG:4712
ll 76.23239175028021 74.07200359936837
en 74.06348097186287 76.23306386488011
- ll2 76.23239177418115 74.07200329650496
+ ll2 76.23239177418117 74.07200329650495
EPSG:4713
ll -16.295555902191353 85.22974471616504
- en 85.22912635915593 -16.298144339472508
- ll2 -16.295555868014926 85.22974472427902
+ en 85.22912635915593 -16.298144339472504
+ ll2 -16.295555868014926 85.22974472427903
EPSG:4714
ll -18.51306985128008 109.25206471156605
en 109.2485284110142 -18.515646429253373
- ll2 -18.513069625044352 109.25206502019086
+ ll2 -18.51306962504435 109.25206502019087
EPSG:4715
ll 27.215788178561695 144.4498652815517
- en 144.44819543640037 27.214579101121355
- ll2 27.21578811195038 144.44986519004226
+ en 144.44819543640037 27.214579101121362
+ ll2 27.215788111950392 144.44986519004226
EPSG:4716
ll 35.51013370682888 -110.00879263049227
en -110.01302601649344 35.514624427795454
- ll2 35.510133814145526 -110.00879273120219
+ ll2 35.51013381414552 -110.00879273120219
EPSG:4717
ll -0.6510040311167273 -41.47194672474782
- en -41.47295124042209 -0.6526792258213792
- ll2 -0.6510040220781256 -41.471946719364205
+ en -41.47295124042209 -0.6526792258213794
+ ll2 -0.6510040220781258 -41.471946719364205
EPSG:4718
ll 32.18235772383214 -143.66667113206853
en -143.6698159948796 32.18851501668124
- ll2 32.18235749854662 -143.66667101756434
+ ll2 32.182357498546615 -143.66667101756437
EPSG:4719
ll 39.41769402810445 -151.2012207100356
- en -151.2009051881518 39.416266023630364
- ll2 39.41769400853771 -151.2012207057295
+ en -151.20090518815186 39.416266023630364
+ ll2 39.4176940085377 -151.20122070572953
EPSG:4720
ll -14.921419962072491 106.50759856562792
- en 106.50744467673901 -14.921458359121836
- ll2 -14.921419961958694 106.50759856559307
+ en 106.50744467673904 -14.921458359121836
+ ll2 -14.921419961958694 106.50759856559311
EPSG:4721
ll -13.792683731486079 120.98510863901885
- en 120.98904266576551 -13.791778709940937
- ll2 -13.792683662957284 120.98510893503583
+ en 120.98904266576552 -13.791778709940937
+ ll2 -13.792683662957286 120.98510893503583
EPSG:4722
ll 85.09297410822066 143.43488109263245
- en 143.39532421368324 85.09966214330237
- ll2 85.09297402872762 143.43488156205854
+ en 143.39532421368327 85.09966214330238
+ ll2 85.09297402872762 143.43488156205856
EPSG:4723
ll 31.574739280900644 -161.29878676327334
- en -161.2997320855564 31.574911517949015
- ll2 31.574739325653283 -161.2987866346395
+ en -161.29973208555643 31.574911517949015
+ ll2 31.574739325653287 -161.2987866346395
EPSG:4724
ll -73.76310976653485 25.399895394393354
- en 25.415338436725545 -73.76298753617341
- ll2 -73.76310975917244 25.39989632849667
+ en 25.41533843672555 -73.76298753617341
+ ll2 -73.76310975917245 25.399896328496673
EPSG:4725
ll 64.82658764718263 7.292983502025976
- en 7.295139301531063 64.82943091863662
+ en 7.295139301531063 64.82943091863663
ll2 64.82658767783379 7.292983525234556
EPSG:4726
ll 27.052211100290776 26.837529113207125
en 26.837023490210903 27.051900325366816
- ll2 27.05221111044194 26.83752913275935
+ ll2 27.05221111044193 26.837529132759354
EPSG:4727
ll 44.234226624576934 36.32864797704971
- en 36.33245343850013 44.234999408621896
- ll2 44.23422669717268 36.328648333270216
+ en 36.33245343850013 44.2349994086219
+ ll2 44.23422669717269 36.328648333270216
EPSG:4728
ll -6.929552719422219 -127.27911444817383
- en -127.27740818902141 -6.931172797489677
- ll2 -6.929552845106505 -127.2791143166777
+ en -127.27740818902137 -6.931172797489677
+ ll2 -6.929552845106504 -127.2791143166777
EPSG:4729
ll -87.15569542771891 -22.78488351233051
- en -22.825270904494637 -87.15674851386787
- ll2 -87.1556954480056 -22.784884289523546
+ en -22.825270904494637 -87.15674851386788
+ ll2 -87.15569544800562 -22.784884289523546
EPSG:4730
ll -85.63891800725177 -121.17237931995174
en -121.18694184487148 -85.63799316029875
- ll2 -85.63891799757357 -121.17237947239936
+ ll2 -85.6389179975736 -121.17237947239933
EPSG:4731
ll 17.169386600288206 31.829996776822554
en 31.8271269956144 17.172139716326427
- ll2 17.169386734689002 31.82999663758609
+ ll2 17.169386734689002 31.829996637586092
EPSG:4732
ll -48.548898470999845 -129.79962978543
- en -129.80024035818835 -48.548775042827444
- ll2 -48.548898470209934 -129.79962978932681
+ en -129.80024035818832 -48.54877504282746
+ ll2 -48.548898470209934 -129.79962978932676
EPSG:4733
ll -10.605898386618989 -121.27674375224765
- en -121.27916975277087 -10.607362996846048
+ en -121.27916975277087 -10.607362996846046
ll2 -10.605898416089168 -121.27674380074613
EPSG:4734
ll 12.760746686260603 -118.5941631998392
- en -118.58712249838017 12.76630633470696
- ll2 12.760746714233397 -118.59416316464166
+ en -118.5871224983802 12.76630633470696
+ ll2 12.760746714233395 -118.59416316464167
EPSG:4735
ll 16.40791023461037 -94.6435293042663
en -94.64821844090305 16.413443315883292
- ll2 16.407908643201836 -94.64352796395634
+ ll2 16.40790864320184 -94.64352796395634
EPSG:4736
ll -32.81094424756028 -155.2635223701101
- en -155.26456764929029 -32.811518282648734
- ll2 -32.8109442373277 -155.26352235156577
+ en -155.2645676492903 -32.81151828264873
+ ll2 -32.8109442373277 -155.26352235156585
EPSG:4737
ll -57.72350128256881 -131.9881628159278
en -131.9881628159278 -57.72350128342015
ll2 -57.723501282569266 -131.9881628159278
EPSG:4738
ll -33.4042647369429 26.28756620710155
- en 26.287566207101552 -33.40426473694289
- ll2 -33.40426473694289 26.287566207101555
+ en 26.287566207101552 -33.404264736942906
+ ll2 -33.404264736942906 26.287566207101555
EPSG:4739
ll 54.68942841431186 145.41702235392353
en 145.41218949315353 54.69099869222158
ll2 54.689428419559945 145.41702233781038
EPSG:4740
ll -5.335512878301714 74.88159959430473
- en 74.88157848319364 -5.335526304608727
- ll2 -5.335512878298582 74.88159959430475
+ en 74.88157848319362 -5.335526304608728
+ ll2 -5.335512878298582 74.88159959430473
EPSG:4741
ll -69.52735338324743 -112.20394483065328
en -112.20394483065328 -69.52735338324743
@@ -13658,8 +13658,8 @@ EPSG:4743
ll2 40.430049720769034 -10.02939760139551
EPSG:4744
ll 42.26699979361044 -156.77078918372743
- en -156.77124528073338 42.26935773265967
- ll2 42.2669999456456 -156.7707892130264
+ en -156.77124528073338 42.269357732659685
+ ll2 42.26699994564562 -156.77078921302638
EPSG:4745
ll 19.579220556270798 55.29986470614176
en 55.29986470614176 19.579220556270798
@@ -13674,40 +13674,40 @@ EPSG:4747
ll2 75.27214897422964 86.66151687414265
EPSG:4748
ll 15.971088321108397 -26.39219432263809
- en -26.39567783674672 15.97274968922319
- ll2 15.971088323698362 -26.39219432803491
+ en -26.39567783674672 15.972749689223185
+ ll2 15.971088323698355 -26.39219432803491
EPSG:4749
ll 52.742592421515155 -18.659799230158
- en -18.659799230158008 52.74259242242387
- ll2 52.74259242151541 -18.659799230158008
+ en -18.659799230157997 52.74259242242387
+ ll2 52.74259242151542 -18.659799230157997
EPSG:4750
ll 55.78763053953884 104.42256742800669
- en 104.42176290578635 55.78796611808359
- ll2 55.78763053942161 104.42256742828798
+ en 104.42176290578638 55.78796611808359
+ ll2 55.78763053942161 104.42256742828802
EPSG:4751
ll -74.70255672981423 -21.39596595529366
- en -21.395965955293665 -74.70255672981422
- ll2 -74.70255672981422 -21.395965955293665
+ en -21.39596595529366 -74.70255672981423
+ ll2 -74.70255672981423 -21.39596595529366
EPSG:4752
ll 47.375723022841356 -118.01175810837222
- en -118.0104785146838 47.37640895825107
- ll2 47.37572299051534 -118.01175816848854
+ en -118.01047851468384 47.376408958251055
+ ll2 47.37572299051533 -118.01175816848858
EPSG:4753
ll -75.32963626029736 171.91364409212065
- en 171.91364409212065 -75.32963626029735
- ll2 -75.32963626029735 171.91364409212065
+ en 171.91364409212065 -75.32963626029736
+ ll2 -75.32963626029736 171.91364409212065
EPSG:4754
ll 3.8298033539767857 130.42748470530614
en 130.42541488617863 3.8299674819162215
ll2 3.8298033617949345 130.42748460736996
EPSG:4755
ll -44.01845301265966 92.12261890649751
- en 92.12261890649751 -44.018453012659684
+ en 92.12261890649751 -44.0184530126597
ll2 -44.018453012659734 92.12261890649751
EPSG:4756
ll -82.46387111180664 -79.9893200199258
- en -79.97599700666888 -82.46378591219246
- ll2 -82.46387111033648 -79.98931978430454
+ en -79.97599700666886 -82.46378591219245
+ ll2 -82.46387111033647 -79.98931978430453
EPSG:4757
ll 51.29846876060179 113.69172316037736
en 113.69172316037736 51.29846876060179
@@ -13715,71 +13715,71 @@ EPSG:4757
EPSG:4758
ll -45.51562768191982 15.6381536144672
en 15.638153614467198 -45.51562768191986
- ll2 -45.5156276819199 15.638153614467196
+ ll2 -45.5156276819199 15.638153614467194
EPSG:4759
ll -74.03190409160084 -7.146029999549739
- en -7.146029999549738 -74.03190409209957
- ll2 -74.0319040916018 -7.146029999549738
+ en -7.146029999549739 -74.03190409209955
+ ll2 -74.03190409160179 -7.1460299995497385
EPSG:4760
ll 12.91598583221986 80.03743219980129
- en 80.03743219980127 12.91598583221986
- ll2 12.915985832219858 80.03743219980127
+ en 80.03743219980129 12.91598583221986
+ ll2 12.91598583221986 80.03743219980129
EPSG:4761
ll 72.69186169316546 -25.168802246574558
- en -25.168802246574558 72.69186169370106
- ll2 72.69186169316644 -25.168802246574558
+ en -25.16880224657456 72.69186169370104
+ ll2 72.69186169316643 -25.168802246574565
EPSG:4762
ll 23.165342385929947 114.57708259830684
- en 114.57708259830686 23.165342385929865
- ll2 23.165342385929783 114.57708259830684
+ en 114.57708259830686 23.16534238592987
+ ll2 23.16534238592979 114.57708259830687
EPSG:4763
ll -0.2594246783853009 -113.38291420160589
- en -113.38291420160586 -0.25942467838530087
- ll2 -0.25942467838530087 -113.38291420160587
+ en -113.38291420160589 -0.25942467838530087
+ ll2 -0.2594246783853008 -113.38291420160589
EPSG:4764
ll -5.211949202191278 -99.36210893074437
- en -99.36210893074438 -5.211949202362221
- ll2 -5.211949202191285 -99.36210893074438
+ en -99.36210893074437 -5.211949202362221
+ ll2 -5.211949202191285 -99.36210893074437
EPSG:4765
ll -8.242985261014468 -17.494431749131394
- en -17.494431749131397 -8.242985261282639
- ll2 -8.24298526101461 -17.494431749131397
+ en -17.494431749131394 -8.242985261282639
+ ll2 -8.24298526101461 -17.494431749131394
EPSG:4766
ll -83.06595104898665 87.54283329604938
- en 3.046687738872736E7 -9228376.4988248
- ll2 -83.06595104898615 87.54283329605236
+ en 3.046687738872736E7 -9228376.498824801
+ ll2 -83.06595104898616 87.54283329605235
EPSG:4767
ll -75.72999683560559 83.63653861358462
- en 3.124326513603404E7 -8428948.560282687
- ll2 -75.72999682881321 83.63653912565081
+ en 3.124326513603404E7 -8428948.560282685
+ ll2 -75.72999682881321 83.63653912565083
EPSG:4768
ll 48.411444271735064 86.07844019715708
en 3.1765943165662758E7 5412033.353326241
ll2 48.41144419792891 86.07844058790484
EPSG:4769
ll 76.34428793721645 93.92021938924185
- en 3.3366227528154604E7 8482906.753340432
- ll2 76.34428793695886 93.92021939126317
+ en 3.3366227528154604E7 8482906.753340434
+ ll2 76.34428793695888 93.92021939126317
EPSG:4770
ll -84.99973435030626 101.59490101915614
en 3.449605631332145E7 -9443656.938871576
- ll2 -84.99973435030623 101.59490101915627
+ ll2 -84.99973435030624 101.59490101915627
EPSG:4771
ll -80.28347722204197 97.0707350060425
en 3.5350987029807344E7 -8927127.439253312
ll2 -80.28347722117947 97.07073512445022
EPSG:4772
ll 83.31364060394606 108.33654394709114
- en 3.6504376604597814E7 9255346.061479919
- ll2 83.31364060394604 108.33654394709139
+ en 3.6504376604597814E7 9255346.06147992
+ ll2 83.31364060394607 108.33654394709139
EPSG:4773
ll 37.31831833685503 116.81798200477571
en 3.801594638707367E7 4147823.296470805
- ll2 37.31831833465075 116.81798200579732
+ ll2 37.31831833465075 116.81798200579733
EPSG:4774
ll 22.86713683214974 116.0135428312535
- en 3.87066683873127E7 2531280.56208262
- ll2 22.867136832148663 116.01354283125492
+ en 3.87066683873127E7 2531280.5620826194
+ ll2 22.86713683214866 116.01354283125492
EPSG:4775
ll 39.26312420274513 114.74581165098412
en 3.930543972368705E7 4350215.347182278
@@ -13802,8 +13802,8 @@ EPSG:4779
ll2 18.159523177486513 134.7078406085137
EPSG:4780
ll 11.456314804071198 135.31224645454648
- en 4.48616120715799E7 1269042.3332066888
- ll2 11.456314804060689 135.31224645444325
+ en 4.48616120715799E7 1269042.3332066885
+ ll2 11.456314804060687 135.31224645444325
EPSG:4781
ll 52.780103680134715 140.14995633707483
en 4.5847387958243124E7 5862698.993320013
@@ -13819,15 +13819,15 @@ EPSG:4783
EPSG:4784
ll -15.339642788587085 72.53263123597523
en -412108.96192965354 -1714525.6043821175
- ll2 -15.339642782266397 72.53263125340726
+ ll2 -15.339642782266395 72.53263125340726
EPSG:4785
ll 36.81681944486475 77.0900543604865
en -116971.55580707442 4098611.620109242
ll2 36.81681943900427 77.09005436025899
EPSG:4786
ll 56.58559799996533 79.62006793489046
- en 47020.31969509722 6298282.702656662
- ll2 56.5855979858562 79.6200679726882
+ en 47020.3196950971 6298282.702656661
+ ll2 56.58559798585619 79.6200679726882
EPSG:4787
ll -30.305844442516587 93.19772696749175
en 807670.4090539715 -3358412.694030317
@@ -13838,12 +13838,12 @@ EPSG:4788
ll2 8.617493124018083 94.32637693778405
EPSG:4789
ll 75.50514059736363 99.91539335541091
- en 609363.861806703 8387086.31488526
- ll2 75.5051405972988 99.91539335521945
+ en 609363.8618067029 8387086.3148852615
+ ll2 75.50514059729882 99.91539335521945
EPSG:4790
ll 5.241018795589426 95.46407793441813
en 107764.43827937508 580655.0617394639
- ll2 5.241018795581119 95.46407793465097
+ ll2 5.24101879558112 95.46407793465097
EPSG:4791
ll -69.93396355673791 98.98514151513604
en 384547.62823278195 -7764602.316154224
@@ -13859,18 +13859,18 @@ EPSG:4793
EPSG:4794
ll 28.0949566229569 107.36830816161
en 142953.6718005273 3114353.723871129
- ll2 28.094956622894642 107.36830816148282
+ ll2 28.09495662289464 107.36830816148282
EPSG:4795
ll -20.935761269433485 111.3153525306208
en 220675.52876297088 -2318345.381500218
- ll2 -20.93576126942825 111.3153525306184
+ ll2 -20.935761269428248 111.3153525306184
EPSG:4796
ll 79.26112543755974 112.81345729280531
- en 412949.29373858473 8805917.223898714
- ll2 79.26112543751734 112.81345729316892
+ en 412949.29373858485 8805917.223898716
+ ll2 79.26112543751736 112.81345729316892
EPSG:4797
ll -56.6582141493353 120.5683735189845
- en 534857.6837828974 -6282108.143582952
+ en 534857.6837828974 -6282108.143582953
ll2 -56.6582141493353 120.5683735189845
EPSG:4798
ll 71.85045898270525 124.71191102430078
@@ -13882,92 +13882,92 @@ EPSG:4799
ll2 -4.243342917938144 123.7682929865902
EPSG:4800
ll -34.77761308760502 129.3820440162696
- en 534970.8721264675 -3850056.3977696607
- ll2 -34.777613087605005 129.3820440162696
+ en 534970.8721264675 -3850056.3977696616
+ ll2 -34.77761308760501 129.3820440162696
EPSG:4801
ll -49.37325815884687 -164.23179733845456
- en -171.67370371449792 -49.37058302215701
- ll2 -49.37325876118709 -164.2317968168505
+ en -171.67370371449795 -49.37058302215699
+ ll2 -49.37325876118708 -164.23179681685048
EPSG:4802
ll -17.892796525236292 -95.33823066750367
- en -21.259931476464274 -17.889624249112845
- ll2 -17.892796512797766 -95.33823067770477
+ en -21.259931476464274 -17.88962424911285
+ ll2 -17.89279651279777 -95.33823067770477
EPSG:4803
ll 83.33065795095723 -38.549457324021176
- en -29.39929658404762 83.32896018421488
- ll2 83.33065788714318 -38.54945663762989
+ en -29.39929658404763 83.32896018421488
+ ll2 83.33065788714318 -38.549456637629895
EPSG:4804
ll 52.62132806420664 -64.22765995467509
en -171.03090103566524 52.614788697942465
- ll2 52.62132911198866 -64.22766067056705
+ ll2 52.621329111988665 -64.22766067056703
EPSG:4805
ll -30.502382851226123 37.62425994318511
- en 55.29693905035859 -30.507495254980064
- ll2 -30.50238236195928 37.62425937069509
+ en 55.29693905035859 -30.507495254980075
+ ll2 -30.502382361959295 37.624259370695114
EPSG:4806
ll 24.4693249765414 45.94791554131325
- en 33.4948041788637 24.468861967199373
- ll2 24.46932498982475 45.947915537981395
+ en 33.49480417886371 24.468861967199373
+ ll2 24.469324989824752 45.94791553798142
EPSG:4807
ll -75.20409806509495 10.267666438062548
- en 7.931457355806516 -75.20485639081792
- ll2 -75.2040979976466 10.26766634737575
+ en 7.931457355806514 -75.20485639081792
+ ll2 -75.2040979976466 10.267666347375751
EPSG:4808
ll 76.79408745441029 88.46461579971327
en -18.343103644731173 76.79408745441029
ll2 76.79408745441029 88.46461579971327
EPSG:4809
ll -52.989977766815954 -131.53916663926793
- en -135.90714163926793 -52.98997776681595
- ll2 -52.98997776681595 -131.53916663926793
+ en -135.90714163926793 -52.98997776681596
+ ll2 -52.98997776681596 -131.53916663926793
EPSG:4810
ll -71.24985414622854 43.21025689025265
- en 40.87433641489608 -71.24751661792979
- ll2 -71.24985408855939 43.210256922521374
+ en 40.874336414896085 -71.24751661792979
+ ll2 -71.24985408855937 43.210256922521374
EPSG:4811
ll 28.522402037214263 138.16370078308304
- en 135.82409414566723 28.52276827103961
- ll2 28.522402039759108 138.1637007666433
+ en 135.82409414566726 28.52276827103961
+ ll2 28.52240203975911 138.16370076664333
EPSG:4812
ll 38.113160290637126 136.63325714253506
- en 906437.3160096018 4230288.695303567
- ll2 38.11316029003846 136.63325714296624
+ en 906437.3160096019 4230288.695303567
+ ll2 38.113160290038465 136.63325714296624
EPSG:4813
ll 54.36623906729463 169.25059633301166
- en 62.452089581949956 54.36956608217008
- ll2 54.36623883414309 169.2505956889946
+ en 62.45208958194997 54.36956608217008
+ ll2 54.36623883414308 169.25059568899462
EPSG:4814
ll 40.10195085256609 -20.994719538373516
- en -39.052997316151284 40.10195085256609
- ll2 40.10195085256609 -20.994719538373506
+ en -39.05299731615129 40.10195085256609
+ ll2 40.10195085256609 -20.994719538373513
EPSG:4815
ll 88.69189863132885 -93.19282827338697
- en -116.90916577338696 88.69189863132885
- ll2 88.69189863132885 -93.19282827338697
+ en -116.90916577338697 88.69189863132885
+ ll2 88.69189863132885 -93.19282827338698
EPSG:4816
ll -37.92220927097175 -60.65104922323114
en -62.985704639865695 -37.927580259509945
- ll2 -37.922208941343094 -60.65104938051546
+ ll2 -37.9222089413431 -60.65104938051546
EPSG:4817
ll 80.79007703855524 -66.07378735067188
- en -76.80584491187237 80.79145146794848
- ll2 80.79007702400773 -66.07378676718882
+ en -76.80584491187238 80.79145146794846
+ ll2 80.7900770240077 -66.07378676718885
EPSG:4818
ll -74.10106978367264 -90.41447719841501
- en -72.7670459233751 -74.10124066354885
- ll2 -74.1010697524622 -90.41447370426187
+ en -72.7670459233751 -74.10124066354886
+ ll2 -74.10106975246222 -90.41447370426187
EPSG:4819
ll -9.259321807392482 135.1252245983803
- en 132.78581312377227 -9.264749012849007
- ll2 -9.259321894655994 135.1252245725
+ en 132.7858131237723 -9.264749012849007
+ ll2 -9.259321894655994 135.12522457250006
EPSG:4820
ll -63.55349241185317 133.04778854714476
- en 26.243538043215892 -63.559404386934936
- ll2 -63.55349206175756 133.0477883420387
+ en 26.24353804321592 -63.559404386934936
+ ll2 -63.553492061757574 133.04778834203876
EPSG:4821
ll 24.307181751012365 114.98042160204389
- en 112.64319243537722 24.30718175101236
- ll2 24.30718175101236 114.98042160204389
+ en 112.64319243537722 24.307181751012365
+ ll2 24.307181751012365 114.98042160204389
EPSG:4822
ll -87.79855257178201 140.86889980150295
en 525136.961659124 -9757533.840287095
@@ -13978,80 +13978,80 @@ EPSG:4823
ll2 36.871987671883744 158.1405367049527
EPSG:4824
ll -18.25989360911956 66.63745424481314
- en 66.63745424481314 -18.259893609119555
- ll2 -18.259893609119555 66.63745424481314
+ en 66.63745424481314 -18.25989360911956
+ ll2 -18.25989360911956 66.63745424481314
EPSG:4826
ll -39.49394374036685 3.8627795760872914
- en 4097776.509770707 -6870264.773109296
- ll2 -39.49394374036683 3.8627795760872843
+ en 4097776.509770708 -6870264.773109296
+ ll2 -39.49394374036683 3.8627795760872914
EPSG:4839
ll 88.25522831147832 27.630810608656745
- en 102666.64478190479 4724048.628759975
- ll2 88.25522831147853 27.63081060865675
+ en 102666.64478190479 4724048.628759974
+ ll2 88.25522831147855 27.630810608656752
EPSG:4901
ll 71.71615145828261 126.25323095527901
- en 123.91602262194567 71.7161514582826
- ll2 71.7161514582826 126.253230955279
+ en 123.91602262194569 71.71615145828261
+ ll2 71.71615145828261 126.25323095527902
EPSG:4902
ll 76.44308627826621 55.85632742733202
- en 53.519098260665345 76.4430862782662
- ll2 76.4430862782662 55.85632742733201
+ en 53.51909826066535 76.44308627826621
+ ll2 76.44308627826621 55.85632742733202
EPSG:4903
ll 27.378923243672034 166.96268864066622
- en 170.6506275295551 27.378923243672034
- ll2 27.378923243672034 166.96268864066622
+ en 170.65062752955512 27.378923243672034
+ ll2 27.378923243672034 166.96268864066624
EPSG:4904
ll 5.475031253648169 102.90093040721013
en 112.03692069495584 5.469571249414993
ll2 5.47503210142768 102.90092977725674
EPSG:5013
ll -66.78348803963289 -121.30319924495774
- en -121.30319924495774 -66.78348804031596
- ll2 -66.78348803963371 -121.30319924495774
+ en -121.30319924495774 -66.78348804031594
+ ll2 -66.7834880396337 -121.30319924495774
EPSG:5014
ll -16.7683309730795 -25.707346454470837
en 1278967.000075987 -1868284.872768698
- ll2 -16.768330970683408 -25.707346457932843
+ ll2 -16.768330970683408 -25.70734645793284
EPSG:5015
ll -72.74287896907245 -20.994723791038094
- en 698547.1799682511 -8081744.926434274
- ll2 -72.74287896781077 -20.994723799787554
+ en 698547.1799682509 -8081744.926434276
+ ll2 -72.74287896781078 -20.994723799787558
EPSG:5016
ll -8.123383216144617 -16.935020044877326
en 286787.7887573774 -898446.9915348152
- ll2 -8.12338321614447 -16.93502004486906
+ ll2 -8.123383216144472 -16.935020044869056
EPSG:5018
ll -81.18066303708804 -3.6089266146959353
- en 77475.71081414587 -1.3412614853415545E7
- ll2 -81.18066303230684 -3.608926605691833
+ en 77475.71081414577 -1.3412614853415545E7
+ ll2 -81.18066303230684 -3.608926605691839
EPSG:5041
ll -14.737323880014742 -31.27099107011827
en -6494042.084627187 -1.1986192096024344E7
- ll2 -14.737323880013859 -31.270991070118267
+ ll2 -14.737323880013857 -31.270991070118267
EPSG:5042
ll -16.11598329054371 -97.87024441414485
- en -7430865.181745999 696351.01862513
- ll2 -16.115983290542786 -97.87024441414484
+ en -7430865.181745999 696351.0186251279
+ ll2 -16.11598329054279 -97.87024441414486
EPSG:5048
ll 7.556616585204793 19.78136408233872
- en -298378.88700273994 841922.0159042499
- ll2 7.556616583853502 19.781364097259114
+ en -298378.887002739 841922.0159042499
+ ll2 7.556616583853502 19.781364097259125
EPSG:5070
ll 0.5619215891761371 -159.31180868353957
- en -7560971.360081381 310596.1577298755
- ll2 0.5619215891761462 -159.31180868353957
+ en -7560971.36008138 310596.1577298769
+ ll2 0.5619215891761646 -159.31180868353957
EPSG:5071
ll 42.35077243361198 -51.968703769753716
en 3476540.8380818595 2970250.992728777
- ll2 42.35077243361206 -51.96870376975371
+ ll2 42.35077243361206 -51.968703769753716
EPSG:5072
ll 87.76263275942475 -110.4207735959925
- en -613119.1321436728 5919529.292434434
- ll2 87.76263275942523 -110.42077359599251
+ en -613119.1321436722 5919529.2924344335
+ ll2 87.76263275942492 -110.4207735959925
EPSG:5105
ll -3.9749417560042133 3.141514911971208
en -161991.78962896872 -5871190.002715995
- ll2 -3.974941756003715 3.141514911998893
+ ll2 -3.9749417560037146 3.1415149119988928
EPSG:5106
ll 28.892405648472504 5.322578610897153
en -14849.602652383299 -2233368.3319647047
@@ -14059,79 +14059,79 @@ EPSG:5106
EPSG:5107
ll 2.0457866251836805 9.272248171562483
en 297192.4369220766 -5204961.435961961
- ll2 2.0457866251836285 9.272248171555951
+ ll2 2.045786625183628 9.272248171555951
EPSG:5108
ll 84.90883890825393 7.057384574411396
- en 85702.9579018064 4002225.407516839
- ll2 84.90883890825438 7.057384574411419
+ en 85702.95790180644 4002225.4075168404
+ ll2 84.90883890825438 7.057384574411414
EPSG:5109
ll -20.415120017455763 0.2935930186512907
- en -864033.5344675743 -7716785.785671974
- ll2 -20.415120005307266 0.29359302784668984
+ en -864033.5344675747 -7716785.785671974
+ ll2 -20.415120005307266 0.29359302784668806
EPSG:5110
ll 76.29159414367896 7.939046773538099
- en 32246.178253376536 3041299.899773311
- ll2 76.29159414367547 7.939046773542325
+ en 32246.17825337661 3041299.8997733123
+ ll2 76.29159414367548 7.939046773542325
EPSG:5111
ll -0.47589928761672695 1.6393571633292634
en -1003139.5571167881 -5484699.338974233
- ll2 -0.4758992867489052 1.639357331377901
+ ll2 -0.4758992867489051 1.6393573313779013
EPSG:5112
ll 38.09606081007439 21.280485136122582
- en 870923.9278549292 -1176514.4122186308
+ en 870923.927854929 -1176514.4122186308
ll2 38.0960607852884 21.280485093850565
EPSG:5113
ll 66.71358244253693 7.411247102789847
en -168363.8255721248 1984243.9446382504
- ll2 66.71358243982368 7.411247111711204
+ ll2 66.71358243982367 7.411247111711203
EPSG:5114
ll 36.89734532934361 6.974304195995877
- en -571314.4436953391 -1319606.5126202349
- ll2 36.897345319689286 6.974304199445684
+ en -571314.4436953393 -1319606.5126202358
+ ll2 36.89734531968928 6.974304199445684
EPSG:5115
ll 53.56012440711561 8.88527867569608
- en -338037.56753353565 526055.1768874793
- ll2 53.560124399333006 8.885278687498886
+ en -338037.5675335357 526055.1768874786
+ ll2 53.56012439933299 8.885278687498884
EPSG:5116
ll -69.14146977489315 18.78720657141714
- en 190905.23748668976 -1.3106184548015814E7
- ll2 -69.14146977488772 18.787206571415876
+ en 190905.2374866897 -1.3106184548015814E7
+ ll2 -69.14146977488772 18.78720657141588
EPSG:5117
ll -89.63049823085122 12.957634553473367
- en 96731.50624552794 -1.5392106910898509E7
- ll2 -89.6304982308462 12.957634554271532
+ en 96731.50624552784 -1.5392106910898507E7
+ ll2 -89.63049823084619 12.957634554271696
EPSG:5118
ll -72.6923725600825 22.846600234688598
en 244276.90310623078 -1.3505901781767007E7
- ll2 -72.69237255989377 22.846600234215156
+ ll2 -72.69237255989378 22.846600234215156
EPSG:5119
ll -59.675732421578545 19.87627245465107
- en 121201.05641110758 -1.2049289085463665E7
- ll2 -59.675732421579056 19.876272454651065
+ en 121201.05641110777 -1.2049289085463665E7
+ ll2 -59.67573242157907 19.87627245465107
EPSG:5120
ll 29.152024527520695 28.550471225789416
en 884642.001173934 -2178197.600876828
- ll2 29.15202451941248 28.550471230670606
+ ll2 29.15202451941248 28.550471230670603
EPSG:5121
ll 66.52929109826579 21.030385739283233
en 79120.29257508198 1950656.9274785104
- ll2 66.5292910982666 21.03038573928323
+ ll2 66.5292910982666 21.030385739283226
EPSG:5122
ll -31.177645458794842 22.369883310437395
en 87596.39273401149 -8881960.014958572
ll2 -31.177645458793062 22.369883310437398
EPSG:5123
ll 78.73305742947565 29.62058861432076
- en 233316.67871583826 3319386.7534473026
- ll2 78.733057429045 29.620588603151653
+ en 233316.6787158382 3319386.7534473026
+ ll2 78.73305742904499 29.620588603151656
EPSG:5124
ll -73.57382917175308 14.876747557960012
- en -202665.43365278066 -1.362349037790893E7
+ en -202665.43365278072 -1.362349037790893E7
ll2 -73.57382915923239 14.876748196419408
EPSG:5125
ll -71.86643384048102 29.708485266998302
- en 246145.27923363147 -1.3413611474180229E7
- ll2 -71.8664338403067 29.7084852666486
+ en 246145.2792336316 -1.3413611474180229E7
+ ll2 -71.86643384030673 29.708485266648605
EPSG:5126
ll -2.595053728863334 21.817785963366095
en -421272.76635043306 -5719196.824507062
@@ -14142,8 +14142,8 @@ EPSG:5127
ll2 -39.896608527452855 22.4450605093979
EPSG:5128
ll 34.226281912732404 21.16888631245231
- en -576162.6756325761 -1618110.2957553482
- ll2 34.22628190584587 21.16888631103961
+ en -576162.6756325765 -1618110.2957553482
+ ll2 34.22628190584587 21.168886311039607
EPSG:5129
ll -43.2806880285453 22.203109696870854
en -492375.2403717713 -1.0251118831814582E7
@@ -14151,31 +14151,31 @@ EPSG:5129
EPSG:5130
ll -23.493543640277608 39.8423456553954
en 1057194.5893609729 -8061776.909480074
- ll2 -23.493543625972308 39.842345652322756
+ ll2 -23.493543625972297 39.84234565232275
EPSG:5132
ll 23.657630627923893 -28.985115572668548
en -28.985115572668548 23.657630627923893
ll2 23.657630627923893 -28.985115572668548
EPSG:5167
ll 44.44678140691613 124.58275518947445
- en -310783.3989649373 1235963.9468313295
- ll2 44.44678140126809 124.58275519276313
+ en -310783.3989649374 1235963.9468313295
+ ll2 44.4467814012681 124.58275519276313
EPSG:5168
ll 39.31717065208605 119.39054408465377
- en -456528.63689864834 723915.7455722947
- ll2 39.31717064016723 119.39054409397077
+ en -456528.63689864834 723915.7455722954
+ ll2 39.317170640167234 119.39054409397077
EPSG:5169
ll 21.580363967535575 127.07558631683915
en 414963.64286504104 -1318542.0703147356
- ll2 21.580363967534435 127.07558631683978
+ ll2 21.58036396753443 127.07558631683978
EPSG:5170
ll 87.95762198341882 132.39853124643935
- en 221455.03044129108 6066697.337545597
- ll2 87.95762198342015 132.3985312426476
+ en 221455.03044129096 6066697.337545598
+ ll2 87.95762198342017 132.3985312426476
EPSG:5171
ll -5.435602964366851 123.4057977909252
en -420866.1044678035 -4310954.062018106
- ll2 -5.43560296419123 123.40579779421145
+ ll2 -5.435602964191231 123.40579779421145
EPSG:5172
ll 63.19176858954924 132.80530307331807
en 290859.0172282569 3303220.620979045
@@ -14190,11 +14190,11 @@ EPSG:5174
ll2 -86.65415135274614 134.3873428705776
EPSG:5175
ll 72.17917544437984 128.48853327164898
- en 250756.7032287629 4354810.834683614
- ll2 72.17917544437952 128.48853327164895
+ en 250756.70322876293 4354810.834683612
+ ll2 72.1791754443795 128.48853327164895
EPSG:5176
ll 26.003158739660748 119.67447499386948
- en -736364.8312260979 -796559.0487685376
+ en -736364.8312260977 -796559.0487685376
ll2 26.003158724113216 119.67447499637517
EPSG:5177
ll -23.980215730376628 136.1135404435949
@@ -14203,10 +14203,10 @@ EPSG:5177
EPSG:5178
ll -44.5282855602861 133.24681167335638
en 1456595.2138569728 -7151531.987955658
- ll2 -44.52828555733168 133.2468116725948
+ ll2 -44.52828555733167 133.2468116725948
EPSG:5179
ll 20.19151488300436 120.03688471886126
- en 218572.751576078 44495.52628162922
+ en 218572.75157607778 44495.52628162922
ll2 20.191514879881964 120.03688471820983
EPSG:5180
ll -76.03244090612439 128.0511781343984
@@ -14214,64 +14214,64 @@ EPSG:5180
ll2 -76.03244090611206 128.051178134378
EPSG:5181
ll 12.169374845334062 130.11324341082636
- en 538980.3483902703 -2359734.010775695
- ll2 12.169374845326617 130.113243410758
+ en 538980.3483902735 -2359734.0107756946
+ ll2 12.169374845326626 130.11324341075803
EPSG:5182
ll 54.98123463139376 121.41925467455896
en -157108.32052860217 2451905.1231942335
- ll2 54.98123462858145 121.41925467714618
+ ll2 54.98123462858144 121.41925467714618
EPSG:5183
ll -51.05670797896726 129.6541640558784
en 245864.59047693785 -9366096.08071503
- ll2 -51.05670797896746 129.6541640558784
+ ll2 -51.05670797896746 129.65416405587843
EPSG:5184
ll 65.59546174333866 129.68594767889834
en 139395.71389844076 3570866.2439847505
- ll2 65.59546174333913 129.68594767889832
+ ll2 65.59546174333911 129.68594767889832
EPSG:5185
ll 69.9738049799073 132.95924851942527
- en 503567.5548720823 4178409.9363140874
+ en 503567.55487208255 4178409.9363140864
ll2 69.97380497095737 132.95924841214176
EPSG:5186
ll -26.551866261481045 122.02631891017049
- en -295980.40573135467 -6555113.896553946
- ll2 -26.551866261113343 122.02631890945
+ en -295980.4057313561 -6555113.896553947
+ ll2 -26.551866261113364 122.02631890945001
EPSG:5187
ll 86.65123493674582 123.85967326825974
- en 166507.1993785571 6021935.978325738
- ll2 86.65123493674398 123.85967327068674
+ en 166507.1993785571 6021935.978325739
+ ll2 86.65123493674399 123.85967327068674
EPSG:5188
ll -16.414731898457234 123.61302974738174
- en -590862.8919737772 -5437500.461075419
- ll2 -16.41473189587383 123.613029751751
+ en -590862.8919737772 -5437500.46107542
+ ll2 -16.414731895873842 123.613029751751
EPSG:5223
ll 89.76281753326197 15.073239090366013
en 501419.7202724465 1.0471521772084335E7
ll2 89.76281753326198 15.07323909034262
EPSG:5228
ll -29.375470931639377 130.08190525780105
- en 130.0858383813392 -29.378584438863765
- ll2 -29.375470580280926 130.08190427377048
+ en 130.08583838133922 -29.378584438863765
+ ll2 -29.375470580280922 130.0819042737705
EPSG:5229
ll -75.53935328708808 8.509422590703082
- en 26.16913453754206 -75.54490223211047
- ll2 -75.53935239081508 8.509422574806756
+ en 26.169134537542067 -75.54490223211049
+ ll2 -75.5393523908151 8.509422574806765
EPSG:5233
ll -77.54943103226499 -33.64467538210735
- en -33.67117258164972 -77.5447656982864
- ll2 -77.54943160470383 -33.64467177135781
+ en -33.671172581649735 -77.5447656982864
+ ll2 -77.54943160470383 -33.644671771357814
EPSG:5234
ll 40.836454797413495 82.95606278396568
en 384000.61027692957 3950211.1581694107
- ll2 40.83645474516854 82.9560628355361
+ ll2 40.83645474516854 82.95606283553612
EPSG:5235
ll 23.089333785767167 82.59356373287116
- en 686460.7786166035 2281282.445406324
- ll2 23.08933376373672 82.59356374779455
+ en 686460.7786166036 2281282.445406324
+ ll2 23.089333763736725 82.59356374779455
EPSG:5243
ll 16.955332416378873 -58.24036143859171
- en -7353312.672098567 -271729.27517943835
- ll2 16.955332416378873 -58.240361438591734
+ en -7353312.672098569 -271729.27517943695
+ ll2 16.955332416378873 -58.24036143859173
EPSG:5246
ll -75.54081389844583 57.493976912178425
en 57.49397691217844 -75.54081389890175
@@ -14279,35 +14279,35 @@ EPSG:5246
EPSG:5247
ll 5.117971000931756 112.73944950832504
en 339418.2022298416 566060.6133440748
- ll2 5.117971000931317 112.73944950832504
+ ll2 5.117971000931315 112.73944950832504
EPSG:5252
ll 35.00208021493492 160.11714946399684
en 160.1171494639968 35.002080215821806
- ll2 35.002080214934914 160.11714946399684
+ ll2 35.00208021493493 160.11714946399684
EPSG:5253
ll -70.6275128816441 36.20650698229444
en 839826.8998917998 -7864814.153183572
- ll2 -70.62751286431156 36.20650657487563
+ ll2 -70.62751286431156 36.206506574875625
EPSG:5254
ll 87.89790729113986 30.414727951232774
- en 501699.1007014817 9767181.839104772
- ll2 87.89790729114006 30.414727951232774
+ en 501699.1007014817 9767181.839104773
+ ll2 87.89790729114009 30.41472795123278
EPSG:5255
ll 41.46211678981683 28.315830960074223
- en 108607.76069054398 4602501.179251663
- ll2 41.46211678904543 28.3158309597864
+ en 108607.76069054398 4602501.179251664
+ ll2 41.462116789045425 28.3158309597864
EPSG:5256
ll 2.4270485828913024 29.059833391114907
- en -273787.86932506424 270362.7383776519
+ en -273787.86932506436 270362.7383776519
ll2 2.427048582529678 29.059833405481506
EPSG:5257
ll 71.63311998901409 39.74180841142757
en 526098.5037078209 7951351.720558949
- ll2 71.63311998901503 39.74180841142757
+ ll2 71.63311998901501 39.74180841142758
EPSG:5258
ll -37.80960209970766 36.39898892202588
- en 6583.878028623236 -4201176.411834388
- ll2 -37.80960209789075 36.39898892115628
+ en 6583.878028622654 -4201176.411834388
+ ll2 -37.809602097890746 36.398988921156274
EPSG:5259
ll 25.19048064157728 40.054629105639506
en 1139.156868670194 2796333.1515041026
@@ -14322,140 +14322,144 @@ EPSG:5266
ll2 -51.0301732713539 95.62659538029145
EPSG:5269
ll 77.61361702107376 24.411779820301128
- en 9438018.324458523 8620064.739042288
- ll2 77.6136170210711 24.41177982030581
+ en 9438018.324458523 8620064.73904229
+ ll2 77.6136170210711 24.411779820305814
EPSG:5270
ll -46.40138051989058 33.16530262689453
en 1.0743409859531919E7 -5145573.045942357
- ll2 -46.401380519801315 33.16530262692716
+ ll2 -46.40138051980132 33.16530262692716
EPSG:5271
ll 56.47518117126853 28.957801979881268
en 1.1250979870637145E7 6268800.378595538
- ll2 56.47518117086835 28.95780198000268
+ ll2 56.47518117086836 28.957801980002678
EPSG:5272
ll -77.55886093316693 26.846540326976392
en 1.2280624735066703E7 -8629735.915008105
- ll2 -77.55886092955858 26.846540752478848
+ ll2 -77.55886092955859 26.846540752478848
EPSG:5273
ll 20.443116127005112 42.809676700706746
- en 1.3897767229259107E7 2266045.9610197325
- ll2 20.44311612696128 42.809676700735366
+ en 1.389776722925911E7 2266045.961019732
+ ll2 20.443116126961275 42.80967670073538
EPSG:5274
ll 55.831467002295255 33.490881279835804
- en 1.3967513081083711E7 6222612.385957794
- ll2 55.83146697003342 33.4908814152231
+ en 1.3967513081083711E7 6222612.385957795
+ ll2 55.83146697003344 33.49088141522311
EPSG:5275
ll -58.11092997414241 54.91678965300105
en 1.6083293484043773E7 -6486665.383099473
- ll2 -58.110929904690586 54.91678905607589
+ ll2 -58.11092990469058 54.91678905607589
EPSG:5292
ll -43.1257006474824 87.51204872073025
- en -12139.816384194768 -7281724.6947002
- ll2 -43.125700647393835 87.51204872067976
+ en -12139.816384195961 -7281724.694700199
+ ll2 -43.12570064739382 87.51204872067972
EPSG:5293
ll -38.39200551737743 91.78570432888978
en 445328.97277721483 -6753378.10083096
- ll2 -38.39200551736974 91.78570432889947
+ ll2 -38.392005517369725 91.78570432889948
EPSG:5294
ll 23.3943055464551 82.5242523006751
- en -500263.7362883452 107320.83824756742
- ll2 23.394305543256284 82.5242522970595
+ en -500263.7362883466 107320.83824756788
+ ll2 23.39430554325629 82.52425229705949
EPSG:5295
ll 17.3088288859542 83.47238546728912
en -448759.3745234085 -573573.9577710405
ll2 17.308828884747175 83.47238546843286
EPSG:5296
ll -10.459470298675697 96.17981134960249
- en 911303.5907522342 -3663011.1506237406
- ll2 -10.459470298176122 96.1798113460303
+ en 911303.5907522356 -3663011.1506237406
+ ll2 -10.459470298176125 96.17981134603032
EPSG:5297
ll 61.27464751951638 97.38806555310248
- en 585142.6413384494 4312163.039229073
- ll2 61.27464751495878 97.38806554321377
+ en 585142.6413384487 4312163.039229073
+ ll2 61.27464751495877 97.38806554321376
EPSG:5298
ll -59.89696665537397 100.00082902678243
- en 739790.2246408021 -9175109.154669913
- ll2 -59.89696662172423 100.0008288218792
+ en 739790.2246408022 -9175109.15466991
+ ll2 -59.89696662172422 100.00082882187915
EPSG:5299
ll -48.49068861107958 83.87975891152124
- en -154257.81017620862 -7887461.776978541
- ll2 -48.49068860861978 83.87975891257355
+ en -154257.81017620652 -7887461.77697854
+ ll2 -48.490688608619784 83.8797589125736
EPSG:5300
ll -59.2251421462457 99.43611790288381
- en 710981.0427149807 -9095768.639912378
+ en 710981.0427149814 -9095768.639912378
ll2 -59.225142124235816 99.43611780692015
+EPSG:53008
+ ll 58.982194186686854 -88.06214048573408
+ en -5045893.591670716 6558520.755923763
+ ll2 58.98219418668685 -88.06214048573406
EPSG:5301
ll 38.67590781236038 85.82641867718482
- en -100196.40677721536 1790216.8948758058
- ll2 38.67590781209365 85.82641867697234
+ en -100196.40677721298 1790216.8948758058
+ ll2 38.67590781209365 85.82641867697237
EPSG:5302
ll -31.606909554271425 95.3837131367602
- en 612336.6663195414 -6004596.4915068215
- ll2 -31.606909554154477 95.38371313695332
+ en 612336.6663195428 -6004596.491506822
+ ll2 -31.606909554154495 95.38371313695333
EPSG:5303
ll 59.74559228260094 92.1133124256515
- en 421266.6490854713 4129663.8946155636
- ll2 59.74559228253459 92.11331242564283
+ en 421266.64908547123 4129663.8946155645
+ ll2 59.7455922825346 92.11331242564283
EPSG:5304
ll -53.381347773638 97.62006562289469
- en 738936.2010254953 -8442302.544809936
- ll2 -53.38134775919161 97.62006559144845
+ en 738936.201025496 -8442302.544809936
+ ll2 -53.381347759191605 97.62006559144847
EPSG:5305
ll -51.4863618391636 89.04382667659078
- en 214840.67535858403 -8206316.423026678
- ll2 -51.486361839163806 89.04382667659077
+ en 214840.67535858502 -8206316.423026679
+ ll2 -51.48636183916381 89.04382667659078
EPSG:5306
ll -65.4348507487311 82.25281269516515
en -189413.37091853592 -9793047.343734888
ll2 -65.43485071249286 82.25281318454125
EPSG:5307
ll -16.997122351575527 92.41951834806022
- en 454436.5483767452 -4380990.024807616
- ll2 -16.997122351575015 92.41951834805765
+ en 454436.5483767467 -4380990.024807616
+ ll2 -16.99712235157501 92.41951834805766
EPSG:5308
ll -1.4370074296203654 97.33145245866892
- en 1049428.818317463 -2660154.88445598
- ll2 -1.4370074293509896 97.33145244065969
+ en 1049428.818317466 -2660154.88445598
+ ll2 -1.43700742935099 97.33145244065975
EPSG:5309
ll 10.262952288897566 98.08250962421218
en 1125320.743959195 -1354166.9280885975
- ll2 10.26295228553271 98.08250960090831
+ ll2 10.262952285532712 98.08250960090834
EPSG:5310
ll 0.5456762757764864 97.47604105426441
en 908975.9463060292 -2439337.7035735515
- ll2 0.545676275749413 97.47604104901751
+ ll2 0.545676275749413 97.4760410490175
EPSG:5311
ll 40.187057323551244 96.66928053548243
- en 744294.9369719694 1966480.759356455
- ll2 40.187057320972514 96.66928053582235
+ en 744294.9369719682 1966480.759356455
+ ll2 40.187057320972514 96.66928053582232
EPSG:5316
ll 20.470976476746415 0.3348112093663431
- en 966848.7309296273 -3718267.7252755184
+ en 966848.7309296274 -3718267.7252755184
ll2 20.470976473925575 0.33481121040568596
EPSG:5318
ll 81.70617497035016 -3.828484027971033
- en 251070.11283435518 3077032.350255139
- ll2 81.70617497034696 -3.828484028001364
+ en 251070.1128343551 3077032.350255139
+ ll2 81.70617497034696 -3.8284840280013688
EPSG:5320
ll 69.5093537625584 -113.68722387769542
en -213432.42887353804 8643067.769854201
ll2 69.5093537625584 -113.68722387769542
EPSG:5321
ll -1.0563001875892812 -11.852415726092232
- en 1.059245816196014E7 4824028.587652997
- ll2 -1.056300187589258 -11.852415726092246
+ en 1.0592458161960142E7 4824028.587652997
+ ll2 -1.056300187589258 -11.852415726092232
EPSG:5324
ll 17.75714847073675 -38.92114542786058
- en -38.92114542786058 17.757148471285422
+ en -38.92114542786058 17.75714847128542
ll2 17.757148470736734 -38.92114542786059
EPSG:5325
ll 25.07816813970769 -7.402209063825694
- en 3110069.5559353866 -4317519.519979515
- ll2 25.078168139707362 -7.402209063825693
+ en 3110069.5559353856 -4317519.51997951
+ ll2 25.078168139707362 -7.402209063825692
EPSG:5329
ll -23.170901896645304 -57.605842799307936
en -1.4699694275369853E7 -1727381.2603731817
- ll2 -23.170902573741188 -57.605842740240085
+ ll2 -23.17090257374119 -57.60584274024006
EPSG:5330
ll 12.9779121381478 142.08163488900027
en 7460496.874071628 2343321.8977075103
@@ -14463,23 +14467,23 @@ EPSG:5330
EPSG:5331
ll -4.523931631753413 -57.62016766238983
en -1.4701037559979454E7 400716.72736424254
- ll2 -4.523931469991159 -57.620168125269096
+ ll2 -4.523931469991159 -57.62016812526913
EPSG:5337
ll -0.4402497156128504 -35.57669067759142
en 213033.45011595974 9951437.378902594
- ll2 -0.4402497237583825 -35.57669066968326
+ ll2 -0.44024972375838245 -35.57669066968326
EPSG:5340
ll -79.08373708697388 97.34020103203989
- en 97.34020103203987 -79.08373708732454
- ll2 -79.08373708697472 97.34020103203987
+ en 97.34020103203987 -79.08373708732455
+ ll2 -79.08373708697474 97.34020103203989
EPSG:5343
ll -21.09792182260685 -75.81186730649658
en 1103719.6235156215 7663297.216459169
- ll2 -21.097921822560725 -75.81186730654146
+ ll2 -21.09792182256072 -75.81186730654146
EPSG:5344
ll 62.77653758245239 -66.74464997079369
en 2615140.361987076 1.6967458701342095E7
- ll2 62.776537582443524 -66.744649970794
+ ll2 62.776537582443524 -66.74464997079401
EPSG:5345
ll -81.80853749130311 -69.92439539956493
en 3437597.027584568 912758.1314323223
@@ -14490,12 +14494,12 @@ EPSG:5346
ll2 74.32360939637154 -60.44567429544881
EPSG:5347
ll -25.619686807011377 -58.89768121758523
- en 5610718.867571223 7166803.620489343
- ll2 -25.619686807010982 -58.897681217585095
+ en 5610718.867571219 7166803.620489343
+ ll2 -25.619686807010982 -58.897681217585145
EPSG:5348
ll -57.91123887857013 -60.049080487356974
en 6319290.354814782 3576493.7105541755
- ll2 -57.91123887849913 -60.049080487351546
+ ll2 -57.911238878499134 -60.04908048735154
EPSG:5349
ll 48.2033666848742 -58.74450294548271
en 7147378.430113523 1.5353902323175032E7
@@ -14503,47 +14507,47 @@ EPSG:5349
EPSG:5354
ll -52.401659492822176 146.60559718290403
en 146.60559718290403 -52.40165949373383
- ll2 -52.40165949282242 146.60559718290406
+ ll2 -52.401659492822425 146.60559718290403
EPSG:5355
ll 43.079761306918954 -62.982006591609675
- en 501464.71457845694 1.4769672372585136E7
- ll2 43.07976130691904 -62.98200659160968
+ en 501464.7145784575 1.4769672372585136E7
+ ll2 43.07976130691903 -62.982006591609675
EPSG:5356
ll 18.391115929799824 -75.32289006928845
en -168961.7312261928 1.2045137369774789E7
- ll2 18.39111592881242 -75.32289006901429
+ ll2 18.39111592881243 -75.32289006901429
EPSG:5357
ll -5.450383118183225 -61.269550293318716
- en 26606.345743231883 9395873.002251858
- ll2 -5.4503831181540034 -61.269550292653356
+ en 26606.345743233396 9395873.002251858
+ ll2 -5.4503831181540034 -61.26955029265335
EPSG:5360
ll 33.000706415419785 150.4766469623891
- en 150.47664696238914 33.000706416282064
- ll2 33.00070641541978 150.47664696238914
+ en 150.47664696238917 33.00070641628207
+ ll2 33.000706415419785 150.47664696238917
EPSG:5361
ll 41.29067808838289 -75.94903158263119
- en -82033.53374543972 1.4594378080963302E7
- ll2 41.29067808050765 -75.9490315781707
+ en -82033.53374544089 1.4594378080963302E7
+ ll2 41.29067808050765 -75.94903157817072
EPSG:5362
ll 35.02079454397614 -69.88502603089968
en 966844.7632075367 1.3887326482028726E7
- ll2 35.02079454310271 -69.88502603004295
+ ll2 35.02079454310272 -69.88502603004295
EPSG:5365
ll 79.56137632671894 62.07245410548765
- en 62.07245410548763 79.56137632671935
- ll2 79.56137632671977 62.07245410548763
+ en 62.07245410548765 79.56137632671934
+ ll2 79.56137632671975 62.072454105487644
EPSG:5367
ll -50.01577478383219 -90.51606743413544
- en 33201.49035636161 -5562426.06693004
- ll2 -50.01577477676272 -90.51606742622047
+ en 33201.49035636074 -5562426.066930041
+ ll2 -50.01577477676274 -90.51606742622049
EPSG:5371
ll 34.34232118777322 17.399958201671012
en 17.399958201671012 34.34232118865248
ll2 34.34232118777324 17.39995820167101
EPSG:5373
ll -11.974607051657273 111.18903395181138
- en 111.1890339518114 -11.974607052040746
- ll2 -11.974607051657278 111.1890339518114
+ en 111.18903395181138 -11.974607052040744
+ ll2 -11.974607051657275 111.18903395181138
EPSG:5381
ll 32.499162936808986 -154.41541940947513
en -154.41541940947513 32.499162936808986
@@ -14551,107 +14555,111 @@ EPSG:5381
EPSG:5382
ll 55.15847159901966 -51.22486855196062
en 867752.3877568898 1.6127658943624686E7
- ll2 55.15847159558282 -51.22486855558038
+ ll2 55.158471595582824 -51.22486855558038
EPSG:5383
ll 55.965475530331474 -41.25535855365909
- en 1107187.8672131621 1.6245195103993276E7
- ll2 55.96547546309694 -41.25535902565448
+ en 1107187.8672131617 1.6245195103993276E7
+ ll2 55.96547546309694 -41.2553590256545
EPSG:5387
ll -13.50748738737002 -78.94673582411342
en 72593.66700247792 8503299.723894848
- ll2 -13.50748738733359 -78.9467358239165
+ ll2 -13.507487387333589 -78.9467358239165
EPSG:5389
ll -13.754949598337362 -77.6349142815801
- en -436640.3256286433 8462499.381592536
+ en -436640.3256286435 8462499.381592536
ll2 -13.75494959141761 -77.63491425455183
EPSG:5393
ll 15.817533616690696 97.06993788475137
en 97.06993788475137 15.817533617186132
- ll2 15.817533616690692 97.06993788475137
+ ll2 15.81753361669069 97.06993788475137
EPSG:5396
ll 85.45890672867552 -17.685723686358163
en 581976.2750976877 1.949762292860788E7
- ll2 85.45890672986054 -17.685724216225502
+ ll2 85.45890672986053 -17.685724216225502
+EPSG:54008
+ ll 58.982194186686854 -88.06214048573408
+ en -5064010.776136052 6540685.607089906
+ ll2 58.98219418668685 -88.06214048573408
EPSG:5451
ll -12.265890919772374 60.335531137524015
- en 60.33673178345977 -12.266270550047397
- ll2 -12.265890935354676 60.33553118649024
+ en 60.33673178345974 -12.266270550047402
+ ll2 -12.265890935354685 60.33553118649022
EPSG:5456
ll -7.058060078061928 -125.34359731362593
- en -4232283.15548889 -1388042.6316461316
- ll2 -7.058060088733528 -125.34359729499745
+ en -4232283.155488892 -1388042.6316461316
+ ll2 -7.0580600887335265 -125.34359729499748
EPSG:5457
ll 9.574848330505503 -120.12057395604873
- en -3495454.98245216 590709.9602773308
- ll2 9.574848302498367 -120.12057393082225
+ en -3495454.982452159 590709.9602773364
+ ll2 9.574848302498367 -120.12057393082222
EPSG:5459
ll 53.3919350902027 -13.495821342647247
en 7030305.87749283 6118474.828172098
- ll2 53.39193505585341 -13.495821323757733
+ ll2 53.391935055853416 -13.495821323757733
EPSG:5460
ll 42.88579614836537 -104.56830167793106
- en -963861.945518957 3722289.1047923826
- ll2 42.88579608485463 -104.56830160675736
+ en -963861.9455189575 3722289.1047923826
+ ll2 42.885796084854654 -104.5683016067574
EPSG:5461
ll -38.4301385080049 -159.31323775652754
- en -9397901.106678436 -4832409.977980187
- ll2 -38.4301385051753 -159.3132377608382
+ en -9397901.10667844 -4832409.977980193
+ ll2 -38.43013850517535 -159.31323776083818
EPSG:5462
ll -36.303650809760185 -133.54113165048614
- en -5734691.15854078 -5209225.869847168
- ll2 -36.303650805659665 -133.54113163241485
+ en -5734691.158540781 -5209225.869847168
+ ll2 -36.30365080565965 -133.54113163241485
EPSG:5463
ll -53.6569739241917 -83.46783364471169
en 336986.841885718 -5948173.820346501
ll2 -53.65697392207875 -83.46783363745061
EPSG:5464
ll -60.37547591501232 -1.7161017029811774
- en -1.7161017029811771 -60.37547591501232
- ll2 -60.37547591501232 -1.7161017029811774
+ en -1.7161017029811771 -60.375475915012316
+ ll2 -60.375475915012316 -1.7161017029811771
EPSG:5467
ll 23.74156475630633 111.61161371957803
- en 111.61161371957802 23.74156475630633
- ll2 23.74156475630633 111.61161371957802
+ en 111.61161371957803 23.74156475630633
+ ll2 23.74156475630633 111.61161371957803
EPSG:5469
ll 2.1908727151704497 -69.51470674503652
en 1672960.5818818514 -379133.8329359005
ll2 2.1908727151705096 -69.51470674503652
EPSG:5479
ll -51.7300532029167 125.77596353050335
- en 4407396.797828676 7155149.770084359
- ll2 -51.73005320291688 125.77596353050335
+ en 4407396.797828688 7155149.770084353
+ ll2 -51.730053202916906 125.77596353050335
EPSG:5480
ll -38.41991102677649 103.35647538816578
- en -166523.04245054256 4280938.531146147
- ll2 -38.41991102677652 103.35647538816582
+ en -166523.04245054442 4280938.5311461445
+ ll2 -38.41991102677652 103.35647538816578
EPSG:5481
ll -57.74340380926751 158.42198453732902
- en 2538781.9254125194 2517516.8768033534
+ en 2538781.92541252 2517516.8768033558
ll2 -57.74340380926796 158.42198453732894
EPSG:5482
ll -84.67992269786018 38.63993839182492
- en 4630926.042841099 538329.4296840852
- ll2 -84.67992269786063 38.63993839182493
+ en 4630926.042841101 538329.4296840875
+ ll2 -84.67992269786068 38.63993839182493
EPSG:5489
ll -25.37275649979 0.9280345717344858
en 0.9280345717344858 -25.372756500520985
- ll2 -25.372756499789652 0.9280345717344858
+ ll2 -25.37275649978965 0.9280345717344858
EPSG:5490
ll 34.21918360282328 -56.71065528362763
- en 1079741.5084207193 3804395.8762096423
- ll2 34.21918360001538 -56.71065528160286
+ en 1079741.5084207202 3804395.8762096423
+ ll2 34.21918360001538 -56.71065528160284
EPSG:5518
ll -82.96719031336711 -172.50831913551306
en 404494.48527236294 -3694603.5264946735
- ll2 -82.96719030817904 -172.50831915525885
+ ll2 -82.96719030817904 -172.50831915525893
EPSG:5519
ll -30.143848048492778 -175.64972125132917
- en 431872.5507211428 2187408.183157394
- ll2 -30.143848051459074 -175.64972125290373
+ en 431872.55072114273 2187408.183157393
+ ll2 -30.14384805145908 -175.6497212529037
EPSG:5520
ll -43.74673670261651 -2.6216444523614246
en 1047211.9695343436 -4861225.871600116
- ll2 -43.74673621548805 -2.6216443448751905
+ ll2 -43.74673621548805 -2.6216443448751914
EPSG:5523
ll 18.781791461637738 16.969028388020053
en 2077060.264926738 7585569.7672887035
@@ -14659,23 +14667,23 @@ EPSG:5523
EPSG:5524
ll 63.185584889838 150.95006259152296
en 150.95006259152296 63.185584889838
- ll2 63.185584889838 150.95006259152296
+ ll2 63.185584889838005 150.95006259152296
EPSG:5527
ll 85.34789538362341 -121.66300531653917
- en -121.6564519689315 85.3482099982403
- ll2 85.3478953829804 -121.66300532993907
+ en -121.6564519689315 85.34820999824029
+ ll2 85.3478953829804 -121.66300532993905
EPSG:5531
ll -16.940271523444636 -52.15181913843679
- en 1016788.7916993671 8120712.931945052
- ll2 -16.940271523867455 -52.15181913927561
+ en 1016788.791699368 8120712.931945052
+ ll2 -16.94027152386745 -52.1518191392756
EPSG:5533
ll -1.757390652367917 -52.58790850704061
en -346391.3406738271 9804067.735604402
- ll2 -1.7573906529935786 -52.587908482148315
+ ll2 -1.7573906529935794 -52.587908482148315
EPSG:5534
ll 75.40355294007298 -43.58481056525512
en 371186.39169371664 1.837361210106218E7
- ll2 75.4035529414426 -43.584810571129836
+ ll2 75.40355294144258 -43.58481057112983
EPSG:5535
ll -4.156446302086209 -32.39553576149664
en 567120.3176109195 9540594.748502556
@@ -14690,48 +14698,48 @@ EPSG:5537
ll2 -6.524305558796541 -49.92222533353266
EPSG:5538
ll 70.43489695467991 -40.240952060512114
- en 677718.7365552536 1.782154137787181E7
+ en 677718.7365552537 1.782154137787181E7
ll2 70.43489695424283 -40.240952061547304
EPSG:5539
ll -58.31406527395925 -33.43245081945206
- en 825992.7209540233 3522681.250519257
- ll2 -58.31406527137207 -33.432450822494694
+ en 825992.7209540232 3522681.250519255
+ ll2 -58.314065271372094 -33.432450822494694
EPSG:5546
ll 86.08739145317188 141.26608165799888
en 141.26608165799888 86.08739145330027
- ll2 86.08739145317222 141.26608165799888
+ ll2 86.08739145317224 141.2660816579989
EPSG:5550
ll -71.42784534327221 149.79667682510023
- en 811724.0017396547 2052147.4358503912
- ll2 -71.42784533089299 149.79667655236224
+ en 811724.0017396542 2052147.4358503884
+ ll2 -71.427845330893 149.7966765523622
EPSG:5551
ll -1.1275773800516191 137.4119768933629
- en -571745.6574440147 9873591.316359887
- ll2 -1.12757737837479 137.41197702984812
+ en -571745.6574440114 9873591.316359887
+ ll2 -1.1275773783747898 137.41197702984812
EPSG:5552
ll 23.755159411745197 153.58875102196524
en 559995.9654910659 1.2627243884194463E7
- ll2 23.755159411744994 153.58875102196524
+ ll2 23.755159411744998 153.58875102196524
EPSG:5554
ll 68.75909148440255 0.361401506588205
en 393345.1485862054 7629789.659951814
- ll2 68.7590914843881 0.3614015065929265
+ ll2 68.7590914843881 0.36140150659292614
EPSG:5555
ll 86.75785428546419 7.5623349086656475
- en 490923.00948198064 9636099.243847715
- ll2 86.75785428546449 7.562334908665673
+ en 490923.0094819807 9636099.243847717
+ ll2 86.7578542854645 7.562334908665676
EPSG:5556
ll 68.79614865675265 18.069682593728057
- en 623861.9351671932 7634726.392279561
- ll2 68.7961486567156 18.069682593709054
+ en 623861.935167193 7634726.392279562
+ ll2 68.7961486567156 18.069682593709047
EPSG:5559
ll -17.61219936100603 -72.81437591553934
- en 2721954.0503085237 -3655516.969287246
- ll2 -17.6121993633157 -72.81437593131693
+ en 2721954.0503085274 -3655516.969287246
+ ll2 -17.6121993633157 -72.81437593131692
EPSG:5561
ll 72.12948008829815 175.5258963487313
- en 175.52166975401485 72.12927893183159
- ll2 72.12948008770464 175.52589633416892
+ en 175.52166975401505 72.12927893183159
+ ll2 72.12948008770465 175.52589633416923
EPSG:5562
ll -20.103717041500673 27.27520389954669
en 5157390.210935294 -2236198.4908843753
@@ -14739,94 +14747,94 @@ EPSG:5562
EPSG:5563
ll 72.55190609565861 28.78763405644424
en 5559977.708380036 8054738.108321009
- ll2 72.5519060949273 28.7876340691887
+ ll2 72.55190609492732 28.787634069188705
EPSG:5564
ll 12.60864672203806 27.436347739965512
- en 5894737.261278858 1400945.3551335393
- ll2 12.608646726060654 27.436347751152795
+ en 5894737.261278859 1400945.3551335393
+ ll2 12.608646726060652 27.43634775115281
EPSG:5565
ll 5.636628544773004 36.32554690518373
- en 7203706.765427004 624056.9321923343
- ll2 5.636628548297703 36.325546911893674
+ en 7203706.765427004 624056.9321923344
+ ll2 5.636628548297705 36.32554691189368
EPSG:5566
ll 36.6547786962397 26.517148276416837
- en 993649.8978166386 4072535.9103782065
+ en 993649.8978166383 4072535.9103782065
ll2 36.654778695830686 26.517148284220553
EPSG:5567
ll -37.00598005099798 32.845709069660785
- en 1020671.5719288227 -4113161.557301027
- ll2 -37.005980032840405 32.84570909690942
+ en 1020671.5719288234 -4113161.557301027
+ ll2 -37.00598003284039 32.84570909690942
EPSG:5568
ll 17.90641015955123 28.044473377801047
- en -25516.84435665002 1987726.3966420298
- ll2 17.906410162581725 28.04447338621141
+ en -25516.84435665002 1987726.3966420302
+ ll2 17.906410162581736 28.044473386211415
EPSG:5569
ll -71.6952850228739 37.37611248872698
- en 443169.65697372635 -7958931.814599397
- ll2 -71.6952850020902 37.376112582697836
+ en 443169.6569737261 -7958931.814599397
+ ll2 -71.69528500209022 37.37611258269783
EPSG:5589
ll -60.58780276022191 -81.19727692818095
en 1552240.7425508571 -2.7866458016165145E7
- ll2 -60.58780274715743 -81.19727697478201
+ ll2 -60.587802747157426 -81.19727697478201
EPSG:5593
ll -69.47976394911105 101.65065187557849
- en 101.6506518755785 -69.47976394973004
- ll2 -69.47976394911196 101.6506518755785
+ en 101.65065187557848 -69.47976394973003
+ ll2 -69.47976394911196 101.65065187557849
EPSG:5596
ll 44.04289551184351 11.01831511647505
- en 974751.794347003 4878636.857070036
- ll2 44.04289551184358 11.018315116475055
+ en 974751.7943470028 4878636.857070036
+ ll2 44.04289551184358 11.01831511647505
EPSG:5598
ll 66.98563351591454 10.05324887892809
en 944133.1486407308 7433326.109714046
- ll2 66.98563351591514 10.05324887892808
+ ll2 66.98563351591513 10.05324887892808
EPSG:5627
ll 84.98617685640215 4.308363704089661
- en 483584.54068346566 9438654.89945451
- ll2 84.98617685343353 4.308363750170094
+ en 483584.5406834657 9438654.899454512
+ ll2 84.98617685343358 4.30836375017009
EPSG:5628
ll 77.22702700232298 -63.34698762246322
- en -63.34698762246322 77.22702700272957
- ll2 77.22702700232388 -63.34698762246322
+ en -63.34698762246321 77.22702700272957
+ ll2 77.22702700232388 -63.34698762246321
EPSG:5629
ll 41.5623572825109 39.069716227755755
- en 5410.9064537050435 1.4618200628106236E7
- ll2 41.56235727936263 39.06971622795616
+ en 5410.906453705102 1.4618200628106236E7
+ ll2 41.56235727936262 39.06971622795616
EPSG:5631
ll 46.76000720794471 13.88906544930015
en 2873604.3052989524 5192337.0103015145
- ll2 46.76000720943184 13.889065463806803
+ ll2 46.76000720943183 13.889065463806801
EPSG:5632
ll 88.59195068562201 30.303197001894105
- en 4100444.8234785083 7345095.225093836
- ll2 88.59195068562225 30.30319700189411
+ en 4100444.8234785083 7345095.225093835
+ ll2 88.59195068562228 30.30319700189407
EPSG:5633
ll 32.10143683187792 -99.66468396965172
- en -2142969.481850708 7670026.090342333
- ll2 32.101436822321624 -99.66468396965169
+ en -2142969.481850708 7670026.090342334
+ ll2 32.10143682232161 -99.66468396965172
EPSG:5634
ll 44.73235142741427 43.761338436519054
- en 6507108.804053778 2601340.739292636
- ll2 44.732351427414365 43.76133843651906
+ en 6507108.804053778 2601340.7392926356
+ ll2 44.73235142741437 43.76133843651907
EPSG:5635
ll 13.8511931628463 -38.372594402366516
- en -875071.4496919811 633020.5706892838
- ll2 13.85119314420695 -38.372594402366516
+ en -875071.4496919811 633020.5706892847
+ ll2 13.85119314420695 -38.37259440236653
EPSG:5636
ll 82.16595216810498 -135.31921297760783
- en 3784001.435651803 8032209.811246303
- ll2 82.16595216315453 -135.3192129776078
+ en 3784001.4356518034 8032209.811246303
+ ll2 82.16595216315451 -135.31921297760783
EPSG:5637
ll -1.7906977289314252 20.152006290816047
- en 5565308.0616947375 -3620252.247669873
+ en 5565308.0616947375 -3620252.2476698747
ll2 -1.7906977289313901 20.152006290816054
EPSG:5638
ll 19.825020641428466 -15.645404488722676
en 1576211.9705871982 120318.8894550018
- ll2 19.8250206217897 -15.645404488722686
+ ll2 19.8250206217897 -15.645404488722685
EPSG:5639
ll 49.029161950629934 12.564236704801559
- en 4181126.435413616 2483990.525243229
+ en 4181126.435413616 2483990.5252432283
ll2 49.02916195063009 12.564236704801566
EPSG:5641
ll -49.93383931217301 40.41312972718575
@@ -14834,12 +14842,12 @@ EPSG:5641
ll2 -49.933839312161766 40.413129727185755
EPSG:5643
ll 41.66055483285982 31.866237633592732
- en 2643477.1710991524 -429585.6727790582
- ll2 41.66055483788907 31.866237636145886
+ en 2643477.1710991533 -429585.6727790561
+ ll2 41.6605548378891 31.866237636145893
EPSG:5644
ll -24.53888382244861 46.055143962480905
- en -1240.470127239474 7277111.423000288
- ll2 -24.538883822147625 46.05514396191038
+ en -1240.470127239474 7277111.423000287
+ ll2 -24.53888382214764 46.055143961910375
EPSG:5646
ll -85.93250062312842 -72.78297546692977
en 1633061.744066861 -4.6766083040482715E7
@@ -14854,44 +14862,44 @@ EPSG:5650
ll2 33.39852674932508 11.5032207538726
EPSG:5651
ll -1.6798441856474682 -3.7088438200141343
- en 3.0752072712474745E7 -186961.9038687647
- ll2 -1.679844185448634 -3.708843808354555
+ en 3.0752072712474745E7 -186961.90386876473
+ ll2 -1.6798441854486343 -3.708843808354555
EPSG:5652
ll 16.916470799902655 2.4221374692143036
en 3.1798231838615235E7 1882073.3100769173
- ll2 16.916470798692572 2.422137470661637
+ ll2 16.916470798692576 2.422137470661637
EPSG:5653
ll 58.578761076745536 5.4669369640459635
- en 3.2946804730881684E7 6532561.5224346435
- ll2 58.578761021094785 5.466937386407305
+ en 3.294680473088168E7 6532561.522434641
+ ll2 58.57876102109474 5.46693738640725
EPSG:5654
ll 73.10344656092116 -81.83178124013399
- en 650492.6583840216 1.1258309636005346E7
- ll2 73.10344654869438 -81.83178076106113
+ en 650492.6583840231 1.1258309636005344E7
+ ll2 73.10344654869438 -81.8317807610611
EPSG:5655
ll -17.573640000390995 -70.13973316608153
en 2462617.2541341055 -2.1825057511219185E7
- ll2 -17.573640000389137 -70.13973316608724
+ ll2 -17.57364000038913 -70.13973316608724
EPSG:5659
ll -69.53181409336078 5.847535599913199
en 377078.2431115787 -1.1716905143422704E7
- ll2 -69.53181407876774 5.847535613447822
+ ll2 -69.53181407876775 5.847535613447822
EPSG:5663
ll -55.36633749609651 20.30070050017393
- en 3836099.583022089 -6150869.427693339
- ll2 -55.36633748019021 20.30070055618906
+ en 3836099.583022089 -6150869.427693338
+ ll2 -55.366337480190204 20.300700556189064
EPSG:5664
ll 78.96293789863029 9.07479497658184
- en 2501722.7401972227 8769518.354765318
- ll2 78.96293789963856 9.074795008476775
+ en 2501722.740197223 8769518.354765322
+ ll2 78.9629378996386 9.074795008476798
EPSG:5665
ll 32.880594755595894 21.55856055358045
- en 4114425.9974272316 3658768.5787682733
- ll2 32.88059475599397 21.558560566341555
+ en 4114425.9974272316 3658768.5787682747
+ ll2 32.88059475599398 21.55856056634156
EPSG:5666
ll -37.02254156563309 16.153106431188302
en 4136902.150814373 -4122614.36653002
- ll2 -37.02254155839296 16.1531064301855
+ ll2 -37.02254155839295 16.1531064301855
EPSG:5667
ll 48.15517377742631 5.989647416854416
en 4052966.855622503 5352634.755041947
@@ -14903,63 +14911,63 @@ EPSG:5668
EPSG:5669
ll -84.68321938521251 17.125431634857563
en 5521989.450150874 -9407501.542226821
- ll2 -84.68321938521245 17.12543163485673
+ ll2 -84.68321938521244 17.12543163485673
EPSG:5670
ll 24.854994591168918 6.308972521283441
en 3228075.4126212588 2752798.8579638964
- ll2 24.854994600285032 6.308972541554814
+ ll2 24.854994600285035 6.308972541554813
EPSG:5671
ll 35.28919787791301 6.201529642780796
en 3972353.100879994 3922268.1807170846
- ll2 35.289197883091376 6.201529660587873
+ ll2 35.28919788309138 6.201529660587873
EPSG:5672
ll 42.03725291415344 24.96165310558608
- en 6325399.13990552 4704205.189145744
- ll2 42.03725285487694 24.96165285927653
+ en 6325399.139905521 4704205.189145744
+ ll2 42.03725285487694 24.96165285927654
EPSG:5673
ll 47.08722971553706 7.230540914335629
- en 3365765.117677828 5218611.461255646
- ll2 47.08722972042115 7.2305409294591305
+ en 3365765.117677828 5218611.461255647
+ ll2 47.08722972042118 7.2305409294591305
EPSG:5674
ll 80.84420586104412 2.681386160567523
en 4335212.777653301 8992843.434744328
- ll2 80.84420586249732 2.6813867136332274
+ ll2 80.84420586249732 2.6813867136332292
EPSG:5675
ll -44.7561321856825 19.463605000816703
- en 5853566.636539465 -4967571.812837857
+ en 5853566.636539465 -4967571.812837856
ll2 -44.75613217004616 19.46360503806417
EPSG:5676
ll 67.39498942704179 10.782401189852937
en 2705072.4277110132 7485866.651736904
- ll2 67.39498941170804 10.782401190999876
+ ll2 67.39498941170804 10.782401190999874
EPSG:5677
ll -23.806681834470467 0.44832321524302143
en 2626492.345768724 -2660646.161554266
- ll2 -23.806681570793984 0.4483232483007972
+ ll2 -23.806681570793984 0.44832324830079545
EPSG:5678
ll -78.94329102161608 14.094455958537853
- en 4544903.723821382 -8767646.193292469
- ll2 -78.94329018552648 14.094455458145644
+ en 4544903.723821382 -8767646.193292467
+ ll2 -78.94329018552645 14.09445545814564
EPSG:5679
ll -34.221532264947285 13.378965500377237
- en 5350777.220143852 -3789666.6062615947
- ll2 -34.22153189432699 13.378965457490484
+ en 5350777.220143852 -3789666.6062615956
+ ll2 -34.221531894327 13.378965457490485
EPSG:5680
ll 67.90862945406892 -3.8313582858020583
- en 1213658.967196511 7551081.324773222
- ll2 67.90862943159574 -3.831358241208211
+ en 1213658.967196511 7551081.324773223
+ ll2 67.90862943159576 -3.831358241208216
EPSG:5681
ll 69.28966046727211 45.867002808624534
- en 45.86700280862454 69.28966046727211
- ll2 69.28966046727211 45.86700280862454
+ en 45.867002808624534 69.28966046727211
+ ll2 69.28966046727211 45.867002808624534
EPSG:5682
ll -66.5554399951427 1.4458273355729325
- en 2297896.972954237 -7391366.936133214
- ll2 -66.55543999465138 1.445827336217124
+ en 2297896.972954237 -7391366.936133215
+ ll2 -66.5554399946514 1.4458273362171212
EPSG:5683
ll 25.304893146340206 1.4476012097666477
en 2738157.853601977 2821100.229885759
- ll2 25.30489314205676 1.447601204725765
+ ll2 25.304893142056756 1.447601204725765
EPSG:5684
ll 75.94946687692672 15.53873583650839
en 4595874.278548335 8434879.956629897
@@ -14970,116 +14978,116 @@ EPSG:5685
ll2 -64.91010818399745 24.42839292211302
EPSG:5698
ll -4.794672595375047 -56.88723310672615
- en -7887564.097869018 3591847.9769603577
- ll2 -4.79467259537501 -56.887233106726136
+ en -7887564.097869022 3591847.9769603596
+ ll2 -4.7946725953750216 -56.88723310672616
EPSG:5699
ll 3.8280625708096565 35.472770125119666
- en 5177683.433778626 2388284.762351404
- ll2 3.828062570809683 35.472770125119666
+ en 5177683.433778627 2388284.762351403
+ ll2 3.8280625708096707 35.47277012511966
EPSG:5700
ll -44.236624943484316 -171.9498449180283
- en 903293.2863668686 5089429.601243115
- ll2 -44.23662494212314 -171.94984491798172
+ en 903293.2863668574 5089429.601243117
+ ll2 -44.23662494212315 -171.9498449179819
EPSG:5707
ll 3.044263882259308 -39.97441273707527
en -5335817.158706661 -2778169.3127752664
- ll2 3.0442638666145556 -39.97441272879752
+ ll2 3.044263866614557 -39.97441272879752
EPSG:5708
ll -8.17673868459391 -30.65544104596875
en -5033313.875798092 -1128425.873572398
- ll2 -8.176738654362122 -30.655441056347687
+ ll2 -8.176738654362126 -30.655441056347687
EPSG:5825
ll 22.765399428278556 148.32298285107188
- en 129395.81015520683 7029025.069330881
+ en 129395.81015520392 7029025.069330881
ll2 22.765399408429776 148.32298282825263
EPSG:5832
ll -13.873205611456655 11.17784138870282
en 3060302.7479766374 -1540251.8895438616
- ll2 -13.87320561124018 11.177841387871803
+ ll2 -13.873205611240182 11.177841387871801
EPSG:5833
ll -66.17737574759148 3.0034094763924877
en 3229985.340948135 -7354780.635375311
ll2 -66.17737574500394 3.0034094840754237
EPSG:5834
ll -69.25331735771275 15.461791412830342
- en 4636832.321561694 -7688729.013967766
- ll2 -69.25331735763865 15.461791412773033
+ en 4636832.321561694 -7688729.013967768
+ ll2 -69.25331735763866 15.461791412773035
EPSG:5835
ll -46.162380802424714 17.013994299934545
- en 5655533.528448558 -5115587.680412693
- ll2 -46.16238080241881 17.013994299938282
+ en 5655533.528448558 -5115587.680412694
+ ll2 -46.162380802418824 17.013994299938282
EPSG:5836
ll -42.16210793601977 32.47447537777537
- en -39170.118393348064 -4688431.486667709
- ll2 -42.16210793033191 32.4744753801312
+ en -39170.118393348064 -4688431.486667711
+ ll2 -42.162107930331935 32.47447538013121
EPSG:5837
ll -57.68542305930945 64.12100023631032
- en 924131.5220752677 -6416008.075552026
- ll2 -57.68542304815098 64.12100020784183
+ en 924131.5220752668 -6416008.075552026
+ ll2 -57.68542304815098 64.12100020784182
EPSG:5839
ll 81.7155938648105 -85.8536349275606
- en 422013.5497491356 1.9076352422974825E7
- ll2 81.71559386476441 -85.85363492615227
+ en 422013.54974913574 1.9076352422974825E7
+ ll2 81.7155938647644 -85.85363492615227
EPSG:5842
ll -18.08130236997279 18.798569003264515
en 1220759.0152155273 7987503.1410019575
ll2 -18.081302368401623 18.798569002404488
EPSG:5844
ll -68.87894738562699 20.80524155622353
- en 131307.90362047584 2329171.428632031
+ en 131307.90362047596 2329171.428632031
ll2 -68.87894736396342 20.805241946761697
EPSG:5845
ll -59.49784333893305 11.989125736804596
- en 329559.94301332324 -6599349.179053531
- ll2 -59.49784333887068 11.989125736811754
+ en 329559.9430133231 -6599349.179053531
+ ll2 -59.49784333887068 11.989125736811753
EPSG:5846
ll -35.82700397741889 11.529947187056749
- en 107525.78353451207 -3966449.466088161
- ll2 -35.82700397741889 11.52994718705675
+ en 107525.7835345119 -3966449.466088161
+ ll2 -35.82700397741889 11.529947187056749
EPSG:5847
ll -20.3866012926446 14.602373646508665
en 265081.35502175585 -2255551.302407156
- ll2 -20.386601292644524 14.602373646508623
+ ll2 -20.386601292644535 14.602373646508617
EPSG:5848
ll 83.0228450815211 9.920751849221377
- en 81176.4282487012 9225728.397729063
- ll2 83.02284508148641 9.92075185136308
+ en 81176.42824870095 9225728.39772906
+ ll2 83.02284508148638 9.92075185136309
EPSG:5849
ll 30.505958589155057 20.6621663506131
en 549710.6913311289 3383580.2964964504
- ll2 30.50595858897757 20.662166350922643
+ ll2 30.505958588977574 20.662166350922643
EPSG:5850
ll 40.3335578086446 19.74593207174361
- en 298367.6726997961 4468029.925279526
- ll2 40.33355780864267 19.74593207174609
+ en 298367.6726997964 4468029.925279526
+ ll2 40.33355780864267 19.745932071746093
EPSG:5851
ll 36.026397841730656 6.5081157544744475
en -548460.9404148088 4016324.758515319
- ll2 36.02639783102671 6.508115758479769
+ ll2 36.02639783102671 6.508115758479768
EPSG:5852
ll -0.12244568702239178 24.72492917271516
- en 1153221.1936603046 -13708.316159459751
+ en 1153221.1936603056 -13708.316159459751
ll2 -0.12244568690876033 24.724929087397047
EPSG:5853
ll -75.25089210341852 24.572083304634294
- en 357670.7770037891 -8367794.181193284
- ll2 -75.25089210090658 24.57208325018561
+ en 357670.7770037892 -8367794.181193284
+ ll2 -75.2508921009066 24.572083250185617
EPSG:5854
ll 24.35013111095988 18.134257979531405
- en 87517.03361610851 2694207.8752562557
- ll2 24.350131110959644 18.134257979531395
+ en 87517.03361610888 2694207.8752562557
+ ll2 24.350131110959637 18.1342579795314
EPSG:5855
ll 2.3390474865263826 27.987965569320423
en 1013310.799156554 261030.23652423458
ll2 2.3390474857781514 27.9879655395452
EPSG:5856
ll -25.079600575894787 20.973086586310103
- en 71619.57643655117 -2775097.0624685087
- ll2 -25.079600575894464 20.973086586310092
+ en 71619.57643655117 -2775097.0624685097
+ ll2 -25.079600575894474 20.973086586310085
EPSG:5857
ll 74.36183252984907 19.65649199629678
- en 41892.381923232795 8258974.304590817
- ll2 74.3618325298027 19.656491996384016
+ en 41892.38192323284 8258974.3045908185
+ ll2 74.36183252980274 19.656491996384016
EPSG:5858
ll 19.09262667427403 -55.648772130343794
en 10615.95945342118 1.2117610141775709E7
@@ -15091,90 +15099,90 @@ EPSG:5875
EPSG:5876
ll 76.12664896865695 -77.18697749542889
en 281592.00615776127 1.8464511777885936E7
- ll2 76.12664896525678 -77.18697735144924
+ ll2 76.12664896525676 -77.18697735144924
EPSG:5877
ll -56.38735709675776 -70.49446907055261
- en 37841.05798121414 3725600.9318547994
- ll2 -56.387357078896386 -70.49446902113252
+ en 37841.05798121414 3725600.9318547985
+ ll2 -56.38735707889641 -70.49446902113253
EPSG:5879
ll 22.566803315343634 47.986412234233754
- en 806882.4453636862 1.249885474703648E7
- ll2 22.566803279012223 47.9864122851832
+ en 806882.4453636861 1.2498854747036481E7
+ ll2 22.566803279012234 47.98641228518319
EPSG:5886
ll -17.276046659037803 173.56631544356082
- en 173.5663154435608 -17.2760466590378
- ll2 -17.2760466590378 173.5663154435608
+ en 173.56631544356082 -17.276046659037803
+ ll2 -17.276046659037803 173.56631544356082
EPSG:5887
ll -5.645406415032554 -169.43928184792176
- en 2339674.3498655306 4370518.714316465
- ll2 -5.645406413572549 -169.43928187071148
+ en 2339674.34986553 4370518.714316466
+ ll2 -5.645406413572541 -169.43928187071148
EPSG:5890
ll 66.04209911338945 -69.0757615108255
en -940085.3433753065 2458718.609666341
- ll2 66.04209911338923 -69.07576151082549
+ ll2 66.04209911338924 -69.07576151082549
EPSG:5921
ll 40.52892841240194 -154.16146545728856
- en -3918318.7169954143 -3276386.4398714826
+ en -3918318.7169954195 -3276386.439871484
ll2 40.528928412401974 -154.16146545728856
EPSG:5922
ll 31.030399128486827 -9.124598226672305
- en 3486339.462955707 -5179015.2026113225
- ll2 31.03039912848683 -9.124598226672308
+ en 3486339.4629557114 -5179015.202611327
+ ll2 31.030399128486806 -9.124598226672308
EPSG:5923
ll 24.41058402573499 -0.40915379523023887
- en -4383203.71150208 -5767979.575060641
- ll2 24.410584025735 -0.40915379523023176
+ en -4383203.711502085 -5767979.575060644
+ ll2 24.410584025735016 -0.40915379523023887
EPSG:5924
ll 65.15114712280042 164.75637341923564
- en 2395878.8361672736 -460727.61800920777
+ en 2395878.836167275 -460727.6180092065
ll2 65.1511471228004 164.75637341923564
EPSG:5925
ll 73.20594193766 172.33728481641313
- en -151127.84253723032 -899751.5009666046
- ll2 73.20594193766003 172.33728481641313
+ en -151127.8425372304 -899751.5009666047
+ ll2 73.20594193766001 172.33728481641313
EPSG:5926
ll 15.123512063973234 -95.97757613162639
- en 2301865.376784909 -7047295.785748873
- ll2 15.123512063973253 -95.97757613162639
+ en 2301865.376784906 -7047295.785748869
+ ll2 15.123512063973251 -95.97757613162639
EPSG:5927
ll 61.96296689843804 36.391873936732026
- en 3031358.8113326905 956496.8895768857
+ en 3031358.811332688 956496.8895768839
ll2 61.96296689843801 36.391873936732026
EPSG:5928
ll 49.45248418853398 105.49451703180665
- en 4332906.808800577 302259.19043354725
- ll2 49.452484188534 105.49451703180665
+ en 4332906.808800575 302259.1904335455
+ ll2 49.45248418853397 105.49451703180667
EPSG:5929
ll 82.0607455737557 30.02223353439975
- en -888732.9135058661 1639382.3955028737
- ll2 82.0607455737557 30.02223353439973
+ en -888732.9135058665 1639382.3955028735
+ ll2 82.06074557375571 30.02223353439973
EPSG:5930
ll 65.77715381458079 154.75110688487973
- en -1000659.738523053 -635055.9323158388
+ en -1000659.7385230525 -635055.9323158391
ll2 65.77715381458076 154.75110688487973
EPSG:5931
ll 12.490035529860474 -69.40225060450484
- en 5819948.597623877 -4560210.191334999
- ll2 12.49003552986051 -69.40225060450484
+ en 5819948.597623877 -4560210.191335002
+ ll2 12.490035529860497 -69.40225060450486
EPSG:5932
ll 33.15122133556142 -11.176586596986184
- en 2841788.8780497015 -3067505.989097404
- ll2 33.15122133556164 -11.176586596986184
+ en 2841788.878049701 -3067505.989097403
+ ll2 33.151221335561644 -11.176586596986184
EPSG:5933
ll 10.115739183374147 87.12670185963691
- en 7467016.062623864 -3507682.448390976
- ll2 10.11573918337417 87.12670185963691
+ en 7467016.062623862 -3507682.4483909784
+ ll2 10.115739183374158 87.12670185963691
EPSG:5934
ll 17.70625200839562 41.44972201392367
- en -7378833.685626651 -1713490.5519744053
- ll2 17.70625200839563 41.44972201392367
+ en -7378833.685626649 -1713490.5519744065
+ ll2 17.706252008395627 41.449722013923655
EPSG:5935
ll 20.54433938538454 117.3865226341916
- en -6746718.35363274 -1927321.1293965797
+ en -6746718.353632738 -1927321.1293965806
ll2 20.544339385384543 117.3865226341916
EPSG:5936
ll -7.617997864501135 -73.39529156662769
- en 1.6034763632097548E7 -1342333.5448625307
+ en 1.6034763632097552E7 -1342333.544862527
ll2 -7.617997864500502 -73.39529156662769
EPSG:5937
ll 40.116601431432585 -5.977445286606297
@@ -15183,31 +15191,31 @@ EPSG:5937
EPSG:5938
ll 41.74899088819822 4.7117069828731815
en 5477455.142102011 -2497401.702663985
- ll2 41.74899088819807 4.711706982873189
+ ll2 41.748990888198065 4.711706982873189
EPSG:5939
ll 6.625520125212645 108.53414456579492
- en 1.326259955743121E7 2104999.54251288
- ll2 6.625520125212093 108.53414456579492
+ en 1.3262599557431208E7 2104999.54251288
+ ll2 6.6255201252121045 108.53414456579492
EPSG:5940
ll 67.16597966436889 -11.317200785908796
- en -301709.2745072837 3138435.488250934
- ll2 67.16597966436873 -11.317200785908824
+ en -301709.27450728463 3138435.488250933
+ ll2 67.16597966436873 -11.31720078590881
EPSG:5942
ll 31.47253249231747 153.5274184466915
- en 153.5274184466915 31.472532493157157
- ll2 31.472532492315548 153.52741844669154
+ en 153.5274184466915 31.472532493157168
+ ll2 31.472532492315562 153.5274184466915
EPSG:5945
ll -79.2880811493931 9.286184409257874
- en 178541.34608726582 -1.4239482305006394E7
- ll2 -79.28808114937071 9.286184409110923
+ en 178541.34608726593 -1.4239482305006394E7
+ ll2 -79.2880811493707 9.286184409110929
EPSG:5946
ll 29.548536389070293 9.396779236010225
- en 380817.7663193324 -2157710.6413674764
- ll2 29.548536389050955 9.396779236047589
+ en 380817.76631933264 -2157710.6413674774
+ ll2 29.548536389050945 9.39677923604759
EPSG:5947
ll 69.90906071210239 8.446720025141365
en 136308.18093668515 2327834.4585460583
- ll2 69.90906071210328 8.446720025141362
+ ll2 69.90906071210328 8.446720025141364
EPSG:5948
ll -6.693634283323746 4.965097753295133
en -291082.0737673939 -6172867.695140728
@@ -15218,155 +15226,155 @@ EPSG:5949
ll2 -46.19949622245976 0.2438130043592537
EPSG:5950
ll -49.74595218850206 15.042639700878283
- en 427344.4559175763 -1.0953785970970226E7
+ en 427344.45591757627 -1.0953785970970226E7
ll2 -49.745952187673666 15.042639700751323
EPSG:5951
ll -83.17880336142511 5.15885511890524
- en 16048.917303071954 -1.4676015644877004E7
- ll2 -83.17880336133041 5.158855134850373
+ en 16048.917303071968 -1.4676015644877004E7
+ ll2 -83.17880336133042 5.158855134850373
EPSG:5952
ll 1.8508681599052892 10.346336165200729
en -139677.22683390186 -5226478.009825758
- ll2 1.8508681599051509 10.346336165218695
+ ll2 1.850868159905151 10.346336165218691
EPSG:5953
ll 65.67887310010155 19.49623315657928
- en 375343.57110316324 1868894.5305943922
- ll2 65.67887309740262 19.496233148985656
+ en 375343.5711031632 1868894.5305943922
+ ll2 65.67887309740262 19.49623314898565
EPSG:5954
ll -65.81602113098015 7.7654468751592525
- en -207510.00363404816 -1.2750118751097837E7
- ll2 -65.81602112571767 7.765446896938446
+ en -207510.00363404822 -1.2750118751097837E7
+ ll2 -65.81602112571768 7.765446896938444
EPSG:5955
ll -7.649851570287993 25.198476218471864
- en 1175080.3967734466 -6289410.118842808
- ll2 -7.649851559303861 25.198476099257995
+ en 1175080.3967734461 -6289410.118842808
+ ll2 -7.64985155930386 25.198476099257984
EPSG:5956
ll -51.91118038116254 20.88350411884074
- en 401575.5205857589 -1.1193831081386128E7
+ en 401575.5205857586 -1.1193831081386128E7
ll2 -51.91118038048334 20.88350411869688
EPSG:5957
ll 76.71849748256821 9.17818273931827
en -112829.11270028393 3102556.732471809
- ll2 76.71849747918453 9.178182916457128
+ ll2 76.71849747918455 9.17818291645713
EPSG:5958
ll -30.924674808139677 15.210211670233567
en -214517.62327767123 -8858549.287632663
- ll2 -30.924674808093727 15.210211670151821
+ ll2 -30.924674808093723 15.210211670151821
EPSG:5959
ll 17.350860286156106 23.690759665136255
- en 545746.8611337991 -3507277.702005948
- ll2 17.350860286090334 23.69075966505355
+ en 545746.8611337992 -3507277.702005948
+ ll2 17.350860286090338 23.690759665053548
EPSG:5960
ll -18.652369212208157 28.875852262911017
en 986254.4569425441 -7515294.782674989
ll2 -18.652369205867963 28.875852257237945
EPSG:5961
ll 40.64779597833373 22.885321935406388
- en 217174.29240696266 -928898.9701179687
- ll2 40.647795978333264 22.885321935407138
+ en 217174.29240696237 -928898.9701179687
+ ll2 40.647795978333264 22.88532193540713
EPSG:5962
ll -45.24424931654621 15.966553602978077
en -412938.36519815616 -1.0464184126722556E7
ll2 -45.24424931007573 15.966553607620655
EPSG:5963
ll -69.03448801114718 24.909343341222907
- en 156295.5743977498 -1.309320147123161E7
- ll2 -69.03448801114772 24.9093433412229
+ en 156295.5743977499 -1.309320147123161E7
+ ll2 -69.03448801114772 24.909343341222907
EPSG:5964
ll -41.30642482405967 26.729540416454576
- en 286717.50682824245 -1.0008285188766904E7
- ll2 -41.30642482405071 26.729540416463184
+ en 286717.50682824245 -1.0008285188766906E7
+ ll2 -41.30642482405074 26.729540416463184
EPSG:5965
ll 27.29629165257535 33.805966126058706
- en 923917.2505232176 -2383308.490529596
- ll2 27.296291643996216 33.805966131615286
+ en 923917.2505232178 -2383308.490529596
+ ll2 27.296291643996216 33.80596613161531
EPSG:5966
ll -17.24183817263132 16.55327496801263
en -962249.2556700862 -7365882.686646973
- ll2 -17.241838153265164 16.553275018104646
+ ll2 -17.24183815326517 16.553275018104646
EPSG:5967
ll -74.29285394139816 30.93113169325991
- en 203671.5273442667 -1.3682281524511226E7
- ll2 -74.29285394136282 30.93113169320243
+ en 203671.52734426683 -1.3682281524511226E7
+ ll2 -74.29285394136284 30.93113169320244
EPSG:5968
ll 30.411250394111335 33.928177855917546
- en 621954.786137488 -2053040.3344975617
- ll2 30.411250393246654 33.92817785725089
+ en 621954.7861374881 -2053040.3344975617
+ ll2 30.41125039324666 33.928177857250894
EPSG:5969
ll -89.0252172352033 31.730992073215425
en 104238.2048079075 -1.532445365353099E7
ll2 -89.02521723520341 31.730992073214118
EPSG:5970
ll 78.93456542413938 36.51939696597984
- en 228804.49824597684 3341541.5582180596
- ll2 78.93456542376718 36.519396956355514
+ en 228804.4982459767 3341541.558218061
+ ll2 78.9345654237672 36.51939695635551
EPSG:5971
ll 35.71835451660661 11.958335520202269
en 1311307.8988214112 3989915.5563521255
- ll2 35.71835449299167 11.958335485119077
+ ll2 35.71835449299168 11.958335485119076
EPSG:5972
ll -73.35365039303139 0.5338787991456515
- en 230122.92874621792 -8159074.895471782
- ll2 -73.35365038552625 0.5338789973853971
+ en 230122.92874621827 -8159074.895471785
+ ll2 -73.35365038552631 0.5338789973853936
EPSG:5973
ll 70.81956052219482 24.270043728836452
en 838753.2206784878 7883224.118231294
- ll2 70.81956050478625 24.270043293689536
+ ll2 70.81956050478622 24.270043293689536
EPSG:5974
ll 56.647305641370366 23.239768833153356
- en 637331.9025048506 6280369.361081954
- ll2 56.64730564135911 23.23976883315472
+ en 637331.9025048504 6280369.361081955
+ ll2 56.647305641359125 23.239768833154717
EPSG:5975
ll 27.03313806083102 25.635875695537102
- en 364690.2892865016 2990837.785520998
- ll2 27.0331380608303 25.635875695536644
+ en 364690.28928650194 2990837.785520998
+ ll2 27.033138060830296 25.635875695536647
EPSG:5976
ll -44.71009491667402 25.796961901251333
- en -70579.30015782802 -4976046.043348276
- ll2 -44.7100949054472 25.796961913728154
+ en -70579.30015782814 -4976046.043348275
+ ll2 -44.7100949054472 25.796961913728158
EPSG:6050
ll 55.19615952409699 -88.63161722952866
- en 2.2104039689892665E7 -74972.87049223925
- ll2 55.19615952409747 -88.63161722952867
+ en 2.2104039689892665E7 -74972.87049224018
+ ll2 55.19615952409748 -88.63161722952864
EPSG:6051
ll 52.93756215368339 -115.89120526193574
- en 1.4713766345692914E7 1486252.345755726
- ll2 52.93756215368365 -115.89120526193575
+ en 1.4713766345692914E7 1486252.345755727
+ ll2 52.93756215368366 -115.89120526193578
EPSG:6052
ll 64.31052702377848 57.63428683787467
- en 2.3203174175714094E7 2352846.254943147
- ll2 64.31052702377919 57.63428683787469
+ en 2.3203174175714094E7 2352846.2549431464
+ ll2 64.31052702377919 57.63428683787467
EPSG:6053
ll 24.989674266201718 -26.904447990965565
- en 3.471909846355172E7 -1167633.5147878248
- ll2 24.989674266201437 -26.904447990965572
+ en 3.471909846355172E7 -1167633.514787823
+ ll2 24.989674266201433 -26.90444799096557
EPSG:6054
ll 23.011730645393577 -25.49380085805943
- en 3.3380477828351334E7 -3212200.581253832
+ en 3.3380477828351334E7 -3212200.5812538303
ll2 23.01173064539343 -25.49380085805945
EPSG:6055
ll 87.63127804457409 18.326618585340285
- en 3.3628314289955825E7 4533611.7145936005
- ll2 87.63127804457436 18.326618585340103
+ en 3.3628314289955825E7 4533611.714593601
+ ll2 87.63127804457436 18.32661858534003
EPSG:6056
ll 55.59825694221574 -100.2769065495558
- en 1.825223381255609E7 2971878.0844607134
- ll2 55.59825694221616 -100.27690654955582
+ en 1.825223381255609E7 2971878.0844607158
+ ll2 55.59825694221618 -100.2769065495558
EPSG:6057
ll 52.86805277498461 -40.85923213210822
- en 2.236723302325277E7 1942860.504853326
- ll2 52.86805277498487 -40.85923213210823
+ en 2.236723302325277E7 1942860.5048533278
+ ll2 52.8680527749849 -40.85923213210823
EPSG:6058
ll 87.41794515103868 50.41719097405411
en 2.4774705926392153E7 6026090.019940466
- ll2 87.41794515103895 50.41719097405403
+ ll2 87.41794515103895 50.41719097405408
EPSG:6059
ll 31.79658920782081 -125.48714646669133
- en 3.5546172332967244E7 4190885.5115910573
- ll2 31.796589207819032 -125.48714646669133
+ en 3.5546172332967244E7 4190885.511591058
+ ll2 31.796589207819032 -125.4871464666913
EPSG:6060
ll 42.76174466985283 -88.67858757772336
- en 3.9687539218927205E7 3681601.4131409414
+ en 3.9687539218927205E7 3681601.413140942
ll2 42.761744669852916 -88.67858757772335
EPSG:6061
ll 32.919982052257815 -38.87302014310012
@@ -15375,51 +15383,51 @@ EPSG:6061
EPSG:6062
ll 9.612496738702367 -75.31311788178063
en 2.3392758725499824E7 -572920.9803786464
- ll2 9.612496738702394 -75.31311788178061
+ ll2 9.61249673870239 -75.31311788178061
EPSG:6063
ll 55.32966510816333 -30.87023718453129
en 2.8962053374748264E7 5026712.831099825
- ll2 55.329665108163795 -30.870237184531323
+ ll2 55.32966510816379 -30.870237184531312
EPSG:6064
ll 88.78276240937532 43.77093681342723
en 3.064762853114326E7 8907269.507380536
ll2 88.78276240937554 43.77093681342688
EPSG:6065
ll 71.81602093094142 -49.63329437136137
- en 1.1547934110641303E7 8222981.485108532
- ll2 71.81602093094236 -49.633294371361394
+ en 1.1547934110641304E7 8222981.48510853
+ ll2 71.81602093094237 -49.633294371361345
EPSG:6066
ll 83.98709947239739 35.469361669400286
- en 1.4216758408641657E7 1.0070605756134778E7
- ll2 83.98709947239793 35.46936166940035
+ en 1.4216758408641657E7 1.0070605756134776E7
+ ll2 83.98709947239793 35.469361669400314
EPSG:6067
ll 55.5496344918567 -73.47615325865078
- en 1.9161706314503036E7 8002164.215156752
- ll2 55.549634491857134 -73.47615325865077
+ en 1.9161706314503036E7 8002164.215156755
+ ll2 55.54963449185716 -73.4761532586508
EPSG:6068
ll 78.7009803130663 6.691714694117508
en 2.3437391952620517E7 1.0721608829811387E7
- ll2 78.70098031306715 6.691714694117528
+ ll2 78.70098031306718 6.691714694117522
EPSG:6069
ll 77.04965842372059 -2.471442781243695
- en 2.204423069305065E7 2013733.9554714896
- ll2 77.04965842372145 -2.471442781243759
+ en 2.2044230693050653E7 2013733.955471492
+ ll2 77.04965842372151 -2.471442781243649
EPSG:6070
ll 57.770073963999096 -56.58345144379988
- en 7954825.321039139 3898643.517493917
- ll2 57.770073963999536 -56.58345144379987
+ en 7954825.321039139 3898643.5174939185
+ ll2 57.770073963999536 -56.583451443799866
EPSG:6071
ll 75.74192432348941 45.80740719864451
en 2.7425529245135132E7 4830796.593765065
- ll2 75.74192432349037 45.80740719864447
+ ll2 75.7419243234904 45.807407198644476
EPSG:6072
ll 26.321493596619987 -29.986178439062734
- en 2.1753410425094735E7 2569315.3282955014
- ll2 26.32149359661953 -29.986178439062744
+ en 2.1753410425094735E7 2569315.328295498
+ ll2 26.32149359661953 -29.986178439062705
EPSG:6073
ll 26.02830230835749 -44.4442731259172
- en 5199884.728995615 3259599.8391350065
- ll2 26.028302308357087 -44.4442731259172
+ en 5199884.728995614 3259599.839135008
+ ll2 26.028302308357084 -44.44427312591723
EPSG:6074
ll 12.489542069649216 29.384508743964844
en 1.2758859392674984E7 -2078811.9765946781
@@ -15427,63 +15435,63 @@ EPSG:6074
EPSG:6075
ll 66.73735372108823 123.04255500992801
en 2.6949530795096338E7 2470171.0932461596
- ll2 66.73735372108821 123.04255500992801
+ ll2 66.73735372108823 123.04255500992801
EPSG:6076
ll 26.750930530191496 68.74301535249006
en 2.3355310625963543E7 -3662704.3877324015
ll2 26.750930530191496 68.74301535249006
EPSG:6077
ll 26.98257673783951 41.15644934535034
- en 1.209431196087021E7 -2709724.4249321455
- ll2 26.982576737839512 41.15644934535034
+ en 1.2094311960870206E7 -2709724.424932152
+ ll2 26.982576737839512 41.15644934535033
EPSG:6078
ll 52.478048546773636 154.45572887973424
- en 1.9522842390204452E7 3318759.435534632
+ en 1.9522842390204456E7 3318759.4355346384
ll2 52.47804854677364 154.45572887973424
EPSG:6079
ll 37.01042317033846 95.52134793099798
- en 1.5563793479765035E7 -1139315.8361393502
- ll2 37.01042317033858 95.52134793099796
+ en 1.5563793479765031E7 -1139315.8361393558
+ ll2 37.01042317033858 95.52134793099798
EPSG:6080
ll 65.82533571984742 86.99962908194706
- en 1.721850865047046E7 3288641.6829466694
- ll2 65.82533571984742 86.99962908194703
+ en 1.7218508650470458E7 3288641.6829466717
+ ll2 65.82533571984739 86.99962908194705
EPSG:6081
ll 81.55295995509758 25.280373446793377
en 2.9986716642415125E7 5337706.328597339
- ll2 81.55295995509755 25.280373446793313
+ ll2 81.55295995509755 25.28037344679334
EPSG:6082
ll 54.53797896786149 119.31658269002615
- en 3.4876579495777145E7 2911731.504164625
- ll2 54.5379789678615 119.31658269002612
+ en 3.4876579495777145E7 2911731.504164624
+ ll2 54.537978967861505 119.31658269002617
EPSG:6083
ll 29.197510462072852 162.60154430347748
- en 4.041438996777141E7 1992586.1339370827
+ en 4.0414389967771396E7 1992586.13393708
ll2 29.197510462072884 162.60154430347748
EPSG:6084
ll 64.81893958018196 52.439813852264635
- en 3.374466550882734E7 5434102.916837499
- ll2 64.81893958018196 52.43981385226465
+ en 3.374466550882734E7 5434102.916837494
+ ll2 64.81893958018196 52.43981385226466
EPSG:6085
ll 66.59658108172546 96.09377542681389
- en 3.6301188047379136E7 4688555.48566971
- ll2 66.59658108172545 96.09377542681393
+ en 3.6301188047379136E7 4688555.485669707
+ ll2 66.59658108172545 96.09377542681392
EPSG:6086
ll 57.06624498995436 109.44402294256909
- en 3.705110725844236E7 4727378.538494594
- ll2 57.06624498995438 109.44402294256912
+ en 3.705110725844236E7 4727378.538494591
+ ll2 57.066244989954384 109.44402294256909
EPSG:6087
ll 67.76092158898987 48.06134594000487
en 1.524893932079856E7 5036467.6735008955
ll2 67.76092158898989 48.06134594000487
EPSG:6088
ll 48.6158907974167 15.103386719233967
- en 1.3567259818745308E7 4924246.358566545
- ll2 48.615890797416725 15.103386719233974
+ en 1.3567259818745308E7 4924246.358566546
+ ll2 48.615890797416725 15.10338671923396
EPSG:6089
ll 84.55292857509467 93.67605411114475
- en 1.9485453142092023E7 6912987.372613119
- ll2 84.55292857509465 93.67605411114478
+ en 1.9485453142092023E7 6912987.372613127
+ ll2 84.5529285750947 93.67605411114477
EPSG:6090
ll 33.89853993930292 59.69101124239903
en 1.6213819758188281E7 3671802.86236202
@@ -15495,19 +15503,19 @@ EPSG:6091
EPSG:6092
ll 17.867033997040842 75.65370466804734
en 1.6851367118145593E7 5787938.801408399
- ll2 17.867033997040846 75.65370466804734
+ ll2 17.86703399704085 75.65370466804734
EPSG:6093
ll 61.85709227533155 136.4568878173119
en 2.54144104326124E7 5129929.154693442
- ll2 61.85709227533151 136.4568878173119
+ ll2 61.8570922753315 136.4568878173119
EPSG:6094
ll 20.63022577568089 -101.19989825986707
- en 3.669649873195236E7 3213572.056839367
- ll2 20.630225775680827 -101.19989825986701
+ en 3.6696498731952354E7 3213572.056839364
+ ll2 20.630225775680845 -101.1998982598671
EPSG:6095
ll 70.15669585501138 -165.09782628973232
en 3.082430905324375E7 5393870.401814702
- ll2 70.15669585501233 -165.0978262897323
+ ll2 70.15669585501234 -165.0978262897323
EPSG:6096
ll 14.903937644629021 -158.52892703741023
en 1.546794551766808E7 -170942.25138569996
@@ -15515,55 +15523,55 @@ EPSG:6096
EPSG:6097
ll 40.09873594701235 -152.14043438250263
en 1.6016839093968015E7 3227321.147975772
- ll2 40.098735947012436 -152.14043438250266
+ ll2 40.09873594701243 -152.14043438250266
EPSG:6098
ll 82.97814245185006 -95.32946476277644
en 2.342731031659253E7 1228790.536880927
- ll2 82.97814245185067 -95.32946476277637
+ ll2 82.97814245185067 -95.32946476277634
EPSG:6099
ll 54.79020114488402 -170.22332673522155
- en 1.1223179788286567E7 1071655.2138508947
- ll2 54.790201144884364 -170.22332673522155
+ en 1.1223179788286569E7 1071655.2138508912
+ ll2 54.79020114488437 -170.2233267352216
EPSG:6100
ll 36.6879693469208 -16.977449466080913
en 2.1824116044363584E7 -3954.6769188572653
ll2 36.687969346920916 -16.9774494660809
EPSG:6101
ll 86.78785405004453 -90.31806116606404
- en 2.572819336950262E7 4484427.193398269
- ll2 86.78785405004487 -90.31806116606424
+ en 2.572819336950262E7 4484427.193398271
+ ll2 86.78785405004488 -90.31806116606421
EPSG:6102
ll 51.20468480162757 -40.09542865770334
- en 3.124910844680736E7 2412990.2494866773
- ll2 51.204684801627764 -40.09542865770334
+ en 3.124910844680736E7 2412990.249486679
+ ll2 51.204684801627785 -40.09542865770334
EPSG:6103
ll 29.64467553987945 -70.58066562210888
- en 2.9304279025528148E7 -2455561.9753398616
- ll2 29.64467553987826 -70.58066562210888
+ en 2.9304279025528148E7 -2455561.9753398597
+ ll2 29.644675539878275 -70.58066562210888
EPSG:6104
ll 20.60982926686014 -162.30770924458164
- en 9972091.468961142 -1012552.3054806013
- ll2 20.609829266860075 -162.3077092445816
+ en 9972091.468961138 -1012552.3054805985
+ ll2 20.60982926686009 -162.30770924458167
EPSG:6105
ll 82.28875348518734 -99.86769504246061
en 1.6562416348076358E7 5277155.021425018
ll2 82.28875348518801 -99.8676950424606
EPSG:6106
ll 61.80719540590116 -86.80780310872552
- en 1.808011668830364E7 3004075.2547260765
- ll2 61.80719540590177 -86.80780310872557
+ en 1.8080116688303642E7 3004075.2547260765
+ ll2 61.807195405901766 -86.80780310872548
EPSG:6107
ll 66.16248196193726 -75.01123750682103
en 3.568717317832082E7 5941840.387147035
- ll2 66.16248196193804 -75.01123750682108
+ ll2 66.16248196193804 -75.01123750682109
EPSG:6108
ll 74.59348095213292 -99.89634938644721
- en 3.582774837499029E7 5816915.463032536
- ll2 74.59348095213387 -99.89634938644718
+ en 3.582774837499029E7 5816915.463032539
+ ll2 74.59348095213389 -99.89634938644717
EPSG:6109
ll 38.37192279853344 -144.58297600474216
- en 3.2842570695E7 3798855.492167731
- ll2 38.37192279853353 -144.58297600474216
+ en 3.2842570695E7 3798855.4921677317
+ ll2 38.37192279853354 -144.58297600474216
EPSG:6110
ll 15.215127159292374 -149.06724557723456
en 3.060300186180061E7 5066663.179542472
@@ -15571,23 +15579,23 @@ EPSG:6110
EPSG:6111
ll 15.427746997166528 -55.29539781078225
en 2.7161790815318055E7 6089439.744802961
- ll2 15.427746997166508 -55.29539781078224
+ ll2 15.427746997166516 -55.29539781078224
EPSG:6112
ll 28.33091028755902 -156.04300836206278
- en 1.580299936807204E7 3416551.7491130484
- ll2 28.330910287558165 -156.04300836206272
+ en 1.5802999368072039E7 3416551.749113052
+ ll2 28.330910287558197 -156.0430083620628
EPSG:6113
ll 83.8195488245214 -59.49471729452608
en 2.2914928036672883E7 8334257.005405455
- ll2 83.81954882452196 -59.49471729452606
+ ll2 83.81954882452196 -59.494717294526055
EPSG:6114
ll 69.80170908892627 -16.895205501360806
- en 2.6420789804462954E7 7605711.855173887
- ll2 69.80170908892718 -16.895205501360802
+ en 2.642078980446295E7 7605711.855173888
+ ll2 69.80170908892718 -16.895205501360838
EPSG:6115
ll 61.94511473633165 -5.970150389259317
en 2.563711345028953E7 -567131.6451055233
- ll2 61.945114736331625 -5.970150389259317
+ ll2 61.94511473633162 -5.9701503892593095
EPSG:6116
ll 54.58534267253356 148.2548301323063
en 3.2945151539231688E7 -136408.59880397585
@@ -15603,75 +15611,75 @@ EPSG:6118
EPSG:6119
ll 36.61027163326102 143.07829912826017
en 2.9596443980864294E7 -2837600.3263994856
- ll2 36.61027163326113 143.07829912826017
+ ll2 36.61027163326112 143.07829912826017
EPSG:6120
ll 76.73502514433584 154.9348480313942
- en 1.0217273087340206E7 1932236.708413239
- ll2 76.73502514433584 154.9348480313942
+ en 1.0217273087340206E7 1932236.7084132421
+ ll2 76.73502514433586 154.93484803139418
EPSG:6121
ll 26.959336593424556 -82.59689428743212
en 1.9761642476091787E7 851927.9202424835
ll2 26.959336593424556 -82.59689428743212
EPSG:6122
ll 45.826171994167055 111.35349862428237
- en 1.6947213314414106E7 2496836.1632400164
- ll2 45.82617199416709 111.35349862428238
+ en 1.69472133144141E7 2496836.163240022
+ ll2 45.8261719941671 111.35349862428237
EPSG:6123
ll 70.12168629256496 -83.83031887307101
- en 2.557271344046805E7 3932635.7192522115
- ll2 70.12168629256497 -83.83031887307102
+ en 2.557271344046805E7 3932635.719252215
+ ll2 70.12168629256496 -83.830318873071
EPSG:6124
ll 25.885111064284054 -128.6938371514276
- en 1.5813505172064766E7 -791578.2204982098
- ll2 25.88511106428405 -128.6938371514276
+ en 1.5813505172064757E7 -791578.2204982014
+ ll2 25.885111064284047 -128.6938371514276
EPSG:6125
ll 29.34045173308477 -20.701596987695808
- en 4.564985400902703E7 638524.8943660678
- ll2 29.340451733083647 -20.701596987695797
+ en 4.564985400902703E7 638524.8943660697
+ ll2 29.340451733083704 -20.701596987695797
EPSG:6128
ll 34.516532238230894 -86.71611689712745
en -82342.74390522159 1.2579262855916623E7
- ll2 34.51653228933509 -86.71611691640011
+ ll2 34.516532289335096 -86.71611691640011
EPSG:6129
ll -1.9757129137794323 -71.00949711296076
en 5304001.06818315 -728285.948736077
- ll2 -1.9757128994832542 -71.00949727425865
+ ll2 -1.9757128994832538 -71.00949727425865
EPSG:6135
ll -34.31070455977969 -97.44295391637344
en -97.44295391637345 -34.310704560658564
- ll2 -34.310704559779694 -97.44295391637343
+ ll2 -34.3107045597797 -97.44295391637345
EPSG:6144
ll -60.06962270604155 -44.38813479175769
en -44.38813479175769 -60.069622706856855
ll2 -60.0696227060421 -44.38813479175769
EPSG:6145
ll 65.85555947024616 3.3584738821380284
- en 2230.0972707581386 1877118.0387932223
- ll2 65.85555947024125 3.358473882138475
+ en 2230.097270758197 1877118.0387932237
+ ll2 65.85555947024126 3.358473882138476
EPSG:6146
ll -15.758205910358214 12.119122387166192
- en 702987.1894135891 -7182218.329759214
- ll2 -15.758205909951407 12.119122386344392
+ en 702987.1894135892 -7182218.329759214
+ ll2 -15.758205909951405 12.119122386344397
EPSG:6147
ll 18.28968912286112 3.913463032610691
en -279407.4403551809 -3404507.301739295
- ll2 18.289689122835096 3.9134630326334143
+ ll2 18.289689122835096 3.9134630326334148
EPSG:6148
ll 52.08099666131659 3.799223972513869
- en -222168.4968890678 351509.3801053519
- ll2 52.080996660285386 3.7992239728541386
+ en -222168.4968890678 351509.3801053534
+ ll2 52.08099666028541 3.799223972854136
EPSG:6149
ll -27.937884474725465 11.45021216425182
en 291957.34006654087 -8524371.8067478
- ll2 -27.93788447472328 11.450212164255374
+ ll2 -27.937884474723283 11.450212164255376
EPSG:6150
ll 68.23630968387494 17.503360550756955
- en 389377.65072716214 2157408.4064716403
- ll2 68.23630967857045 17.503360518147584
+ en 389377.6507271623 2157408.406471639
+ ll2 68.23630967857042 17.50336051814759
EPSG:6151
ll 7.684476583319068 2.389043627574959
- en -909315.8568874036 -4570726.919454644
- ll2 7.684476576256085 2.3890437027259903
+ en -909315.8568874034 -4570726.919454644
+ ll2 7.684476576256085 2.3890437027259925
EPSG:6152
ll 10.97427192348394 16.76700702839412
en 566774.2146628643 -4214349.189676912
@@ -15679,147 +15687,147 @@ EPSG:6152
EPSG:6153
ll 11.199142372719834 8.12919157160795
en -487366.1101539722 -4187430.033957674
- ll2 11.199142372479686 8.129191573211601
+ ll2 11.199142372479688 8.129191573211603
EPSG:6154
ll 87.86254128348546 5.104075262800432
- en 61032.84629506524 4335142.986348245
- ll2 87.86254128427603 5.104075840845814
+ en 61032.846295065705 4335142.986348248
+ ll2 87.86254128427608 5.104075840845814
EPSG:6155
ll -76.54800765159595 21.243192266151866
en 248977.8287387801 -1.3938286286711011E7
- ll2 -76.54800765109366 21.243192260013142
+ ll2 -76.54800765109364 21.243192260013135
EPSG:6156
ll -57.991655403373144 18.14003711669468
- en 196996.8505559838 -1.1862813239986641E7
- ll2 -57.99165540337184 18.140037116695
+ en 196996.85055598355 -1.1862813239986643E7
+ ll2 -57.99165540337186 18.140037116694995
EPSG:6157
ll 86.77567949088592 25.98785539931045
- en 153128.7694301412 4214486.001330841
+ en 153128.76943014137 4214486.0013308395
ll2 86.77567949124484 25.98785517087277
EPSG:6158
ll 51.41812138840294 23.30167360895594
- en 433940.91748048336 278269.9916716644
- ll2 51.418121387234244 23.30167360856743
+ en 433940.91748048336 278269.9916716651
+ ll2 51.41812138723424 23.30167360856743
EPSG:6159
ll -42.576230743671694 29.499608241797354
- en 921301.0958393244 -1.0195675599426415E7
- ll2 -42.5762306806575 29.49960796492196
+ en 921301.0958393251 -1.0195675599426415E7
+ ll2 -42.5762306806575 29.499607964921978
EPSG:6160
ll -76.89014275227 30.159771512656995
- en 343641.36094311037 -1.3989267290425707E7
+ en 343641.3609431104 -1.3989267290425707E7
ll2 -76.89014274729743 30.15977082273918
EPSG:6161
ll -31.16547898979418 28.65529772328609
- en 783007.229659223 -8902746.409184333
+ en 783007.2296592228 -8902746.409184333
ll2 -31.16547898504934 28.6552977271766
EPSG:6162
ll -36.839695567580485 25.946851753371455
- en 407505.47710448434 -9515553.38717885
- ll2 -36.83969556748677 25.94685175347555
+ en 407505.4771044846 -9515553.38717885
+ ll2 -36.83969556748677 25.946851753475546
EPSG:6163
ll 78.16635927407381 16.817804750027918
- en -52717.42872045608 3257851.8644529185
- ll2 78.1663592732713 16.81780477461177
+ en -52717.42872045591 3257851.86445292
+ ll2 78.16635927327131 16.817804774611773
EPSG:6164
ll 44.045212370609846 22.82281612511524
en -34419.01098919113 -551068.6596389965
ll2 44.04521237060807 22.822816125113544
EPSG:6165
ll 6.535234778696065 34.54911580665519
- en 1104945.751796716 -4699533.050955119
- ll2 6.5352347727886055 34.54911573016836
+ en 1104945.751796716 -4699533.050955118
+ ll2 6.535234772788612 34.54911573016836
EPSG:6166
ll -8.568727150652606 36.1371617875928
en 1165752.379680779 -6392283.962672931
- ll2 -8.56872713923637 36.1371616804515
+ ll2 -8.568727139236369 36.1371616804515
EPSG:6167
ll 71.99760256778328 18.861778034097576
en -197179.24123757903 2581932.790881522
ll2 71.9976025574072 18.861778267363487
EPSG:6168
ll -65.99551166255016 26.237205878123035
- en -2741.7417420706042 -1.2755475026883973E7
- ll2 -65.99551166254311 26.237205878123888
+ en -2741.741742070415 -1.2755475026883973E7
+ ll2 -65.99551166254311 26.237205878123895
EPSG:6169
ll -46.439305949353326 26.69293108951707
en -115713.30011470779 -1.0580030572160646E7
ll2 -46.439305949309876 26.69293108949814
EPSG:6170
ll -38.029774646291386 30.29753827704884
- en 82224.4718302101 -9642104.928623296
- ll2 -38.02977464629139 30.297538277048844
+ en 82224.47183021042 -9642104.928623296
+ ll2 -38.02977464629141 30.297538277048847
EPSG:6171
ll 34.36542210171369 11.523416115318359
- en 1284785.2280508373 3835769.8372119353
- ll2 34.3654220853558 11.523416103088502
+ en 1284785.2280508375 3835769.8372119353
+ ll2 34.365422085355824 11.523416103088506
EPSG:6172
ll 2.536221967828979 1.6967053326324741
- en -314096.83764060726 282636.0476198957
- ll2 2.5362219672897486 1.6967053527249532
+ en -314096.8376406074 282636.0476198957
+ ll2 2.5362219672897486 1.6967053527249523
EPSG:6173
ll 52.67517661058511 23.927713407159636
- en 1102975.2739262413 5873626.431133574
- ll2 52.675176567050926 23.927713223622536
+ en 1102975.2739262413 5873626.431133575
+ ll2 52.675176567050926 23.92771322362254
EPSG:6174
ll 83.99038087024718 24.142903000988465
- en 536718.55791858 9328021.782302428
- ll2 83.9903808702463 24.14290300096011
+ en 536718.5579185801 9328021.782302426
+ ll2 83.99038087024628 24.142903000960118
EPSG:6175
ll 80.4173048603227 21.328768528253207
- en 394764.7914669808 8933303.926229283
- ll2 80.41730486014966 21.328768533943883
+ en 394764.79146698077 8933303.926229283
+ ll2 80.41730486014963 21.32876853394388
EPSG:6176
ll 23.911152592778663 30.05124912443556
- en 199784.23117677268 2647523.062584256
- ll2 23.911152592766474 30.051249124414046
+ en 199784.23117677303 2647523.062584256
+ ll2 23.911152592766477 30.051249124414046
EPSG:6190
ll 1.8615653198635194 41.30022430136843
- en 5532563.396025896 -4514308.430561309
- ll2 1.86156534988594 41.300224272060014
+ en 5532563.396025914 -4514308.430561286
+ ll2 1.8615653498859528 41.300224272060014
EPSG:6204
ll 1.5989651618805993 17.60097241671579
- en 122026.48265758925 176615.18319387932
- ll2 1.5989652538779833 17.60097233920573
+ en 122026.48265758931 176615.18319387932
+ ll2 1.5989652538779833 17.600972339205736
EPSG:6207
ll 68.58857781443032 -92.60458844978726
- en -92.61096245529818 68.58048598771967
- ll2 68.58857875500235 -92.60458770927806
+ en -92.6109624552982 68.58048598771967
+ ll2 68.58857875500235 -92.60458770927809
EPSG:6210
ll -80.00700366013436 -54.54834889219598
- en 315830.71841827966 -8897517.818490395
- ll2 -80.00700365956946 -54.54834825131373
+ en 315830.7184182798 -8897517.818490397
+ ll2 -80.00700365956948 -54.548348251313755
EPSG:6211
ll 80.67048323348851 -41.72966972829964
en 450615.840376742 8957584.512304638
ll2 80.67048323348706 -41.72966972829185
EPSG:6307
ll 33.59968915768029 -93.66607767538066
- en -2414257.3479099176 2162644.443134985
- ll2 33.59968915768049 -93.66607767538066
+ en -2414257.347909911 2162644.4431349905
+ ll2 33.599689157680515 -93.66607767538066
EPSG:6311
ll -25.889718392931442 -149.58815853012487
- en -149.58819459281492 -25.889723013321202
+ en -149.58819459281492 -25.889723013321206
ll2 -25.889718392957892 -149.58815853009867
EPSG:6312
ll -26.93905418753434 29.69858523142425
- en -127938.6539079569 -6485009.189066961
- ll2 -26.939054187482895 29.698585231489293
+ en -127938.6539079569 -6485009.189066962
+ ll2 -26.939054187482903 29.698585231489293
EPSG:6316
ll -31.861642153170635 21.273400500102603
en 7526302.485208105 -3526487.917405366
- ll2 -31.861641697740925 21.273400140477936
+ ll2 -31.86164169774092 21.273400140477936
EPSG:6318
ll -3.962404530421992 98.78868707479705
en 98.78868707479705 -3.9624045304219924
ll2 -3.962404530421992 98.78868707479705
EPSG:6322
ll 81.69449437943695 90.84071520715594
- en 90.84071520715594 81.69449437943693
- ll2 81.69449437943693 90.84071520715594
+ en 90.84071520715594 81.69449437943695
+ ll2 81.69449437943695 90.84071520715594
EPSG:6325
ll -48.80484649952498 -42.76016237135036
- en -42.76016237135037 -48.80484649952496
- ll2 -48.80484649952497 -42.76016237135037
+ en -42.76016237135036 -48.80484649952498
+ ll2 -48.80484649952498 -42.76016237135036
EPSG:6328
ll 66.02651111099047 173.8377009521195
en 628624.558719514 7325776.277526746
@@ -15827,7 +15835,7 @@ EPSG:6328
EPSG:6329
ll -30.243989850560787 171.12378353298226
en -65847.58712997916 -3360469.376562685
- ll2 -30.243989849190907 171.12378353099209
+ ll2 -30.243989849190903 171.12378353099209
EPSG:6330
ll 54.09673009727615 -176.93797369145955
en 504056.364409403 5994285.7646132745
@@ -15843,7 +15851,7 @@ EPSG:6332
EPSG:6333
ll -37.81782922613564 -152.30964852767661
en 1089178.5552180328 -4206749.300081202
- ll2 -37.81782922095397 -152.30964852759513
+ ll2 -37.817829220953975 -152.30964852759513
EPSG:6334
ll 35.30993077061258 -148.61978216792835
en 898318.8313114729 3916224.559043793
@@ -15862,20 +15870,20 @@ EPSG:6337
ll2 -34.85412906120437 -125.31374711991023
EPSG:6338
ll -35.846137293384146 -126.92392155136407
- en 687487.8028893927 -3968872.7328603393
- ll2 -35.84613729337997 -126.92392155135728
+ en 687487.8028893927 -3968872.7328603403
+ ll2 -35.846137293379975 -126.92392155135728
EPSG:6339
ll -56.14279202457568 -128.10966740219263
- en 182657.01292718854 -6233735.709990191
+ en 182657.01292718848 -6233735.709990191
ll2 -56.14279202294204 -128.10966740098678
EPSG:6340
ll 76.53720307215264 -121.35395229975967
en 386943.2420060141 8499309.393295908
- ll2 76.53720307205262 -121.35395229925554
+ ll2 76.5372030720526 -121.35395229925554
EPSG:6341
ll -59.02753634015971 -117.22136370177549
- en 143184.54526499152 -6559753.181516659
- ll2 -59.02753633530886 -117.22136369306813
+ en 143184.54526499164 -6559753.18151666
+ ll2 -59.02753633530885 -117.22136369306813
EPSG:6342
ll 16.73589460434384 -103.80764745703466
en 627101.9911099846 1850719.6306071044
@@ -15883,7 +15891,7 @@ EPSG:6342
EPSG:6343
ll 80.27213808456449 -91.53335003077494
en 640470.8251914015 8920995.65552333
- ll2 80.27213808385889 -91.53335009937521
+ ll2 80.2721380838589 -91.53335009937521
EPSG:6344
ll -15.55283456537066 -83.48157387168463
en 1524692.8704248813 -1742448.4907423905
@@ -15906,8 +15914,8 @@ EPSG:6348
ll2 -53.86393346300957 -64.79135821115935
EPSG:6350
ll -80.0209110224801 -11.618238432859727
- en 1.3063857734315593E7 -697620.1274206834
- ll2 -80.0209110224798 -11.618238432859727
+ en 1.3063857734315593E7 -697620.1274206848
+ ll2 -80.02091102247998 -11.61823843285974
EPSG:6351
ll 74.18155698794537 -149.27550769291977
en 2.991428555107788E7 5788026.2473429805
@@ -15919,14 +15927,14 @@ EPSG:6352
EPSG:6353
ll 71.23768071379325 -139.91780574809727
en 1.537654841275259E7 6965741.07463601
- ll2 71.23768071379325 -139.91780574809724
+ ll2 71.23768071379324 -139.91780574809724
EPSG:6354
ll 70.22282036427644 -141.2146680018883
en 1.6718227163217807E7 6681495.451226694
ll2 70.22282036427644 -141.2146680018883
EPSG:6355
ll -77.21975326779273 -91.09630117677644
- en 70153.72793422903 -1.195561007327453E7
+ en 70153.727934229 -1.195561007327453E7
ll2 -77.21975326752889 -91.09630117396642
EPSG:6356
ll 2.3864200787158296 -92.628686840988
@@ -15934,28 +15942,28 @@ EPSG:6356
ll2 2.386420078670905 -92.6286868388351
EPSG:6362
ll 32.169167247026024 -17.182997323072073
- en 1.0087845766210772E7 4544916.714838553
- ll2 32.16916724702625 -17.18299732307203
+ en 1.0087845766210768E7 4544916.714838556
+ ll2 32.1691672470263 -17.18299732307207
EPSG:6365
ll 84.64211164455767 163.59988549541578
- en 163.59988549541575 84.64211164473299
- ll2 84.64211164455814 163.59988549541575
+ en 163.59988549541578 84.64211164473302
+ ll2 84.64211164455816 163.59988549541575
EPSG:6366
ll 54.358826389261424 -110.7360002563786
- en 906802.0185404278 6041548.287667554
- ll2 54.358826383650346 -110.736000263795
+ en 906802.0185404269 6041548.287667555
+ ll2 54.358826383650346 -110.73600026379502
EPSG:6367
ll -38.18636056946653 -118.46113790597518
en -153843.0931424246 -4252895.585568096
- ll2 -38.18636055948573 -118.46113790093273
+ ll2 -38.18636055948572 -118.46113790093273
EPSG:6368
ll 15.422632032475889 -106.78440136830955
- en 308518.7508141381 1705864.978869551
- ll2 15.422632032475594 -106.78440136830707
+ en 308518.75081413804 1705864.978869551
+ ll2 15.4226320324756 -106.78440136830706
EPSG:6369
ll -23.746862313861 -95.33136809451743
- en 874040.6156710305 -2631027.836512543
- ll2 -23.74686231381591 -95.33136809443624
+ en 874040.6156710319 -2631027.8365125423
+ ll2 -23.746862313815907 -95.33136809443623
EPSG:6370
ll -59.99078438191468 -100.82764415688584
en 63952.251134323946 -6676238.348769569
@@ -15963,19 +15971,19 @@ EPSG:6370
EPSG:6371
ll -12.254035070498603 -84.3476778734233
en 788550.6071444473 -1356062.8832084767
- ll2 -12.254035070495865 -84.3476778734527
+ ll2 -12.254035070495863 -84.3476778734527
EPSG:6372
ll -7.293715011097742 -48.81498463376445
en 9067455.727796076 -1046995.3862803907
- ll2 -7.293715011097747 -48.814984633764446
+ ll2 -7.2937150110977464 -48.81498463376444
EPSG:6381
ll -81.77263078826563 22.808717010809207
- en 329037.5498153272 -9083640.825807171
+ en 329037.5498153272 -9083640.82580717
ll2 -81.77263077691696 22.808717264023763
EPSG:6382
ll -28.511244621970228 15.739214892782526
- en -510112.8992148049 -3183063.5847934424
- ll2 -28.511244597905247 15.73921491851963
+ en -510112.89921480545 -3183063.5847934424
+ ll2 -28.511244597905247 15.739214918519632
EPSG:6383
ll -63.728587359161295 35.566626787895125
en 722412.2644846758 -7098018.501037026
@@ -15986,43 +15994,43 @@ EPSG:6384
ll2 -65.0531423605695 29.6825514956409
EPSG:6385
ll 58.15933644790425 24.124830642525136
- en -221424.95045954478 6483567.689051737
- ll2 58.15933640963619 24.124830867371074
+ en -221424.9504595446 6483567.689051737
+ ll2 58.15933640963618 24.12483086737108
EPSG:6386
ll 60.80574369955846 33.0946063091695
- en 141995.81396693154 6747457.4602963105
- ll2 60.80574369906059 33.09460631394481
+ en 141995.8139669316 6747457.4602963105
+ ll2 60.8057436990606 33.094606313944794
EPSG:6387
ll 22.510416585671848 48.00446751365945
en 1229286.4150705994 2518528.264514798
- ll2 22.510416573992536 48.00446751222066
+ ll2 22.51041657399253 48.00446751222066
EPSG:6391
ll 14.97132385291944 -13.315747713557954
en 2.615122538274686E7 4922600.804051004
ll2 14.971323852919486 -13.315747713557968
EPSG:6393
ll 5.680096886456667 -177.46768485472967
- en -3204649.9178882474 -3884131.3066787203
- ll2 5.68009688645666 -177.46768485472967
+ en -3204649.917888248 -3884131.3066787203
+ ll2 5.680096886456661 -177.46768485472967
EPSG:6394
ll 57.43001412397566 -140.9804855596243
en 380081.29686265625 646725.2280274499
ll2 57.43001412397313 -140.9804855596243
EPSG:6395
ll 76.25909754766835 -138.63247756354963
- en 589271.7190036568 2483868.6158954343
- ll2 76.25909754764545 -138.6324775635993
+ en 589271.7190036569 2483868.615895433
+ ll2 76.25909754764544 -138.6324775635993
EPSG:6396
ll 86.41146684413206 -150.35907200929324
en 469558.27681496344 3616032.219434979
- ll2 86.41146684413036 -150.35907200874598
+ ll2 86.41146684413037 -150.35907200874598
EPSG:6397
ll -8.81192494733557 -154.72414174268494
- en -20236.43617833109 -6962960.126401137
- ll2 -8.81192494724988 -154.7241417417213
+ en -20236.43617833109 -6962960.1264011385
+ ll2 -8.811924947249892 -154.7241417417213
EPSG:6398
ll 1.6335392455589925 -163.91008334391833
- en -608197.7215596752 -5801954.565366738
+ en -608197.7215596754 -5801954.565366738
ll2 1.633539242486784 -163.91008317115072
EPSG:6399
ll -7.722408063735713 -164.00899455688938
@@ -16042,39 +16050,39 @@ EPSG:6402
ll2 -36.19922558447819 -165.47253119539837
EPSG:6403
ll 22.99061056932241 -142.8245076380553
- en 4693229.590496333 -2378754.0854679127
+ en 4693229.590496333 -2378754.085467913
ll2 22.99061056932242 -142.8245076380553
EPSG:6404
ll -80.2225785031907 -112.56088594482269
- en 201143.09920961116 -1.233980105161309E7
+ en 201143.0992096112 -1.233980105161309E7
ll2 -80.22257850319072 -112.56088594482269
EPSG:6405
ll -81.4996819843673 -113.24909598125947
en 627845.3446573603 -4.0953347691308476E7
- ll2 -81.4996819843673 -113.24909598125946
+ ll2 -81.49968198436729 -113.24909598125946
EPSG:6406
ll 16.902158818725823 -113.01717096983016
- en -90409.8521129298 -1559140.7441596345
- ll2 16.90215881872014 -113.01717096981301
+ en -90409.85211292974 -1559140.7441596345
+ ll2 16.902158818720135 -113.01717096981301
EPSG:6407
ll -32.98645818916888 -105.53562852010032
- en 2120608.5397875994 -2.3264606745470133E7
- ll2 -32.98645818875706 -105.5356285195389
+ en 2120608.539787599 -2.326460674547014E7
+ ll2 -32.98645818875709 -105.5356285195389
EPSG:6408
ll -67.07204752654057 -112.8489252388545
en 252544.6867582226 -1.0872921970160834E7
- ll2 -67.07204752654053 -112.8489252388545
+ ll2 -67.07204752654054 -112.8489252388545
EPSG:6409
ll -60.361233174942285 -118.40841679685867
en -142974.74663443587 -3.3247063748632744E7
- ll2 -60.36123317411501 -118.40841679621657
+ ll2 -60.361233174115 -118.40841679621657
EPSG:6410
ll 72.15879304018827 -143.81411442844896
- en -1850540.4772842 5187897.573017174
- ll2 72.15879304018827 -143.81411442844896
+ en -1850540.4772841916 5187897.573017169
+ ll2 72.1587930401883 -143.81411442844896
EPSG:6411
ll 58.71958080896411 -19.652630404170083
- en 1.5107794580061335E7 1.4463864111816242E7
+ en 1.5107794580061298E7 1.4463864111816252E7
ll2 58.71958080896409 -19.652630404170083
EPSG:6412
ll 0.39445784527797656 -130.96391539311466
@@ -16086,8 +16094,8 @@ EPSG:6413
ll2 23.390428775690044 -101.56334400184963
EPSG:6414
ll -46.687072210647905 -90.63362928555675
- en 4811217.263010543 -6720230.288116514
- ll2 -46.68707221064784 -90.63362928555674
+ en 4811217.263010538 -6720230.288116518
+ ll2 -46.687072210647834 -90.63362928555675
EPSG:6415
ll 77.66785860605287 -67.02727481867939
en 3690649.4486772395 5724940.399223018
@@ -16095,7 +16103,7 @@ EPSG:6415
EPSG:6416
ll 33.337985226634295 -110.17527554522647
en 1.0191781726363601E7 -304220.73301765666
- ll2 33.33798522663451 -110.17527554522647
+ ll2 33.3379852266345 -110.17527554522647
EPSG:6417
ll -15.553648759867905 -175.66169754109362
en -6280405.793651713 -3834401.474412105
@@ -16103,47 +16111,47 @@ EPSG:6417
EPSG:6418
ll 47.1767883660134 -84.02862713493593
en 1.58278932760156E7 7080681.223937646
- ll2 47.17678836601343 -84.02862713493593
+ ll2 47.17678836601344 -84.02862713493593
EPSG:6419
ll 15.538127850043367 -104.85447947087084
- en 3791725.2756643863 -1731555.6684977305
+ en 3791725.275664387 -1731555.6684977305
ll2 15.538127850043375 -104.85447947087084
EPSG:6420
ll 52.160892945559965 -138.41611823042592
- en 2424330.776832291 7805987.9317071
- ll2 52.160892945559986 -138.41611823042592
+ en 2424330.77683229 7805987.931707103
+ ll2 52.16089294555998 -138.41611823042592
EPSG:6421
ll 52.08504303897989 -98.58745634073144
en 3444917.8955338337 2537693.2393333763
- ll2 52.08504303897989 -98.58745634073144
+ ll2 52.0850430389799 -98.58745634073144
EPSG:6422
ll 88.8896144213864 -91.61833665398456
en 7314446.364382077 2.772429085000693E7
- ll2 88.8896144213863 -91.61833665398456
+ ll2 88.88961442138628 -91.61833665398456
EPSG:6423
ll -19.012561723018287 -116.78857885192787
- en 2193859.108297715 -6242787.563262752
- ll2 -19.012561723018244 -116.78857885192787
+ en 2193859.108297715 -6242787.56326275
+ ll2 -19.01256172301826 -116.78857885192787
EPSG:6424
ll -0.6599555906649996 -92.03974830384635
- en 1.7764601277750082E7 -1.0119279996470178E7
- ll2 -0.6599555906649419 -92.03974830384635
+ en 1.7764601277750086E7 -1.0119279996470172E7
+ ll2 -0.6599555906649673 -92.03974830384635
EPSG:6425
ll 45.4730620586119 -111.21653412310296
- en 2402866.454616879 1997408.823919581
- ll2 45.47306205861191 -111.21653412310296
+ en 2402866.454616879 1997408.8239195796
+ ll2 45.473062058611916 -111.21653412310296
EPSG:6426
ll -3.2058761637770736 -160.2559486322041
- en -1.2286021239191316E7 -8062192.312303603
- ll2 -3.205876163777022 -160.2559486322041
+ en -1.2286021239191325E7 -8062192.312303616
+ ll2 -3.2058761637770474 -160.2559486322041
EPSG:6427
ll 1.449916949344484 -96.13454944215478
- en 2182376.90523967 -3952441.0825150004
- ll2 1.4499169493445156 -96.13454944215478
+ en 2182376.9052396733 -3952441.082515008
+ ll2 1.449916949344503 -96.13454944215478
EPSG:6428
ll 67.60249294102175 -63.19758877556622
- en 9666006.699352648 1.3976808558463426E7
- ll2 67.60249294102172 -63.19758877556621
+ en 9666006.699352622 1.3976808558463413E7
+ ll2 67.60249294102175 -63.197588775566224
EPSG:6429
ll 18.48328706579133 -75.92323119181468
en 4192431.3171282713 -1509903.254604101
@@ -16154,12 +16162,12 @@ EPSG:6430
ll2 35.97687564469804 -143.74152686861254
EPSG:6431
ll 49.0608666576517 -25.927459991199214
- en 6156991.381578334 4068576.5312229544
- ll2 49.06086665765173 -25.9274599911992
+ en 6156991.381578341 4068576.5312229474
+ ll2 49.06086665765173 -25.927459991199214
EPSG:6432
ll 19.59358359979067 -55.526126658425454
- en 2.0190060050602645E7 -604106.3306658493
- ll2 19.59358359979069 -55.52612665842545
+ en 2.019006005060264E7 -604106.3306658771
+ ll2 19.59358359979068 -55.526126658425454
EPSG:6433
ll -13.475800517080819 -120.76850847362235
en -7224539.627613663 -4683761.920884964
@@ -16171,30 +16179,30 @@ EPSG:6434
EPSG:6435
ll 36.941148808027435 -68.58141560747927
en 809285.4935010187 -95615.87543464926
- ll2 36.94114880248007 -68.58141560713689
+ ll2 36.941148802480065 -68.58141560713689
EPSG:6436
ll 57.23191359668061 -81.10556340053343
- en -470265.82851179404 7062265.559193368
- ll2 57.23191359366285 -81.10556339700506
+ en -470265.82851179363 7062265.559193369
+ ll2 57.23191359366285 -81.10556339700504
EPSG:6437
ll 85.61947390786887 -79.19081295066069
- en 215430.79420232598 6820329.828647002
- ll2 85.61947390786885 -79.19081295066088
+ en 215430.79420232595 6820329.8286470035
+ ll2 85.61947390786887 -79.19081295066088
EPSG:6438
ll -50.577259155147885 -72.80095567476633
en 2560185.814245974 -2.732591335416624E7
- ll2 -50.57725912828304 -72.80095574898345
+ ll2 -50.57725912828303 -72.80095574898345
EPSG:6439
ll -69.91347359264388 -43.519370309940854
- en 6785306.202994696 -6200050.583403238
- ll2 -69.9134735926439 -43.51937030994086
+ en 6785306.202994698 -6200050.583403235
+ ll2 -69.91347359264381 -43.519370309940854
EPSG:6440
ll 52.32620854990201 -86.71846001110967
en 435536.35046325426 2659884.095131346
ll2 52.32620854990202 -86.71846001110967
EPSG:6441
ll 55.5285656649317 -107.78993258463464
- en -3395548.1442897813 1.0560836104201354E7
+ en -3395548.1442897837 1.0560836104201348E7
ll2 55.52856566493178 -107.78993258463464
EPSG:6442
ll 41.35984683243288 -90.92807367125977
@@ -16202,16 +16210,16 @@ EPSG:6442
ll2 41.359846799739245 -90.92807359249149
EPSG:6443
ll 8.81821779062517 -72.1713030760573
- en 4220255.9793107575 -5585857.496562449
- ll2 8.81821777722776 -72.17130319807008
+ en 4220255.9793107575 -5585857.496562448
+ ll2 8.818217777227764 -72.17130319807008
EPSG:6444
ll 6.613684360257878 -81.98780555243906
en 219777.1597576673 -2588515.0755741317
ll2 6.61368436025788 -81.98780555243906
EPSG:6445
ll -47.78419715834262 -72.34197653536532
- en 3070163.761951568 -2.8414070207664505E7
- ll2 -47.78419708911933 -72.34197687839536
+ en 3070163.761951568 -2.84140702076645E7
+ ll2 -47.78419708911932 -72.34197687839536
EPSG:6446
ll -81.752611675239 -76.0624239366847
en 829411.1750579373 -1.2408792881093731E7
@@ -16219,7 +16227,7 @@ EPSG:6446
EPSG:6447
ll -55.45138596082552 -75.46943224336256
en 4099373.5603993824 -3.1171551659339495E7
- ll2 -55.45138592413242 -75.46943240634175
+ ll2 -55.45138592413241 -75.46943240634175
EPSG:6448
ll 1.621574601071032 -104.34925006021496
en 1578973.1962277533 -4432485.035720624
@@ -16227,15 +16235,15 @@ EPSG:6448
EPSG:6449
ll -7.475800280846684 -113.44955588684572
en 1839745.2299412214 -1.785115611496449E7
- ll2 -7.475800280846686 -113.44955588684573
+ ll2 -7.475800280846687 -113.44955588684573
EPSG:6450
ll -68.93210999397016 -105.10151118544611
en 483001.7803155916 -1.2280128276281105E7
- ll2 -68.93210998878122 -105.1015112212134
+ ll2 -68.9321099887812 -105.10151122121341
EPSG:6451
ll 3.290231097548727 -118.34800875603038
en -1601957.4606630772 -1.3938402828383267E7
- ll2 3.2902310973307114 -118.3480087493632
+ ll2 3.290231097330712 -118.3480087493632
EPSG:6452
ll 77.11060228411151 -115.79518845499732
en 798874.3688320736 3947664.2922227266
@@ -16251,7 +16259,7 @@ EPSG:6454
EPSG:6455
ll -27.030795903080325 -93.27644841309134
en -626121.1440838268 -2.3162762384299476E7
- ll2 -27.030795902712097 -93.27644841381002
+ ll2 -27.0307959027121 -93.27644841381002
EPSG:6456
ll -52.14170826401336 -100.10540622684503
en 20479.306174722733 -9884790.017948037
@@ -16266,8 +16274,8 @@ EPSG:6458
ll2 -22.78572328928749 -82.61972861596038
EPSG:6459
ll -54.45073585571904 -92.59796365042818
- en -1145762.5465664605 -3.267678182949966E7
- ll2 -54.45073584556566 -92.59796363123358
+ en -1145762.5465664605 -3.2676781829499666E7
+ ll2 -54.450735845565674 -92.59796363123358
EPSG:6460
ll 47.466597415253574 -84.36953581657879
en 1104583.5197905959 1360653.610784192
@@ -16278,11 +16286,11 @@ EPSG:6461
ll2 -39.728672837798015 -94.22273310590832
EPSG:6462
ll 65.19887870623779 -47.75794923519592
- en 3738832.744376043 4333906.730950822
- ll2 65.19887870623776 -47.75794923519592
+ en 3738832.7443760373 4333906.730950823
+ ll2 65.19887870623778 -47.75794923519593
EPSG:6463
ll 53.90544747804381 -81.7138175766666
- en 7507267.529933827 8014237.760793938
+ en 7507267.529933823 8014237.760793941
ll2 53.905447478043826 -81.7138175766666
EPSG:6464
ll 38.31601296075267 -11.911065219187009
@@ -16291,38 +16299,38 @@ EPSG:6464
EPSG:6465
ll -17.455829251199038 -75.43988542994514
en 1.1780757639427412E7 -2.376166565731498E7
- ll2 -17.455829251198992 -75.43988542994512
+ ll2 -17.455829251198992 -75.43988542994514
EPSG:6466
ll 29.293165609052984 -104.29123491132512
- en -219646.4691094663 -986543.3828423626
- ll2 29.293165609052974 -104.29123491132512
+ en -219646.46910946618 -986543.3828423626
+ ll2 29.29316560905297 -104.29123491132512
EPSG:6467
ll 36.97216976633625 -153.11568297559543
- en -1.3824380149683556E7 4258243.574742871
- ll2 36.97216976633634 -153.11568297559543
+ en -1.3824380149683552E7 4258243.574742876
+ ll2 36.97216976633637 -153.11568297559546
EPSG:6468
ll -0.1783007806922079 -105.84343559839027
- en -600974.4323599908 -3945951.171091643
+ en -600974.4323599889 -3945951.1710916404
ll2 -0.17830078069216823 -105.84343559839027
EPSG:6469
ll 77.73654152012314 -138.3542401573063
- en -3089631.8155197883 1.9000187316511393E7
+ en -3089631.815519806 1.900018731651141E7
ll2 77.73654152012314 -138.3542401573063
EPSG:6470
ll 63.298402572664244 -90.2009169690996
en 165932.7818972963 2981970.7747654566
- ll2 63.298402572664216 -90.2009169690996
+ ll2 63.29840257266421 -90.2009169690996
EPSG:6471
ll -11.276868257894277 -164.57024788777375
en -3.416708868156592E7 -3360395.7945350185
ll2 -11.276868257894252 -164.57024788777375
EPSG:6472
ll 19.793835417657874 -50.70627848454501
- en 5257632.769575227 -150885.2094706169
- ll2 19.79383541765787 -50.70627848454501
+ en 5257632.769575225 -150885.20947061828
+ ll2 19.793835417657885 -50.70627848454501
EPSG:6473
ll 4.114529412685986 -94.53245326253406
- en 1172543.5433942117 -8938673.506273171
+ en 1172543.543394217 -8938673.506273162
ll2 4.1145294126860215 -94.53245326253406
EPSG:6474
ll -15.660221164009497 -115.66010808278878
@@ -16342,15 +16350,15 @@ EPSG:6477
ll2 -17.519419721440673 -167.6477997493497
EPSG:6478
ll 75.92200240319345 -150.2055521458464
- en -1516603.115026947 6762137.012376418
+ en -1516603.1150269215 6762137.012376395
ll2 75.92200240319346 -150.2055521458464
EPSG:6479
ll 43.53962784583521 -8.167102179347893
- en 2.4050989540333E7 1.3409443920465412E7
+ en 2.4050989540332917E7 1.3409443920465473E7
ll2 43.53962784583525 -8.167102179347893
EPSG:6480
ll 26.76053885696203 -69.58705936284993
- en 454042.22708935966 -1857050.4975672532
+ en 454042.22708935966 -1857050.497567253
ll2 26.760538856962025 -69.58705936284993
EPSG:6481
ll -80.22179964520637 -62.431191924549864
@@ -16359,7 +16367,7 @@ EPSG:6481
EPSG:6482
ll 82.90356075277367 -74.7464409444012
en 239741.03233854286 4467365.323804499
- ll2 82.90356075275754 -74.74644094384917
+ ll2 82.90356075275756 -74.74644094384917
EPSG:6483
ll -59.04080460094534 -68.3981951461661
en 305843.75420215196 -1.1382866625222418E7
@@ -16370,8 +16378,8 @@ EPSG:6484
ll2 -77.97579408960708 -77.61394745514154
EPSG:6485
ll 67.65783384358949 -62.50976089810143
- en 1224246.8862791648 2783500.862028602
- ll2 67.65783383427659 -62.5097609704669
+ en 1224246.8862791646 2783500.8620286034
+ ll2 67.65783383427662 -62.50976097046689
EPSG:6486
ll -82.41257973782412 -71.86281468392295
en 2870700.1295177112 -4.55991700776614E7
@@ -16382,11 +16390,11 @@ EPSG:6487
ll2 -11.021985482339096 -91.75938126956841
EPSG:6488
ll 66.10079040485597 -95.61958756707608
- en -1847004.298772228 1.1154884639160901E7
- ll2 66.10079040485594 -95.61958756707608
+ en -1847004.2987722268 1.1154884639160907E7
+ ll2 66.10079040485597 -95.61958756707608
EPSG:6489
ll 66.84778268404824 -77.91745284190644
- en 132190.37339142105 3004871.3275421723
+ en 132190.37339142093 3004871.3275421723
ll2 66.84778268404823 -77.91745284190644
EPSG:6490
ll 2.0429052767651115 -77.21227143307243
@@ -16395,39 +16403,39 @@ EPSG:6490
EPSG:6491
ll 60.315605327527535 -8.523576669688993
en 3559591.951395654 4235955.710082352
- ll2 60.3156053275275 -8.523576669689
+ ll2 60.31560532752751 -8.523576669689
EPSG:6492
ll 65.84124081370452 -48.127330246358696
en 4495785.941852467 1.2349672132853286E7
ll2 65.8412408137045 -48.127330246358696
EPSG:6493
ll 56.497679556824835 -139.1963891541538
- en 2805032.529277245 2598267.68486947
- ll2 56.497679556824885 -139.1963891541538
+ en 2805032.529277245 2598267.684869471
+ ll2 56.49767955682488 -139.1963891541538
EPSG:6494
ll 87.61061075498613 -119.16412724043012
en 1.8626905852751672E7 1.928020269512419E7
- ll2 87.61061075498613 -119.16412724043025
+ ll2 87.61061075498611 -119.16412724043025
EPSG:6495
ll 5.352306492846463 -115.67131749521386
- en 4102413.2707303967 -4026726.5788521613
- ll2 5.352306492846496 -115.67131749521386
+ en 4102413.2707304037 -4026726.5788521585
+ ll2 5.352306492846483 -115.67131749521386
EPSG:6496
ll 50.5958505064533 -119.44507517510519
- en 1.8897742106479596E7 3646953.4456382543
- ll2 50.59585050645332 -119.44507517510519
+ en 1.8897742106479596E7 3646953.4456382496
+ ll2 50.595850506453296 -119.44507517510519
EPSG:6497
ll 47.483240761154256 -85.40849207600685
- en 544389.0285745421 770360.2613843884
- ll2 47.48324076113724 -85.40849207600685
+ en 544389.0285745421 770360.2613843894
+ ll2 47.48324076113723 -85.40849207600685
EPSG:6498
ll 23.077703633744676 -107.4529507181953
en 1531646.307092634 -1743876.902619338
ll2 23.077703633744708 -107.4529507181953
EPSG:6499
ll 53.00775691304186 -157.69923331181772
- en -1297093.1010452444 1.0927117687882626E7
- ll2 53.00775691304188 -157.6992333118177
+ en -1297093.1010452507 1.0927117687882628E7
+ ll2 53.007756913041874 -157.69923331181772
EPSG:6500
ll 38.31224381438126 -108.58635483378286
en -458636.4027763505 -531310.5606338065
@@ -16439,39 +16447,39 @@ EPSG:6501
EPSG:6502
ll 57.991334674424465 -23.68424820543663
en 4436625.788632378 3137066.1866531796
- ll2 57.99133467442445 -23.684248205436617
+ ll2 57.991334674424444 -23.684248205436617
EPSG:6503
ll 19.618330414820157 -35.32453772165778
- en 2.2773556262431383E7 -1941424.1594228253
- ll2 19.618330414820182 -35.324537721657784
+ en 2.2773556262431387E7 -1941424.1594228253
+ ll2 19.618330414820182 -35.32453772165777
EPSG:6504
ll -8.517390722254339 -22.17364308424027
en 1.0977130223413084E7 -1668568.9214322534
ll2 -8.517390722254316 -22.17364308424027
EPSG:6505
ll 79.95118874311936 -12.343085757066802
- en 8632075.31153347 1.833558551312609E7
- ll2 79.95118874311936 -12.34308575706683
+ en 8632075.311533455 1.83355855131261E7
+ ll2 79.95118874311937 -12.343085757066802
EPSG:6506
ll -67.75955973766918 -95.93213438327057
en 602.4722978938371 -1.0800411216915091E7
- ll2 -67.759559731661 -95.9321343467455
+ ll2 -67.75955973166097 -95.93213434674549
EPSG:6507
ll 17.46326025790195 -86.34088876436846
- en 1853031.2141145275 -4367827.190486656
- ll2 17.463260257899375 -86.34088876437609
+ en 1853031.2141145277 -4367827.190486658
+ ll2 17.46326025789938 -86.34088876437609
EPSG:6508
ll -81.5654879449386 -97.36730152031289
- en 375585.9703807946 -1.1363333979391085E7
+ en 375585.97038079443 -1.1363333979391085E7
ll2 -81.56548794452293 -97.3673014372062
EPSG:6509
ll -18.531102539557267 -95.8165722204024
en 120378.87573574402 -5323023.614343214
- ll2 -18.531102539164173 -95.81657222035075
+ ll2 -18.531102539164166 -95.81657222035075
EPSG:6510
ll -55.97314187298594 -82.21628153990031
en 3957123.866387667 -3.1166547503864557E7
- ll2 -55.973141848321596 -82.21628162822094
+ ll2 -55.97314184832158 -82.21628162822094
EPSG:6511
ll 6.213897401419274 -99.21978619309088
en -245309.47939563508 -3274959.6919914703
@@ -16486,12 +16494,12 @@ EPSG:6513
ll2 -56.28402820017289 -88.142544180838
EPSG:6514
ll 73.56626343453306 -139.82838202557156
- en -480172.08001742046 3610301.412102582
+ en -480172.08001741907 3610301.41210258
ll2 73.56626343453307 -139.82838202557156
EPSG:6515
ll 27.799331887533576 -27.094513531830984
- en 2.510746786605523E7 7326208.655478048
- ll2 27.799331887533583 -27.094513531830998
+ en 2.510746786605523E7 7326208.655478061
+ ll2 27.799331887533558 -27.094513531830984
EPSG:6516
ll 66.89493490927636 -26.365700526576262
en 3719933.842339002 4582416.14189247
@@ -16503,42 +16511,42 @@ EPSG:6518
EPSG:6519
ll 10.071000671081265 -112.92230765653001
en 2987773.011821815 1.0726593151707375E7
- ll2 10.071000671060398 -112.9223076567617
+ ll2 10.071000671060396 -112.9223076567617
EPSG:6520
ll 53.47289885321999 -114.44653548963011
en 275475.93936359667 1.0080784972546652E7
ll2 53.47289885321976 -114.44653548963001
EPSG:6521
ll -54.31506107179667 -121.59131684039508
- en -625748.8581565063 -6179519.7040293915
- ll2 -54.31506106740839 -121.59131683540468
+ en -625748.8581565063 -6179519.704029386
+ ll2 -54.31506106740837 -121.59131683540468
EPSG:6522
ll -30.09075357459087 -111.71431382095658
en 1462890.0769307981 -3196297.2491276134
ll2 -30.090753571160203 -111.71431381710664
EPSG:6523
ll 55.4660263797588 -114.18254981983229
- en 3537476.936974519 2.0704790521396574E7
- ll2 55.46602637908047 -114.18254982009384
+ en 3537476.936974518 2.0704790521396577E7
+ ll2 55.466026379080475 -114.18254982009384
EPSG:6524
ll -24.9887013857947 -68.76424818363972
- en 593097.6027355734 -7474867.3307014825
- ll2 -24.988701385782697 -68.76424818361568
+ en 593097.6027355734 -7474867.330701483
+ ll2 -24.98870138578269 -68.76424818361568
EPSG:6525
ll -59.892422387300776 -71.08337679263038
en 1091375.1738170702 -3.723427223944867E7
- ll2 -59.89242238730079 -71.08337679263038
+ ll2 -59.89242238730078 -71.08337679263038
EPSG:6526
ll 84.80687374693508 -66.77293501870737
- en 227876.15864965512 5126664.769660603
- ll2 84.80687374700021 -66.77293511526594
+ en 227876.15864965512 5126664.769660602
+ ll2 84.80687374700021 -66.77293511526595
EPSG:6527
ll -38.4186137381825 -79.46464064809743
en -930599.5436944881 -2.8099686920431893E7
- ll2 -38.418613737261026 -79.46464064865171
+ ll2 -38.41861373726102 -79.46464064865171
EPSG:6528
ll 43.25310459931458 -113.83049121242564
- en -115624.10592382227 1387718.6117447594
+ en -115624.1059238225 1387718.6117447594
ll2 43.25310458506469 -113.83049119465012
EPSG:6529
ll 84.95519073602259 -116.07834744307908
@@ -16550,31 +16558,31 @@ EPSG:6530
ll2 -14.15669853612123 -108.56917852794503
EPSG:6531
ll 78.31550335264677 -112.89220288709441
- en -91538.96486514578 1.7321959462937295E7
- ll2 78.31550335031538 -112.89220265435594
+ en -91538.96486514511 1.73219594629373E7
+ ll2 78.3155033503154 -112.89220265435594
EPSG:6532
ll 47.75747638199337 -100.81753273350317
en 1355834.246259178 1884222.9653112544
- ll2 47.757476371488515 -100.8175327468793
+ ll2 47.75747637148852 -100.8175327468793
EPSG:6533
ll -74.01810849519185 -109.40999099681997
en 2564084.449509716 -3.821511393086676E7
ll2 -74.01810849519148 -109.40999099681993
EPSG:6534
ll -37.93509545168933 -73.61923004599163
- en 510586.12912755925 -8633429.486566342
- ll2 -37.93509545164854 -73.61923004594699
+ en 510586.12912755925 -8633429.486566344
+ ll2 -37.93509545164856 -73.61923004594699
EPSG:6535
ll 13.499731980437133 -79.60101632467118
en -252034.77031632414 -9627072.399809752
ll2 13.499731980430507 -79.60101632462292
EPSG:6536
ll 84.60044274815453 -75.55097581904246
- en 138955.78986784795 5098474.995702838
+ en 138955.78986784795 5098474.995702837
ll2 84.60044274815453 -75.55097581904246
EPSG:6537
ll 46.82408132800833 -83.144372039642
- en -1671193.2235558096 3031517.6396199767
+ en -1671193.2235558096 3031517.639619972
ll2 46.82408129414435 -83.14437194451642
EPSG:6538
ll 13.2196493963595 -98.73857990918742
@@ -16590,11 +16598,11 @@ EPSG:6540
ll2 66.74054386640381 -69.35682726152223
EPSG:6541
ll -7.913914066686985 -70.66197061752656
- en 4022668.462040317 -1.7430107207883E7
+ en 4022668.4620403172 -1.7430107207883E7
ll2 -7.913914064001065 -70.66197064491992
EPSG:6542
ll 53.31400177889954 -104.98668011574527
- en -1199422.3741615058 2447823.129700754
+ en -1199422.3741615063 2447823.129700754
ll2 53.31400177889956 -104.98668011574527
EPSG:6543
ll 86.11759586086409 -41.61749699046429
@@ -16602,15 +16610,15 @@ EPSG:6543
ll2 86.11759586086411 -41.61749699046429
EPSG:6544
ll 55.350665645302286 -44.1733146973979
- en 3890338.72847719 2191453.2843754534
- ll2 55.350665645302385 -44.17331469739789
+ en 3890338.728477193 2191453.28437545
+ ll2 55.350665645302385 -44.173314697397885
EPSG:6545
ll 34.483154778172896 -128.2159842818429
- en -6421586.49248004 -3077693.618894363
+ en -6421586.492480033 -3077693.6188943656
ll2 34.48315477817308 -128.2159842818429
EPSG:6546
ll 30.8369824159684 -75.09781372250552
- en 3075481.9935280983 -1264135.5845619095
+ en 3075481.9935280983 -1264135.584561911
ll2 30.8369824159684 -75.09781372250552
EPSG:6547
ll 38.65086089622168 -78.29497622517107
@@ -16618,36 +16626,36 @@ EPSG:6547
ll2 38.650860896221765 -78.29497622517107
EPSG:6548
ll 10.064238972196186 -61.581134152768925
- en 3195588.893884236 -3127737.2048053085
- ll2 10.064238972196218 -61.581134152768925
+ en 3195588.8938842416 -3127737.2048053085
+ ll2 10.064238972196218 -61.58113415276892
EPSG:6549
ll -13.49767520064413 -112.72003507501945
- en -1.3985256488894407E7 -1.9626311296340283E7
- ll2 -13.4976752006441 -112.72003507501944
+ en -1.3985256488894457E7 -1.9626311296340294E7
+ ll2 -13.497675200644101 -112.72003507501947
EPSG:6550
ll 20.3059409919219 -120.51683945078705
- en -3458880.4929647776 -1131351.481990411
- ll2 20.305940991921915 -120.51683945078705
+ en -3458880.492964779 -1131351.481990411
+ ll2 20.3059409919219 -120.51683945078705
EPSG:6551
ll 47.580660898403465 -29.9395727660648
- en 1.4351456763590286E7 7211415.605450219
- ll2 47.58066089840345 -29.9395727660648
+ en 1.4351456763590282E7 7211415.605450217
+ ll2 47.58066089840345 -29.939572766064806
EPSG:6552
ll 68.80501803795408 -98.39177759142844
- en 580417.2869102564 4011449.934745702
+ en 580417.2869102565 4011449.9347456936
ll2 68.80501803795408 -98.39177759142844
EPSG:6553
ll -23.35518218869101 -41.8145780781623
- en 3.1802952833734643E7 -1.6583274775107738E7
+ en 3.1802952833734777E7 -1.658327477510769E7
ll2 -23.355182188690993 -41.8145780781623
EPSG:6554
ll 31.06376111869144 -61.68316951076005
en 3997883.7139201127 366041.40232791373
- ll2 31.063761118691467 -61.68316951076005
+ ll2 31.06376111869147 -61.68316951076005
EPSG:6555
ll 72.15807769266148 -118.82792456534156
- en -1172259.7213222648 1.5832529900369138E7
- ll2 72.15807769266145 -118.82792456534156
+ en -1172259.7213222617 1.5832529900369149E7
+ ll2 72.1580776926615 -118.82792456534156
EPSG:6556
ll -3.087176543368429 -148.52151877886493
en -3746259.772511066 -4839524.976072454
@@ -16658,12 +16666,12 @@ EPSG:6557
ll2 25.022693052454404 -137.59124493876686
EPSG:6558
ll 77.3442431429903 -77.16879160255542
- en 3779949.7718260176 4364502.819111176
- ll2 77.3442431429903 -77.1687916025554
+ en 3779949.7718260167 4364502.819111175
+ ll2 77.3442431429903 -77.16879160255542
EPSG:6559
ll 39.943912527327484 -114.60995396435322
en 9858649.579975182 -1298536.3558243774
- ll2 39.943912527327555 -114.60995396435322
+ ll2 39.94391252732755 -114.60995396435322
EPSG:6560
ll 46.67799065680991 -123.18298614244296
en 1294384.8277179606 560337.4575061483
@@ -16675,47 +16683,47 @@ EPSG:6561
EPSG:6562
ll 6.227630590130104 -102.43277077144896
en -2598206.8210175573 -3537410.8106091735
- ll2 6.2276305901301265 -102.43277077144896
+ ll2 6.227630590130127 -102.43277077144896
EPSG:6563
ll 75.27717274550437 -59.142314638575755
en 4185322.1420838083 1.4051430881846266E7
ll2 75.27717274550437 -59.14231463857575
EPSG:6564
ll 64.81192826794594 -146.00409033630052
- en -2670314.2772713862 4261963.345552253
- ll2 64.81192826794592 -146.00409033630052
+ en -2670314.2772714067 4261963.345552255
+ ll2 64.81192826794593 -146.00409033630052
EPSG:6565
ll -17.43518433264078 -141.87853238023678
- en -3.083168697478874E7 -1.1951568637617562E7
+ en -3.0831686974788588E7 -1.1951568637617659E7
ll2 -17.435184332640766 -141.87853238023678
EPSG:6566
ll 49.19063955748692 -37.37128306317638
- en 2688061.5686946777 4066356.8159847055
- ll2 49.19063955748692 -37.371283063176385
+ en 2688061.5686946656 4066356.8159847055
+ ll2 49.19063955748691 -37.37128306317638
EPSG:6567
ll -12.383408749378773 -80.80553930227072
- en -916026.2736264246 -5937099.218369106
- ll2 -12.383408738275172 -80.80553924428324
+ en -916026.2736264246 -5937099.218369107
+ ll2 -12.383408738275177 -80.80553924428324
EPSG:6568
ll -28.76709202399885 -80.79224765659174
en -2656139.815876065 -2.5488571827788904E7
- ll2 -28.767092006236002 -80.79224764863379
+ ll2 -28.767092006236 -80.79224764863379
EPSG:6569
ll 7.549466624155741 -29.32441068645835
- en 6637027.218300118 -1246464.354044071
- ll2 7.549466624155768 -29.32441068645835
+ en 6637027.21830012 -1246464.354044071
+ ll2 7.549466624155742 -29.32441068645835
EPSG:6570
ll -20.234210112368622 1.350700353038036
- en 4.0697107847236186E7 -5715124.7290620385
- ll2 -20.234210112368608 1.350700353038036
+ en 4.069710784723619E7 -5715124.729062029
+ ll2 -20.234210112368597 1.350700353038036
EPSG:6571
ll 52.64797320152891 -39.572238167986484
- en 4354793.852560986 2452903.924506236
- ll2 52.64797320152891 -39.57223816798648
+ en 4354793.85256099 2452903.9245062317
+ ll2 52.647973201528906 -39.57223816798649
EPSG:6572
ll 13.210946338742538 -161.96412394465221
- en -2.094169498730805E7 -2479106.0011220803
- ll2 13.210946338742552 -161.96412394465221
+ en -2.0941694987308018E7 -2479106.001122117
+ ll2 13.210946338742565 -161.96412394465221
EPSG:6573
ll 62.855691975463785 -149.78019314719347
en -1933170.6695907596 3106293.2015057956
@@ -16730,28 +16738,28 @@ EPSG:6575
ll2 58.08068982788264 -65.40433850999811
EPSG:6576
ll 51.66150935426613 -34.78209459161556
- en 1.3543914702712053E7 9494481.459855346
- ll2 51.661509354266116 -34.78209459161555
+ en 1.3543914702712053E7 9494481.459855348
+ ll2 51.66150935426614 -34.782094591615554
EPSG:6577
ll 45.83666043438009 -27.00575226340723
- en 6185562.0890159905 6690461.132047455
+ en 6185562.0890159905 6690461.132047454
ll2 45.83666043438011 -27.00575226340723
EPSG:6578
ll 77.02897090553843 -66.81795940080735
- en 6828944.9842035035 3.0593464676631074E7
- ll2 77.02897090553842 -66.81795940080735
+ en 6828944.984203499 3.059346467663109E7
+ ll2 77.02897090553844 -66.81795940080735
EPSG:6579
ll -16.133325692503647 59.57117649203889
- en 1.6707217079333391E7 1.6005629629845746E7
+ en 1.6707217079333391E7 1.6005629629845748E7
ll2 -16.13332569250366 59.57117649203889
EPSG:6580
ll -20.908775566246 -79.05597389140104
- en 4727147.537608981 166853.0045570014
- ll2 -20.90877556624597 -79.05597389140104
+ en 4727147.537608982 166853.0045570014
+ ll2 -20.908775566245968 -79.05597389140104
EPSG:6581
ll -2.5537785407044353 -34.20884238302594
en 8687328.071094831 -346289.5188319592
- ll2 -2.5537785407043936 -34.208842383025925
+ ll2 -2.5537785407043936 -34.20884238302594
EPSG:6582
ll 13.739918467329616 -82.12527706149211
en 7961244.310498618 -3544660.575370114
@@ -16766,7 +16774,7 @@ EPSG:6584
ll2 83.3001370593809 -86.4563680633422
EPSG:6585
ll -1.4717593208114579 -121.289943509686
- en -2538421.1267491076 2125754.08748032
+ en -2538421.126749107 2125754.08748032
ll2 -1.4717593208114252 -121.289943509686
EPSG:6586
ll 25.46740605582189 -155.78032157440046
@@ -16774,8 +16782,8 @@ EPSG:6586
ll2 25.467406055821908 -155.7803215744005
EPSG:6587
ll 70.42068970790882 -103.87485365592828
- en 339429.77345846186 9275878.502782557
- ll2 70.4206897079088 -103.87485365592828
+ en 339429.773458462 9275878.50278256
+ ll2 70.42068970790882 -103.87485365592828
EPSG:6588
ll 0.19401197993239094 -21.082016339010863
en 3.181438046163889E7 1.2965915118068099E7
@@ -16783,7 +16791,7 @@ EPSG:6588
EPSG:6589
ll -8.94556937634836 -72.99805172121086
en 445228.37717338477 -5696239.706074756
- ll2 -8.945569376348363 -72.99805172121084
+ ll2 -8.945569376348356 -72.99805172121084
EPSG:6590
ll -74.81804301443528 -66.95822166476492
en 2171391.062873722 -4.271940127752791E7
@@ -16794,20 +16802,20 @@ EPSG:6591
ll2 58.53384660229315 -88.32188450965693
EPSG:6592
ll 16.011148329261623 -151.92686185138896
- en -4075679.8491491554 2740235.893058567
- ll2 16.011148329261623 -151.926861851389
+ en -4075679.8491491554 2740235.8930585654
+ ll2 16.011148329261626 -151.926861851389
EPSG:6593
ll 57.657730872409864 -70.3846745631787
- en 1.3172834561957935E7 1.4070452900949012E7
+ en 1.3172834561957935E7 1.4070452900949003E7
ll2 57.65773087240987 -70.3846745631787
EPSG:6594
ll 82.99388519156436 -70.77384453428924
- en 3692651.959475802 7128007.278737873
- ll2 82.99388519156435 -70.77384453428924
+ en 3692651.9594758037 7128007.278737896
+ ll2 82.99388519156435 -70.77384453428925
EPSG:6595
ll 86.04800885907278 -149.73468798203965
- en 7743435.252326367 2.7114082584979016E7
- ll2 86.04800885907284 -149.7346879820397
+ en 7743435.2523263125 2.711408258497913E7
+ ll2 86.04800885907284 -149.73468798203965
EPSG:6596
ll 27.831785508592517 -144.07747992293864
en -1887305.310842304 -1808272.852657451
@@ -16818,48 +16826,48 @@ EPSG:6597
ll2 27.33216347530406 -85.85850379906049
EPSG:6598
ll 80.55245794528335 -136.8867932683446
- en 101581.32930256508 4293859.320506565
+ en 101581.32930256432 4293859.320506568
ll2 80.55245794528334 -136.8867932683446
EPSG:6599
ll 49.27408044504823 -166.77330921595365
- en -8794970.661268702 4589568.568821415
- ll2 49.27408044504824 -166.77330921595365
+ en -8794970.661268706 4589568.568821411
+ ll2 49.274080445048234 -166.77330921595365
EPSG:6600
ll 83.2153509318276 -119.97397459020326
- en -297708.4865769121 5981880.49607899
- ll2 83.21535093182759 -119.97397459020326
+ en -297708.486576917 5981880.496079001
+ ll2 83.21535093182761 -119.97397459020326
EPSG:6601
ll -13.564707455835887 -96.88776700993937
- en -7168493.1858535055 -2.0902610703338463E7
- ll2 -13.564707455835844 -96.88776700993937
+ en -7168493.185853482 -2.0902610703338444E7
+ ll2 -13.564707455835858 -96.88776700993937
EPSG:6602
ll 41.57863071923563 -17.98122720687536
- en 5468043.143453247 2230371.41701418
- ll2 41.57863071923568 -17.981227206875367
+ en 5468043.143453247 2230371.417014181
+ ll2 41.57863071923571 -17.981227206875346
EPSG:6603
ll 88.11214633317573 -137.41614860485063
en 84939.56526659141 2.436754907491307E7
- ll2 88.11214633317562 -137.41614860485063
+ ll2 88.11214633317563 -137.41614860485066
EPSG:6605
ll 12.929435886384862 -70.01472805627454
- en 1.0066946074617036E7 -1.0808250881153418E7
- ll2 12.92943588638488 -70.01472805627454
+ en 1.0066946074617032E7 -1.0808250881153414E7
+ ll2 12.92943588638488 -70.01472805627452
EPSG:6606
ll 69.89577691616729 -65.50874646368048
- en 1631684.8495081759 3005847.458285191
+ en 1631684.8495081733 3005847.4582851883
ll2 69.89577691616729 -65.50874646368048
EPSG:6607
ll 25.0750576389814 -65.47394930336128
- en 1.0467327129118593E7 -6154010.400650389
- ll2 25.075057638981416 -65.47394930336128
+ en 1.0467327129118605E7 -6154010.400650391
+ ll2 25.075057638981388 -65.47394930336128
EPSG:6608
ll 79.06597878589949 -41.13226743619134
en 1930949.9090332026 4905317.2749865595
- ll2 79.0659787858995 -41.132267436191356
+ ll2 79.0659787858995 -41.13226743619135
EPSG:6609
ll 72.35082714441646 -141.33597077740248
en -4387633.816826862 1.3685481726496758E7
- ll2 72.35082714441646 -141.33597077740248
+ ll2 72.35082714441646 -141.3359707774025
EPSG:6610
ll -16.841354579158548 -88.84854840285975
en 642673.8038260298 -6342362.189176467
@@ -16886,8 +16894,8 @@ EPSG:6615
ll2 -78.00047602869036 -114.51010572817611
EPSG:6616
ll -42.95087845516341 -101.43987254347479
- en 4939297.359972786 -3.0111937687759493E7
- ll2 -42.95087842564834 -101.43987261072776
+ en 4939297.359972786 -3.0111937687759496E7
+ ll2 -42.950878425648355 -101.43987261072776
EPSG:6617
ll 64.07816125306351 -111.58188524681086
en 461861.51682517026 2626425.8435048256
@@ -16895,7 +16903,7 @@ EPSG:6617
EPSG:6618
ll -55.10301181843119 -101.69680969219124
en 3444163.1746266093 -3.48287973433059E7
- ll2 -55.10301180728377 -101.69680971550292
+ ll2 -55.103011807283764 -101.69680971550292
EPSG:6619
ll 39.725864710305636 -154.37418078675273
en -3036283.464697706 3018751.511470197
@@ -16918,8 +16926,8 @@ EPSG:6623
ll2 -70.12026794790016 -34.43336166133316
EPSG:6624
ll -54.51001526692251 -4.0030579480078075
- en 1.0677990752566695E7 -2786747.8178774514
- ll2 -54.51001526692274 -4.003057948007808
+ en 1.0677990752566697E7 -2786747.8178774514
+ ll2 -54.51001526692287 -4.003057948007808
EPSG:6625
ll -17.586925210314448 -91.78892049203859
en 1.2499798375248829E7 -1.6251635168277567E7
@@ -16930,11 +16938,11 @@ EPSG:6626
ll2 -9.294320707386953 -108.28063314459915
EPSG:6627
ll 22.965371364330416 -161.62260680733354
- en -1.4942983414422352E7 9355552.769565998
- ll2 22.96537136433043 -161.62260680733354
+ en -1.4942983414422344E7 9355552.769565992
+ ll2 22.965371364330426 -161.6226068073335
EPSG:6628
ll 19.14377643392062 -158.6951424264339
- en 163740.49910644762 37439.37845995598
+ en 163740.49910644762 37439.37845995563
ll2 19.143776433907234 -158.6951424264275
EPSG:6629
ll 43.65958423889282 -157.76421041231515
@@ -16947,135 +16955,135 @@ EPSG:6630
EPSG:6631
ll 89.03266388425288 -165.7328492873841
en 488270.2339558585 7479138.350860923
- ll2 89.03266388425831 -165.7328492734519
+ ll2 89.03266388425831 -165.73284927345193
EPSG:6632
ll 46.47472964179178 -151.58054757360182
- en 1159266.1099927155 2787912.2921232586
- ll2 46.4747296094878 -151.58054766034874
+ en 1159266.1099927155 2787912.292123258
+ ll2 46.474729609487795 -151.58054766034874
EPSG:6633
ll 10.15200926950493 -166.20728723296787
- en -1319974.2750068537 -3961277.4011210054
- ll2 10.152009265386784 -166.20728720385432
+ en -1319974.2750068537 -3961277.401121005
+ ll2 10.152009265386786 -166.20728720385432
EPSG:6634
ll -45.96674402874367 -150.59080921506416
en 1151450.010439422 -5124844.450029824
ll2 -45.96674400041175 -150.59080928305454
EPSG:6635
ll 69.46527642845538 -149.13495727414772
- en 651220.4338792012 7711022.638520758
+ en 651220.4338792011 7711022.6385207595
ll2 69.46527642831497 -149.13495727430353
EPSG:6636
ll 15.719076416361986 -172.2822501365423
en 362610.1481426006 1.1738278131252164E7
- ll2 15.719076416361952 -172.28225013654185
+ ll2 15.719076416361954 -172.28225013654185
EPSG:6637
ll 11.490441129151165 153.50609525766853
- en 1058779.4580553193 -7631.31079190204
- ll2 11.490441122168287 153.50609521716245
+ en 1058779.4580553193 -7631.310791902215
+ ll2 11.490441122168283 153.50609521716245
EPSG:6646
ll -87.1961077844455 44.040956888066354
- en 786860.1448654786 -1.2892996890196165E7
- ll2 -87.19610788049104 44.04095266287756
+ en 786860.1448654787 -1.2892996890196165E7
+ ll2 -87.19610788049104 44.04095266287759
EPSG:6649
ll 50.46726971949798 26.028387328902255
- en 26.02838732890225 50.46726972042388
- ll2 50.46726971949816 26.02838732890226
+ en 26.02838732890226 50.46726972042389
+ ll2 50.46726971949817 26.028387328902255
EPSG:6650
ll 77.1720303790573 -131.54604528541245
- en 733355.7529506186 8584789.097655185
- ll2 77.17203037467758 -131.54604585411823
+ en 733355.7529506193 8584789.097655185
+ ll2 77.17203037467759 -131.54604585411815
EPSG:6651
ll -89.29299133974624 -131.24524735916248
- en 505169.1293605856 -9919197.381551145
- ll2 -89.2929913397463 -131.24524735930578
+ en 505169.12936058553 -9919197.381551147
+ ll2 -89.29299133974634 -131.24524735930567
EPSG:6652
ll 43.53951711428644 -121.85585886315921
- en 1077262.0554325976 4845587.793073591
- ll2 43.539517104046105 -121.85585887283933
+ en 1077262.0554325953 4845587.793073589
+ ll2 43.539517104046105 -121.85585887283935
EPSG:6653
ll -68.98211887682996 -132.24957788638156
en 130966.48438899888 -7680250.230778536
- ll2 -68.98211885480072 -132.2495774733426
+ ll2 -68.9821188548007 -132.24957747334255
EPSG:6654
ll 89.27705143516596 -119.06248710188227
en 497095.1313686781 9917300.568663022
- ll2 89.27705143516603 -119.06248710188162
+ ll2 89.27705143516603 -119.06248710188163
EPSG:6655
ll 21.00970843212444 -116.29717488684265
en -51080.73537228769 2332373.5226166015
- ll2 21.009708431763542 -116.29717488722528
+ ll2 21.009708431763542 -116.29717488722525
EPSG:6656
ll -28.1624489128195 -109.78182563628948
- en 30241.414696791733 -3124463.724210126
- ll2 -28.162448912487022 -109.7818256369218
+ en 30241.414696793072 -3124463.724210126
+ ll2 -28.162448912487022 -109.78182563692178
EPSG:6657
ll 14.131803185987323 -101.72412283296552
- en 205890.02627134195 1564011.1554384292
- ll2 14.131803185983692 -101.7241228329397
+ en 205890.02627134346 1564011.1554384292
+ ll2 14.131803185983692 -101.72412283293968
EPSG:6658
ll -21.34789712399497 -94.96113171155959
en 296628.54974484915 -2361918.512520201
- ll2 -21.347897123994088 -94.96113171155983
+ ll2 -21.34789712399409 -94.96113171155982
EPSG:6659
ll 79.97402991568978 -96.79617184641454
- en 310476.8413811755 8894682.982282832
- ll2 79.97402991557901 -96.79617103694596
+ en 310476.8413811758 8894682.982282832
+ ll2 79.974029915579 -96.79617103694596
EPSG:6660
ll 79.84654455593878 -86.1667617549043
- en 398447.0679180107 8868968.331145678
- ll2 79.84654455581689 -86.16676175246407
+ en 398447.06791801075 8868968.33114568
+ ll2 79.84654455581692 -86.16676175246408
EPSG:6661
ll -23.338270477248912 -80.128241249296
- en -24715.212116883253 -2590286.637038721
- ll2 -23.33827047690473 -80.12824124988595
+ en -24715.212116883253 -2590286.6370387217
+ ll2 -23.33827047690474 -80.12824124988595
EPSG:6662
ll -19.75591231376427 -73.27737517810532
en 51554.98804579786 -2190136.3972950615
- ll2 -19.755912313677886 -73.27737517814076
+ ll2 -19.755912313677882 -73.27737517814076
EPSG:6663
ll -36.89901421505392 -60.97831967861762
- en 680129.29978746 -4085578.288846278
- ll2 -36.899014215050094 -60.97831967861179
+ en 680129.29978746 -4085578.2888462795
+ ll2 -36.8990142150501 -60.97831967861179
EPSG:6664
ll 23.85774921907492 -60.47652732856943
- en 145863.8675661016 2642826.7239262927
- ll2 23.85774921904211 -60.47652732862876
+ en 145863.8675661016 2642826.7239262937
+ ll2 23.857749219042116 -60.47652732862876
EPSG:6665
ll -69.61855360745102 -46.7686768800998
- en 664350.0363289288 -7729028.103445565
- ll2 -69.6185536072148 -46.76867688045346
+ en 664350.0363289285 -7729028.103445565
+ ll2 -69.6185536072148 -46.76867688045347
EPSG:6668
ll -68.56041172947585 122.39476348734883
en 122.39476348734883 -68.56041172947585
ll2 -68.56041172947585 122.39476348734884
EPSG:6669
ll -28.18021494969043 135.36349867478305
- en 576285.490074302 -6784441.223455561
- ll2 -28.180214948548436 135.3634986767193
+ en 576285.490074302 -6784441.223455563
+ ll2 -28.180214948548443 135.3634986767193
EPSG:6670
ll 49.6420500755099 125.16773354002359
- en -421085.29072426545 1864458.2362083804
- ll2 49.64205007184984 125.16773354251649
+ en -421085.29072426545 1864458.236208379
+ ll2 49.64205007184983 125.16773354251649
EPSG:6671
ll -8.072430130125397 140.02635241367557
- en 868876.1861486412 -4886125.378708805
- ll2 -8.072430127543779 140.0263523880203
+ en 868876.1861486413 -4886125.378708805
+ ll2 -8.07243012754378 140.0263523880203
EPSG:6672
ll 78.9600157088328 141.04994782432044
- en 161014.83264802766 5126187.834357838
+ en 161014.83264802766 5126187.834357837
ll2 78.96001570766312 141.04994774936722
EPSG:6673
ll 16.013167458440236 132.38561814718656
- en -208472.26674879517 -2213243.1480465424
+ en -208472.26674879517 -2213243.148046542
ll2 16.01316745843972 132.38561814719
EPSG:6674
ll 26.860384758056725 139.1860209380981
- en 316683.33686494344 -1009299.8721574206
+ en 316683.3368649435 -1009299.8721574206
ll2 26.860384758031582 139.18602093815142
EPSG:6675
ll 44.17803455251416 128.76242065225773
- en -672052.1306494188 942446.1427786449
- ll2 44.178034525958736 128.76242070967228
+ en -672052.1306494188 942446.1427786456
+ ll2 44.17803452595875 128.76242070967228
EPSG:6676
ll -37.63065226017573 147.44938300897894
en 790710.4784224964 -8189110.06174266
@@ -17086,7 +17094,7 @@ EPSG:6677
ll2 -63.85641543937088 140.50096600547397
EPSG:6678
ll -11.124217227107778 145.7130427141238
- en 533615.0439324572 -5663561.412498548
+ en 533615.0439324571 -5663561.412498548
ll2 -11.124217226981445 145.71304271320585
EPSG:6679
ll -23.354495208584254 148.01623526431504
@@ -17102,20 +17110,20 @@ EPSG:6681
ll2 15.05833841832342 136.98257287066576
EPSG:6682
ll 69.29512572516128 137.74369992246022
- en -167877.39588774025 4818866.91124135
+ en -167877.39588774013 4818866.911241351
ll2 69.295125724907 137.74369992283093
EPSG:6683
ll 17.463748670068497 127.54985487834742
- en 5295.079539035494 -945108.3053476383
+ en 5295.079539035494 -945108.3053476387
ll2 17.463748670068494 127.54985487834742
EPSG:6684
ll -47.71757687664171 121.30311774050645
- en -202324.5374730784 -8166567.936585847
- ll2 -47.717576876606365 121.30311774049285
+ en -202324.53747307847 -8166567.936585847
+ ll2 -47.71757687660636 121.30311774049285
EPSG:6685
ll 54.55178692042921 121.0246905303702
en -644313.3078568993 3216069.9000313915
- ll2 54.55178684269675 121.02469108456579
+ ll2 54.55178684269676 121.02469108456579
EPSG:6686
ll -68.43123484987436 141.57862327289104
en 228670.7804751211 -9815730.812635124
@@ -17126,7 +17134,7 @@ EPSG:6687
ll2 -85.45477515621953 149.12990172655023
EPSG:6688
ll 17.834408271039322 122.76520759728959
- en 475121.10783291626 1971880.884391348
+ en 475121.10783291626 1971880.8843913483
ll2 17.834408271039326 122.76520759728959
EPSG:6689
ll -63.237226424682376 130.08963191773282
@@ -17146,75 +17154,75 @@ EPSG:6692
ll2 71.92505093286007 145.82985598250966
EPSG:6696
ll -44.51464003120027 -143.3676447281721
- en -143.36764472817214 -44.51464003214344
- ll2 -44.51464003120035 -143.36764472817214
+ en -143.36764472817217 -44.51464003214344
+ ll2 -44.514640031200365 -143.3676447281722
EPSG:6697
ll -50.674410379137136 -111.76226114428563
en -111.76226114428563 -50.674410379137136
ll2 -50.674410379137136 -111.76226114428563
EPSG:6700
ll 4.809334169704371 -27.11104610348582
- en -27.11451538657419 4.802828161790749
- ll2 4.809335240507819 -27.111045536277622
+ en -27.11451538657419 4.80282816179075
+ ll2 4.80933524050782 -27.111045536277622
EPSG:6703
ll -69.64534651768147 -58.501591758294985
- en 558161.9359446126 2272963.0090049915
+ en 558161.9359446126 2272963.0090049906
ll2 -69.64534651768102 -58.501591758295
EPSG:6706
ll -32.5289504346152 -41.69385674976269
- en -41.69385674976269 -32.52895043547106
+ en -41.69385674976269 -32.52895043547107
ll2 -32.5289504346152 -41.69385674976269
EPSG:6707
ll 51.6961126523818 5.071327300475398
- en 228521.28874313098 5734548.804792835
- ll2 51.69611265202924 5.071327300499383
+ en 228521.2887431311 5734548.804792836
+ ll2 51.69611265202925 5.071327300499383
EPSG:6708
ll 38.08669800649628 6.639140011405309
en -233818.5274576001 4248594.251979532
- ll2 38.08669798758819 6.639140035012249
+ ll2 38.08669798758819 6.63914003501225
EPSG:6709
ll -63.94914284557444 15.906770787852611
- en 250628.4988048452 -7101313.842550056
- ll2 -63.94914284441261 15.906770789510423
+ en 250628.49880484506 -7101313.842550054
+ ll2 -63.949142844412584 15.906770789510425
EPSG:6720
ll 58.80055821429647 107.28694215240205
en 146068.48859478452 7821800.991665149
- ll2 58.800558214294625 107.28694215240233
+ ll2 58.80055821429463 107.28694215240233
EPSG:6721
ll 11.549897488258054 99.8281526797207
en -583337.1271076214 2583757.089620082
- ll2 11.549897487848686 99.82815268216063
+ ll2 11.549897487848687 99.82815268216065
EPSG:6722
ll 5.579842027407437 96.25213263771981
en -19012.261221985784 2017043.0165541316
ll2 5.579842027407436 96.25213263771984
EPSG:6723
ll -33.9483105551738 99.84838061552328
- en 324906.51110009005 -2261890.543808466
+ en 324906.51110008877 -2261890.543808466
ll2 -33.948310555142676 99.84838061557167
EPSG:6736
ll 19.80275226503214 84.85430196104923
en -355374.5348390072 1.2210351491109103E7
- ll2 19.802752259591546 84.85430196256198
+ ll2 19.802752259591546 84.85430196256196
EPSG:6737
ll -63.637062873767846 104.1072539518519
en 752838.8154631557 2933321.699960106
- ll2 -63.63706287256305 104.10725395016752
+ ll2 -63.63706287256305 104.1072539501675
EPSG:6738
ll -60.582266979922935 176.86435463524484
en 821044.339746231 3269410.2341138357
- ll2 -60.582266976704986 176.86435462987245
+ ll2 -60.582266976704986 176.86435462987242
EPSG:6783
ll 19.060503339936858 -27.147179386465098
- en -27.1471793864651 19.06050333993686
- ll2 19.06050333993686 -27.1471793864651
+ en -27.1471793864651 19.060503339936858
+ ll2 19.060503339936858 -27.1471793864651
EPSG:6784
ll 67.70231911705415 -122.68727223523204
en -165461.9739332201 2591772.126043313
ll2 67.70231911640296 -122.68727223405644
EPSG:6785
ll -71.11317524277162 -116.7932815501515
- en 254575.20539724937 -4.207654828902057E7
+ en 254575.20539724946 -4.207654828902057E7
ll2 -71.11317524277158 -116.7932815501515
EPSG:6786
ll -79.14049230127945 -124.16350182448444
@@ -17230,15 +17238,15 @@ EPSG:6788
ll2 77.1787161893399 -127.34139130000166
EPSG:6789
ll -72.99407276708706 -122.73859520478558
- en 156527.32850831043 -4.1764241386405826E7
- ll2 -72.99407276708702 -122.73859520478558
+ en 156527.32850831051 -4.176424138640583E7
+ ll2 -72.99407276708703 -122.73859520478558
EPSG:6790
ll 87.53224423749498 -124.1909593124176
en 68262.14319230987 5103735.156386111
ll2 87.53224423749498 -124.19095931241469
EPSG:6791
ll 49.043149526669566 -121.67289534961157
- en 280965.0177822298 2659849.4389744126
+ en 280965.0177822298 2659849.438974415
ll2 49.043149526669566 -121.67289534961157
EPSG:6792
ll -7.26187240070267 -57.87666951387199
@@ -17255,7 +17263,7 @@ EPSG:6794
EPSG:6795
ll 48.28675735336993 -175.10868689353407
en -1.1943256343809094E7 5934095.688581923
- ll2 48.286757353369936 -175.10868689353407
+ ll2 48.28675735336993 -175.10868689353407
EPSG:6796
ll 24.296429431963354 -118.36877613637257
en 267836.1510713048 -2126806.9251550077
@@ -17263,7 +17271,7 @@ EPSG:6796
EPSG:6797
ll 87.5015959709879 -53.78607280333571
en 2404050.9778174786 2.0186842308180224E7
- ll2 87.50159597098796 -53.78607280333566
+ ll2 87.50159597098798 -53.78607280333566
EPSG:6798
ll 69.01637609024185 -121.3094348861065
en 49368.29491001231 2996079.170013637
@@ -17274,56 +17282,56 @@ EPSG:6799
ll2 6.758733587420845 -53.89079595165846
EPSG:6800
ll 69.49037918522481 -119.95866354053993
- en 171960.10369011015 3008803.593780265
+ en 171960.10369011015 3008803.5937802647
ll2 69.4903791851626 -119.95866354058566
EPSG:6801
ll 75.5652956140101 -117.64941055968202
- en 649627.0762682771 1.2108646121320799E7
+ en 649627.0762682769 1.2108646121320797E7
ll2 75.56529561343476 -117.64941056520762
EPSG:6802
ll -14.438720594576338 -124.16564298626672
- en -49753.59576400166 -6304666.057113479
+ en -49753.59576400166 -6304666.05711348
ll2 -14.438720594576335 -124.16564298626665
EPSG:6803
ll 57.06091650083354 -121.88827012853342
- en 418892.5601284805 5316807.756535296
- ll2 57.060916500832704 -121.88827012853321
+ en 418892.5601284805 5316807.756535294
+ ll2 57.0609165008327 -121.88827012853321
EPSG:6804
ll 48.19155025790216 -116.40938653058122
- en 454301.08412442985 318555.48606594885
- ll2 48.19155025790214 -116.40938653058122
+ en 454301.0841244299 318555.48606594955
+ ll2 48.19155025790217 -116.40938653058122
EPSG:6805
ll 43.6175185509049 -136.3919965818395
en -3691635.8523972603 -232431.72084364705
ll2 43.61751855090491 -136.3919965818395
EPSG:6806
ll 37.89274443297452 -172.82463754068706
- en -4170004.2809073282 627364.0766040828
- ll2 37.89274443297458 -172.82463754068706
+ en -4170004.2809073282 627364.0766040835
+ ll2 37.8927444329746 -172.82463754068706
EPSG:6807
ll 50.60777035800989 -83.3073818955106
en 8854868.18965754 3880397.3530488615
ll2 50.607770358009894 -83.3073818955106
EPSG:6808
ll 46.62463210910227 -123.74769060374403
- en 111034.5929175457 264638.1149837766
- ll2 46.62463210910222 -123.74769060374408
+ en 111034.59291755408 264638.1149837794
+ ll2 46.62463210910222 -123.74769060374403
EPSG:6809
ll 45.79601071193666 -122.18819770803432
- en 759235.4283779871 566219.8793572242
- ll2 45.79601071193658 -122.18819770803432
+ en 759235.4283780055 566219.8793572396
+ ll2 45.796010711936596 -122.18819770803432
EPSG:6810
ll 46.11646152216381 -124.42452849262837
- en 58189.11088505946 208867.11148427892
- ll2 46.11646152216377 -124.42452849262841
+ en 58189.11088506784 208867.11148428265
+ ll2 46.116461522163746 -124.42452849262835
EPSG:6811
ll 45.07921004835099 -121.79801560891943
- en 862680.593340803 306131.22637351096
- ll2 45.079210048350895 -121.79801560891941
+ en 862680.5933408183 306131.2263735232
+ ll2 45.079210048350895 -121.79801560891943
EPSG:6812
ll 56.93442424289074 -129.44197707236833
- en -321611.0798601621 1585069.5429812449
- ll2 56.9344242382593 -129.44197706563935
+ en -321611.07986016216 1585069.5429812449
+ ll2 56.93442423825929 -129.44197706563935
EPSG:6813
ll 30.993572119169755 -118.29422760625584
en 1744071.2524721797 -4275099.536017301
@@ -17351,23 +17359,23 @@ EPSG:6818
EPSG:6819
ll -5.218546020483373 -127.48095239061034
en -2100022.0296767587 -1.807990757357928E7
- ll2 -5.218546020018054 -127.4809523822018
+ ll2 -5.218546020018055 -127.4809523822018
EPSG:6820
ll -31.27975405275648 -121.42602512844311
en 215765.72771625468 -8309468.344743664
ll2 -31.279754052755486 -121.4260251284407
EPSG:6821
ll 13.989272427395335 -120.39161554308221
- en 1148039.7585404208 -1.081751587261647E7
- ll2 13.989272427391297 -120.39161554311129
+ en 1148039.758540421 -1.0817515872616474E7
+ ll2 13.98927242739129 -120.39161554311129
EPSG:6822
ll -44.06557397329985 -125.1958382877087
en -112576.37463576911 -9729301.944312245
- ll2 -44.06557397329408 -125.19583828771323
+ ll2 -44.065573973294086 -125.19583828771323
EPSG:6823
ll -75.74425557233518 -125.76680388535732
en -70475.32072830445 -4.349681407115818E7
- ll2 -75.74425557232982 -125.7668038853525
+ ll2 -75.7442555723298 -125.7668038853525
EPSG:6824
ll 59.522128900941226 -124.33999989418608
en -6981.132257809157 1977481.3179886297
@@ -17390,24 +17398,24 @@ EPSG:6828
ll2 50.44300518122115 -125.64290978464611
EPSG:6829
ll 55.920268035185785 -123.41307976660204
- en -188677.47282413507 3987299.255568243
- ll2 55.92026803518563 -123.4130797666021
+ en -188677.47282413504 3987299.2555682454
+ ll2 55.92026803518562 -123.4130797666021
EPSG:6830
ll 18.580243032795366 -123.96318743991517
- en -162063.55481628244 -2929105.532810672
- ll2 18.580243032795156 -123.96318743991446
+ en -162063.5548162824 -2929105.5328106717
+ ll2 18.58024303279516 -123.96318743991446
EPSG:6831
ll 27.545575206146637 -126.28142063223183
- en -1247229.4534247671 -6334429.435473964
- ll2 27.545575206048362 -126.28142063243214
+ en -1247229.4534247676 -6334429.435473962
+ ll2 27.54557520604837 -126.28142063243214
EPSG:6832
ll -21.890079761074986 -115.93059707459358
en 253916.89487040884 -7408976.998985421
- ll2 -21.890079761073824 -115.93059707459271
+ ll2 -21.890079761073828 -115.93059707459271
EPSG:6833
ll -43.61201142375601 -117.9492514136529
en 144676.2280293683 -3.2207792727290835E7
- ll2 -43.61201142375601 -117.9492514136529
+ ll2 -43.612011423756 -117.9492514136529
EPSG:6834
ll -52.71438650580162 -115.03971446577947
en 240056.76355326822 -1.0833301769839678E7
@@ -17418,7 +17426,7 @@ EPSG:6835
ll2 -58.31533926779268 -117.90800623073301
EPSG:6836
ll -28.704212489281865 -118.17340300967821
- en -34674.90283171603 -7968340.615864881
+ en -34674.902831716056 -7968340.615864881
ll2 -28.704212489281776 -118.17340300967847
EPSG:6837
ll 38.144196086854734 -111.19386278922575
@@ -17427,87 +17435,87 @@ EPSG:6837
EPSG:6838
ll -17.7774040965694 -123.38873674125017
en -598662.9008453483 -6769101.231544464
- ll2 -17.777404095538426 -123.38873674059246
+ ll2 -17.777404095538422 -123.38873674059246
EPSG:6839
ll 26.73203982629707 -123.52026038852418
- en -1868764.406961284 -5958213.402244329
- ll2 26.732039824357212 -123.52026039163358
+ en -1868764.4069612846 -5958213.402244329
+ ll2 26.73203982435721 -123.52026039163358
EPSG:6840
ll 45.4983303137031 -124.02347660639194
- en 136816.61633678124 452304.46613487136
+ en 136816.61633677874 452304.46613487136
ll2 45.49833031370305 -124.02347660639194
EPSG:6841
ll 42.11887950263409 -123.60611817453163
- en 562475.8203282312 252328.1489648389
- ll2 42.11887950263395 -123.60611817453162
+ en 562475.8203282222 252328.1489648389
+ ll2 42.11887950263395 -123.60611817453163
EPSG:6842
ll 45.77943548547348 -123.93722673746905
- en 143514.3010102723 483553.45732740685
- ll2 45.77943548547341 -123.93722673746903
+ en 143514.30101026973 483553.4573274059
+ ll2 45.77943548547341 -123.93722673746905
EPSG:6843
ll 43.00134399835363 -124.67910107806455
- en 273768.47263065627 574278.4717453709
- ll2 43.00134399835351 -124.67910107806455
+ en 273768.47263064864 574278.4717453801
+ ll2 43.00134399835353 -124.67910107806456
EPSG:6844
ll -86.37696029347735 -113.94669829119537
- en 96793.92868439524 -1.4612358723080667E7
- ll2 -86.37696029347406 -113.94669829398157
+ en 96793.92868439536 -1.4612358723080665E7
+ ll2 -86.37696029347403 -113.94669829398158
EPSG:6845
ll -84.41071368537345 -125.51099056034337
- en -29134.51154487743 -4.722726684745442E7
- ll2 -84.41071368533306 -125.51099054421375
+ en -29134.51154487743 -4.7227266847454436E7
+ ll2 -84.41071368533312 -125.51099054421381
EPSG:6846
ll -62.76938333230505 -112.79685814774572
- en 384944.1837730452 -1.1992031275614124E7
- ll2 -62.76938332761874 -112.79685815994398
+ en 384944.18377304514 -1.1992031275614126E7
+ ll2 -62.769383327618755 -112.79685815994397
EPSG:6847
ll 43.3260198554529 -118.16351613396722
en 463805.69881830935 -699834.0608693131
- ll2 43.32601985545281 -118.1635161339671
+ ll2 43.32601985545282 -118.1635161339671
EPSG:6848
ll -15.873082816103377 -112.7185491386745
- en 632283.7286207571 -6759075.633063587
- ll2 -15.873082815696629 -112.71854913945997
+ en 632283.7286207571 -6759075.633063588
+ ll2 -15.873082815696621 -112.71854913945997
EPSG:6849
ll 76.33628442008879 -112.29837139287864
- en 619969.9171012772 1.1452255143474255E7
- ll2 76.3362844193916 -112.2983714024632
+ en 619969.9171012767 1.1452255143474258E7
+ ll2 76.33628441939162 -112.2983714024632
EPSG:6850
ll 1.7065984685473694 -124.18273444651713
- en -622118.7777568357 -4805345.950684728
- ll2 1.7065984684687678 -124.18273444164682
+ en -622118.7777568357 -4805345.950684729
+ ll2 1.7065984684687614 -124.18273444164682
EPSG:6851
ll -55.12432742513707 -115.0513001356979
- en 785360.7242939639 -3.645715836234476E7
- ll2 -55.12432742501922 -115.05130013570268
+ en 785360.724293964 -3.645715836234476E7
+ ll2 -55.1243274250192 -115.05130013570268
EPSG:6852
ll 81.32430881963066 -48.36545865623228
- en 1610399.4703769202 5192586.42117406
- ll2 81.32430881963064 -48.36545865623225
+ en 1610399.4703769148 5192586.421174064
+ ll2 81.32430881963069 -48.365458656232235
EPSG:6853
ll 0.1757909645872484 -66.66356109901412
- en 2.52379199847942E7 -8919753.005337011
- ll2 0.17579096458728413 -66.66356109901412
+ en 2.5237919984794203E7 -8919753.005337005
+ ll2 0.17579096458728413 -66.6635610990141
EPSG:6854
ll 12.148852614926795 -97.45876618709515
- en 3250486.8867897233 -3345310.189153068
- ll2 12.148852614926799 -97.45876618709515
+ en 3250486.8867897224 -3345310.189153068
+ ll2 12.148852614926824 -97.45876618709516
EPSG:6855
ll 62.272151111389576 -117.64541857228764
- en 1241016.6073200747 6415335.629918978
- ll2 62.27215111138957 -117.64541857228764
+ en 1241016.6073200752 6415335.629918978
+ ll2 62.27215111138956 -117.64541857228764
EPSG:6856
ll -27.793486685149155 -116.4573392245827
en 703818.5901955814 -8004176.484290957
- ll2 -27.79348668283321 -116.45733922111975
+ ll2 -27.793486682833205 -116.45733922111975
EPSG:6857
ll -60.32117127940171 -120.5844377335257
en 617006.924758294 -3.806905971515654E7
- ll2 -60.32117127938177 -120.5844377335262
+ ll2 -60.321171279381765 -120.5844377335262
EPSG:6858
ll 7.258988127295098 -121.74648442487472
en 197647.0123498052 -4107983.932574861
- ll2 7.258988127295076 -121.74648442487604
+ ll2 7.258988127295075 -121.74648442487604
EPSG:6859
ll 6.544621003075051 -125.1147582992115
en -573234.0349327842 -1.3736057374751689E7
@@ -17515,7 +17523,7 @@ EPSG:6859
EPSG:6860
ll 50.646953985315605 -128.1915338094784
en -402489.2094761185 745323.5172362961
- ll2 50.64695398211649 -128.191533807308
+ ll2 50.646953982116486 -128.191533807308
EPSG:6861
ll -9.21611764562951 -125.95529769302222
en -1246680.5465474487 -1.9373316023916442E7
@@ -17523,34 +17531,34 @@ EPSG:6861
EPSG:6862
ll -85.55881965231559 -124.41423520404032
en -16555.586293811957 -1.4391510493983833E7
- ll2 -85.55881965231556 -124.41423520404
+ ll2 -85.55881965231555 -124.41423520404
EPSG:6863
ll 16.475895948334596 -118.46562539104592
en 1414526.6147595816 -1.0029329534138327E7
ll2 16.475895948285398 -118.46562539114983
EPSG:6867
ll 44.28666762595499 -94.56531727021031
- en 2435344.512829791 605986.1234685793
+ en 2435344.5128297904 605986.1234685793
ll2 44.28666762595501 -94.56531727021031
EPSG:6868
ll -15.214292745335303 -62.88287784718938
en 3.1762843417729978E7 -1.3602914575221192E7
- ll2 -15.214292745335275 -62.88287784718939
+ ll2 -15.214292745335275 -62.882877847189384
EPSG:6870
ll 55.64009650662106 16.300375421168013
en 267088.40401057515 6174702.936433701
- ll2 55.640096506381866 16.30037542120747
+ ll2 55.64009650638189 16.300375421207466
EPSG:6875
ll -31.161664710542475 21.709950935496384
- en 7926450.90527186 -3484590.4595521633
- ll2 -31.1616646843393 21.709950896193277
+ en 7926450.90527186 -3484590.4595521647
+ ll2 -31.161664684339314 21.709950896193277
EPSG:6876
ll 42.73336076383447 3.6243570947480768
en 2313905.8397136712 4767255.662929331
- ll2 42.73336073929797 3.6243571423533987
+ ll2 42.733360739297986 3.6243571423533987
EPSG:6879
ll 72.93310248936899 -149.0729918190293
- en -1482100.969601462 4193468.965723224
+ en -1482100.9696014652 4193468.9657232254
ll2 72.93310248936899 -149.0729918190293
EPSG:6880
ll -18.0725629420642 -174.57253244171562
@@ -17559,47 +17567,47 @@ EPSG:6880
EPSG:6881
ll -62.39031489582547 -42.12683578182356
en -42.123613797471144 -62.394950515563
- ll2 -62.39031464555805 -42.12683595549251
+ ll2 -62.39031464555808 -42.126835955492524
EPSG:6882
ll 76.84072365203812 51.4724918526189
- en 51.46722874066536 76.84046249863935
+ en 51.46722874066536 76.84046249863934
ll2 76.84072365130304 51.47249183778683
EPSG:6883
ll 82.04859845556967 -13.688449662801645
- en -13.677935119726975 82.04654226513723
- ll2 82.04859828764533 -13.688448803934463
+ en -13.677935119726975 82.04654226513722
+ ll2 82.0485982876453 -13.688448803934467
EPSG:6884
ll 5.669460380426816 -50.122461144079466
- en 1.096185111788243E7 -605198.4398522547
+ en 1.0961851117882429E7 -605198.4398522547
ll2 5.669460380426851 -50.122461144079466
EPSG:6885
ll 54.22364746089731 -154.73024785385348
- en 1000224.5485734972 5414779.3073998615
+ en 1000224.5485735002 5414779.307399866
ll2 54.22364746089731 -154.73024785385348
EPSG:6886
ll 51.5297922622901 -164.39968868929247
en -1441276.81241384 1888793.2731976262
- ll2 51.5297922622901 -164.39968868929247
+ ll2 51.52979226229011 -164.39968868929247
EPSG:6887
ll 66.69578743672447 -132.2638482336628
- en 3036468.2269737106 9558482.40993842
+ en 3036468.22697371 9558482.40993842
ll2 66.69578743672446 -132.2638482336628
EPSG:6892
ll -0.4019656900749595 -164.5395074138744
- en -164.54095945377873 -0.3995941781373359
- ll2 -0.4019656137052489 -164.53950746032137
+ en -164.5409594537787 -0.3995941781373359
+ ll2 -0.4019656137052489 -164.53950746032135
EPSG:6894
ll -52.18671184941831 156.15949345882996
- en 156.16147502329227 -52.19169032904524
- ll2 -52.18671171436805 156.15949340521834
+ en 156.16147502329224 -52.19169032904524
+ ll2 -52.18671171436805 156.1594934052183
EPSG:6915
ll -38.57037545180093 50.24392760710738
- en -88785.67475975072 -4290529.25356005
- ll2 -38.57037544648736 50.24392760962564
+ en -88785.6747597513 -4290529.25356005
+ ll2 -38.57037544648737 50.243927609625636
EPSG:6917
ll 89.79110245342878 26.660667251214306
- en 26.66066725121431 89.79110245342876
- ll2 89.79110245342876 26.66066725121431
+ en 26.66066725121431 89.79110245342878
+ ll2 89.79110245342878 26.66066725121431
EPSG:6922
ll 48.85247161905704 -165.63858000994753
en -4193112.2074174425 3195034.4444951206
@@ -17626,40 +17634,40 @@ EPSG:6931
ll2 -28.834392622243083 -24.03203309859444
EPSG:6932
ll -87.120362127112 -0.361954063170316
- en -2031.6372742902902 321595.20962906786
+ en -2031.6372742902904 321595.20962906786
ll2 -87.12036212511357 -0.361954063170316
EPSG:6956
ll -24.15447218156875 100.05441655354451
- en -197932.40067040463 -2173403.8312930684
- ll2 -24.154472175295236 100.05441654071953
+ en -197932.40067040463 -2173403.831293069
+ ll2 -24.15447217529524 100.05441654071953
EPSG:6957
ll 17.86506205458113 103.50823261125055
- en -158299.38856571898 2476590.5206687395
- ll2 17.86506205053155 103.5082326188618
+ en -158299.38856571898 2476590.5206687404
+ ll2 17.86506205053156 103.5082326188618
EPSG:6958
ll -25.61989370215796 107.1415646563458
- en -86408.0782433103 -2334629.351031819
- ll2 -25.61989369337479 107.14156463598772
+ en -86408.07824331032 -2334629.35103182
+ ll2 -25.619893693374806 107.1415646359877
EPSG:6959
ll 25.36757213712268 108.52558189324554
en 77858.75025725443 3306827.520118067
- ll2 25.367572133224986 108.52558190072716
+ ll2 25.36757213322499 108.52558190072719
EPSG:6962
ll -17.41936431965716 85.66479176576104
- en 1.024351867340975E7 -3608899.940833134
- ll2 -17.419364319657138 85.66479176576102
+ en 1.0243518673409747E7 -3608899.9408331355
+ ll2 -17.41936431965712 85.66479176576104
EPSG:6980
ll -42.12415132464262 -98.62402056763949
- en -98.6240205676395 -42.124151324642625
- ll2 -42.12415132464263 -98.62402056763952
+ en -98.62402056763949 -42.124151324642625
+ ll2 -42.124151324642625 -98.62402056763949
EPSG:6983
ll -48.51130274235646 -10.58337442672564
en -10.58337442672564 -48.51130274235646
ll2 -48.51130274235646 -10.58337442672564
EPSG:6984
ll 36.47387733730332 36.687982626622905
- en 352484.8243358592 1153659.1260700827
- ll2 36.47387733730275 36.68798262662405
+ en 352484.8243358592 1153659.1260700817
+ ll2 36.473877337302746 36.68798262662405
EPSG:6987
ll 24.757512246258173 3.658428265788814
en 3.658428265788814 24.757512246258173
@@ -17670,7 +17678,7 @@ EPSG:6990
ll2 58.57890498410748 61.98910958043811
EPSG:6991
ll 24.427998501064693 30.20905906716918
- en -287500.8122475317 -173648.09677921387
+ en -287500.8122475317 -173648.09677921457
ll2 24.42799850074725 30.209059066572
EPSG:7005
ll -61.756758127775484 33.600270958759346
@@ -17682,32 +17690,32 @@ EPSG:7006
ll2 -7.615405440355436 45.43410586281767
EPSG:7007
ll -51.649610785048345 57.995673770023195
- en 983579.7210583498 -5745327.636106645
- ll2 -51.64961048533559 57.99567391189175
+ en 983579.7210583503 -5745327.636106646
+ ll2 -51.64961048533561 57.995673911891764
EPSG:7035
ll 15.72718739977337 142.01914709906083
- en 142.01914709906083 15.727187399773367
- ll2 15.727187399773367 142.01914709906083
+ en 142.01914709906083 15.72718739977337
+ ll2 15.72718739977337 142.01914709906083
EPSG:7037
ll 81.39926992514421 -61.167762953630714
en -61.167762953630714 81.39926992514421
ll2 81.39926992514421 -61.167762953630714
EPSG:7039
ll -23.25223788128808 -31.962521206881263
- en -31.962521206881263 -23.252237881288085
- ll2 -23.252237881288085 -31.962521206881263
+ en -31.962521206881263 -23.25223788128808
+ ll2 -23.25223788128808 -31.962521206881263
EPSG:7041
ll -47.2240397287904 39.37920591655191
- en 39.37920591655191 -47.224039728790395
- ll2 -47.224039728790395 39.37920591655191
+ en 39.37920591655191 -47.2240397287904
+ ll2 -47.2240397287904 39.37920591655191
EPSG:7057
ll 48.596850428355026 -173.66854388054097
en -4895550.695632189 1.986768078546358E7
ll2 48.59685042835506 -173.66854388054097
EPSG:7058
ll 40.573367803431495 -23.566834596461575
- en 2.9625004098562106E7 1.635947055802949E7
- ll2 40.57336780343155 -23.56683459646159
+ en 2.9625004098562114E7 1.635947055802949E7
+ ll2 40.573367803431545 -23.56683459646156
EPSG:7059
ll 64.09825328103412 -94.55638279174417
en 1.2963240707872584E7 1.702020590295235E7
@@ -17715,23 +17723,23 @@ EPSG:7059
EPSG:7060
ll 46.77056858012149 -65.70153039288519
en 2.1677675559257865E7 1.1392163984699624E7
- ll2 46.7705685801215 -65.70153039288519
+ ll2 46.77056858012149 -65.70153039288519
EPSG:7061
ll 10.095186234160984 -68.85960329063371
- en 2.511194763570476E7 -2208602.4237761577
+ en 2.5111947635704752E7 -2208602.4237761577
ll2 10.095186234161016 -68.85960329063371
EPSG:7062
ll -42.36292168978941 -92.5706609540095
en 1.73548479453709E7 -2.3434199857013695E7
- ll2 -42.3629216897126 -92.57066095396031
+ ll2 -42.36292168971261 -92.57066095396031
EPSG:7063
ll -44.585219159123525 -91.39960124850198
- en 1.834257082103856E7 -2.4045253049162474E7
- ll2 -44.58521915902753 -91.3996012484574
+ en 1.834257082103856E7 -2.404525304916248E7
+ ll2 -44.58521915902757 -91.3996012484574
EPSG:7064
ll 9.501592745796827 -94.26733790924062
en 1.8301615032291926E7 -4176568.217948623
- ll2 9.50159274579683 -94.26733790924061
+ ll2 9.501592745796827 -94.26733790924061
EPSG:7065
ll 39.81860386631706 -89.91866023442876
en 2.0314143642377887E7 7056034.107382711
@@ -17742,11 +17750,11 @@ EPSG:7066
ll2 88.94775636560206 -138.4530730196101
EPSG:7067
ll 69.93579643373266 -91.33716540069679
- en 2.13989830281047E7 1.8442569808646478E7
+ en 2.13989830281047E7 1.844256980864648E7
ll2 69.93579643373265 -91.33716540069679
EPSG:7068
ll -3.5378500290210795 -124.63452835378439
- en 7998867.154818755 -8974629.068466317
+ en 7998867.154818748 -8974629.068466317
ll2 -3.537850029021041 -124.63452835378439
EPSG:7069
ll -79.35240544233795 -92.6557978572458
@@ -17762,8 +17770,8 @@ EPSG:7073
ll2 -68.2878156967075 -74.31723958330133
EPSG:7074
ll -49.00994131370563 37.78863283116938
- en 411416.0951409801 4570732.196453839
- ll2 -49.009941313705326 37.78863283116915
+ en 411416.0951409801 4570732.196453838
+ ll2 -49.00994131370533 37.78863283116915
EPSG:7075
ll -63.802751436839806 45.48582273657193
en 523929.8362136073 2924874.4539395133
@@ -17779,10 +17787,10 @@ EPSG:7077
EPSG:7078
ll 7.966512250213853 66.25245853678243
en 858633.9783482777 1.0882007641136529E7
- ll2 7.966512250206828 66.25245853665487
+ ll2 7.966512250206829 66.25245853665487
EPSG:7079
ll -24.374608539890914 71.57889574289888
- en 761596.0288895281 7301867.28972335
+ en 761596.028889528 7301867.28972335
ll2 -24.374608539885386 71.57889574290935
EPSG:7080
ll -0.9101761013197063 77.84871811340999
@@ -17806,12 +17814,12 @@ EPSG:7088
ll2 -11.161032857345958 29.65195830518383
EPSG:7109
ll 27.15230175396158 -110.03958920372466
- en 393961.02550038556 -2367506.847158138
- ll2 27.152301753956156 -110.03958920371251
+ en 393961.0255003857 -2367506.847158138
+ ll2 27.152301753956152 -110.0395892037125
EPSG:7110
ll -39.916010682831995 -116.00643016916074
en -199884.4785210949 -9746373.430125723
- ll2 -39.916010682706144 -116.006430169259
+ ll2 -39.91601068270614 -116.006430169259
EPSG:7111
ll -5.288156783086617 -71.24310227534578
en 6349055.708836718 -4980270.704754426
@@ -17819,15 +17827,15 @@ EPSG:7111
EPSG:7112
ll 24.280615477933374 -172.65779477383177
en -6060245.430395324 177602.41638998516
- ll2 24.280615477933384 -172.65779477383177
+ ll2 24.28061547793338 -172.65779477383177
EPSG:7113
ll 57.51627775485389 -26.712764291193224
en 4188968.734718708 3376898.500326273
- ll2 57.51627775485386 -26.712764291193224
+ ll2 57.51627775485386 -26.71276429119321
EPSG:7114
ll 84.76048542126081 -44.69141621415645
- en 933497.7170387754 4915995.851824948
- ll2 84.76048542126081 -44.6914162141564
+ en 933497.7170387754 4915995.851824947
+ ll2 84.76048542126081 -44.69141621415643
EPSG:7115
ll 42.01934376044005 -105.14321338598047
en 415948.65720867686 -300131.94135261734
@@ -17838,20 +17846,20 @@ EPSG:7116
ll2 76.30458940539876 -173.86423825290376
EPSG:7117
ll 20.280319855899585 -87.49971639362751
- en 2562971.769917715 -2556346.78417849
- ll2 20.280319855899567 -87.49971639362751
+ en 2562971.769917715 -2556346.784178488
+ ll2 20.28031985589959 -87.4997163936275
EPSG:7118
ll -37.249990712067785 -110.43091075994897
en -86151.7256804106 -8854132.030751377
- ll2 -37.24999071206288 -110.43091075995605
+ ll2 -37.249990712062875 -110.43091075995605
EPSG:7119
ll -47.62346606486935 -114.8403237684329
- en -85099.29691152419 -3.4957173416988224E7
+ en -85099.29691152429 -3.4957173416988224E7
ll2 -47.62346606485426 -114.84032376843989
EPSG:7120
ll -40.191111426650046 -115.21725423562526
en -431257.48688914743 -3.206881990203863E7
- ll2 -40.191111426622335 -115.21725423565094
+ ll2 -40.19111142662233 -115.21725423565094
EPSG:7121
ll -1.2578080971476702 -130.46263608834812
en -9288424.141288782 -1.8403769488947786E7
@@ -17862,11 +17870,11 @@ EPSG:7122
ll2 32.991183244472246 -38.142466442187484
EPSG:7123
ll 80.60710222253985 -30.952297262853847
- en 5565803.524074804 1.5636941578126863E7
- ll2 80.60710222253987 -30.952297262853804
+ en 5565803.524074804 1.5636941578126859E7
+ ll2 80.60710222253987 -30.952297262853833
EPSG:7124
ll 54.11560051657928 -84.58021754239307
- en 4784873.792602512 2890057.5636891015
+ en 4784873.792602512 2890057.563689099
ll2 54.11560051657928 -84.58021754239307
EPSG:7125
ll 51.99380792706171 -110.34159699567981
@@ -17874,16 +17882,16 @@ EPSG:7125
ll2 51.99380792703249 -110.34159699568592
EPSG:7126
ll 11.357430863715976 -98.90858954440979
- en 5520806.61711866 -1.2704543779015824E7
+ en 5520806.617118661 -1.270454377901583E7
ll2 11.357430863715994 -98.90858954440979
EPSG:7127
ll 4.119868369271497 -40.18045504250762
- en 2.841644424226054E7 -3648826.062957428
+ en 2.841644424226054E7 -3648826.06295743
ll2 4.119868369271519 -40.18045504250762
EPSG:7128
ll -83.06109531868591 -110.4453731631944
en 234583.77547942204 -4.57890495240884E7
- ll2 -83.0610953186857 -110.44537316319362
+ ll2 -83.06109531868572 -110.44537316319362
EPSG:7131
ll -2.7274513048560465 -120.40140818176097
en 275841.8404234753 -4457562.985942067
@@ -17902,36 +17910,36 @@ EPSG:7136
ll2 -70.6516606687304 37.40070794838988
EPSG:7139
ll -86.16445039128409 -98.27578734923362
- en -98.27578734923361 -86.16445039128409
- ll2 -86.16445039128409 -98.27578734923361
+ en -98.27578734923364 -86.16445039128409
+ ll2 -86.16445039128409 -98.27578734923364
EPSG:7142
ll 35.02842099954253 41.1776218909538
- en 714895.3673820784 508565.2887796709
- ll2 35.028420903990025 41.177621882036085
+ en 714895.3673820777 508565.28877967014
+ ll2 35.02842090399002 41.17762188203607
EPSG:7257
ll -46.76724545195753 -86.99441528722765
en 83832.69229509652 -9638332.20850067
ll2 -46.76724545195094 -86.99441528723152
EPSG:7258
ll 34.977647590312756 -88.17364430379217
- en -178556.9373180619 -1895527.259889318
- ll2 34.97764759025794 -88.17364430386746
+ en -178556.9373180619 -1895527.2598893158
+ ll2 34.977647590257945 -88.17364430386746
EPSG:7259
ll -32.04933159160677 -78.10644639730397
en 896492.5589551087 -8062213.81093134
ll2 -32.04933158734822 -78.10644639397917
EPSG:7260
ll -29.441075035214908 -87.13877235560679
- en 122416.76170421073 -2.543854406331406E7
- ll2 -29.441075035212407 -87.13877235561267
+ en 122416.76170421063 -2.5438544063314054E7
+ ll2 -29.441075035212393 -87.13877235561267
EPSG:7261
ll 87.885201666782 -88.49372636446951
- en 229106.94794641703 5483645.4010471385
- ll2 87.88520166678198 -88.49372636446344
+ en 229106.94794641703 5483645.401047139
+ ll2 87.885201666782 -88.49372636446347
EPSG:7262
ll -59.90294798121779 -79.12548401331458
- en 2020683.8763214957 -3.590926922416711E7
- ll2 -59.902947973810704 -79.12548403159654
+ en 2020683.8763214955 -3.590926922416711E7
+ ll2 -59.90294797381072 -79.12548403159654
EPSG:7263
ll -70.79808908120077 -87.31068621531341
en 239607.5634507057 -1.2301875528552255E7
@@ -17939,30 +17947,30 @@ EPSG:7263
EPSG:7264
ll 54.59590431385479 -90.7892300032775
en 47606.713354001855 5296560.221904916
- ll2 54.595904313683555 -90.7892300032653
+ ll2 54.59590431368356 -90.7892300032653
EPSG:7265
ll 72.21209831538283 -91.93431249257502
- en 17491.8411670973 3628949.149639085
- ll2 72.21209831316774 -91.93431247395051
+ en 17491.841167097475 3628949.1496390863
+ ll2 72.21209831316776 -91.93431247395051
EPSG:7266
ll -33.56727051442533 -90.6300287204609
en -806736.068930002 -2.6664436669515952E7
ll2 -33.56727051353239 -90.63002872148968
EPSG:7267
ll 65.1426148947717 -90.44539558721156
- en 54954.75084458152 2884009.3573917756
+ en 54954.75084458152 2884009.3573917747
ll2 65.14261489453814 -90.44539558704336
EPSG:7268
ll 78.37774620650976 -83.5042694814264
- en 1008442.817030434 1.4293845583300648E7
+ en 1008442.817030434 1.4293845583300646E7
ll2 78.37774620650254 -83.5042694814441
EPSG:7269
ll -54.37037393591286 -82.15538871056707
- en 509300.4297001267 -1.0317878785990015E7
- ll2 -54.370373935432006 -82.15538871068581
+ en 509300.4297001267 -1.0317878785990013E7
+ ll2 -54.370373935432 -82.15538871068583
EPSG:7270
ll 5.824696627036701 -81.34609379559838
- en 2589659.3703974527 -1.1929489726350237E7
+ en 2589659.3703974527 -1.1929489726350235E7
ll2 5.824696626953773 -81.34609379715255
EPSG:7271
ll -56.21230964214385 -90.00378317609947
@@ -17971,14 +17979,14 @@ EPSG:7271
EPSG:7272
ll -86.74738713455606 -87.44377495009871
en 770896.3292293082 -4.6184351648399524E7
- ll2 -86.7473871345561 -87.44377495009873
+ ll2 -86.74738713455609 -87.44377495009873
EPSG:7273
ll 44.496545975039766 -87.92006234837153
- en 119099.31288233664 475532.551025172
- ll2 44.49654597503872 -87.92006234837253
+ en 119099.31288233666 475532.5510251727
+ ll2 44.49654597503873 -87.92006234837253
EPSG:7274
ll -48.11356856177729 -92.2919093805309
- en -651731.2531952005 -3.216118971159973E7
+ en -651731.2531952 -3.216118971159973E7
ll2 -48.11356855798392 -92.29190937825159
EPSG:7275
ll 29.151570903540033 -88.72592518769879
@@ -17986,15 +17994,15 @@ EPSG:7275
ll2 29.151570903512305 -88.72592518775542
EPSG:7276
ll -74.71620683024891 -89.92812516680884
- en 369751.29517082666 -4.097207235358065E7
+ en 369751.2951708266 -4.097207235358065E7
ll2 -74.71620683011383 -89.92812516634095
EPSG:7277
ll 32.53976418437601 -83.697618127867
en 564391.9224811919 -692205.6632398971
- ll2 32.539764184307984 -83.69761812775629
+ ll2 32.53976418430798 -83.69761812775629
EPSG:7278
ll 49.14764411915576 -82.61339833406396
- en 1873116.7319420055 3795388.7642005705
+ en 1873116.7319420055 3795388.764200573
ll2 49.147644118340224 -82.61339833416096
EPSG:7279
ll -63.26825839170819 -83.56485186540364
@@ -18006,39 +18014,39 @@ EPSG:7280
ll2 -52.95095028954498 -84.77796606375072
EPSG:7281
ll 22.921184704312907 -87.79192065484125
- en 107461.05266491786 -1646248.5016090325
- ll2 22.92118470431283 -87.79192065484135
+ en 107461.05266491786 -1646248.501609032
+ ll2 22.921184704312836 -87.79192065484135
EPSG:7282
ll 6.9418275394018 -87.63021072643969
- en 377593.30570537207 -1.1203750436467228E7
+ en 377593.30570537195 -1.1203750436467228E7
ll2 6.941827539401792 -87.63021072643912
EPSG:7283
ll 83.99674025669407 -83.06828255737915
en 287057.6914506708 5111752.751043299
- ll2 83.996740256688 -83.0682825576469
+ ll2 83.99674025668799 -83.0682825576469
EPSG:7284
ll 36.3604913264607 -82.31377631606615
en 2197266.658104762 -607785.4329828654
- ll2 36.36049132581373 -82.31377631549095
+ ll2 36.360491325813726 -82.31377631549095
EPSG:7285
ll -42.70268933317565 -79.62999894587506
en 671848.80990266 -8987091.871375807
- ll2 -42.70268933152705 -79.62999894573497
+ ll2 -42.70268933152704 -79.62999894573497
EPSG:7286
ll 41.015101756446825 -86.59858399887338
- en 318617.6568288554 984244.8919732298
+ en 318617.6568288554 984244.8919732275
ll2 41.01510175644509 -86.59858399887548
EPSG:7287
ll -13.519702322882907 -82.44007418226735
en 587664.8132078173 -5791300.681020117
- ll2 -13.519702322873119 -82.44007418233353
+ ll2 -13.51970232287312 -82.44007418233353
EPSG:7288
ll 66.1315468933949 -80.90428205709436
en 1490188.3192618412 1.0013527315693667E7
ll2 66.13154689274285 -80.90428205802002
EPSG:7289
ll 37.72325217167763 -91.42487320107901
- en -331161.974331419 -335776.8249077465
+ en -331161.9743314191 -335776.8249077465
ll2 37.72325216742566 -91.42487320165677
EPSG:7290
ll -69.66706069855127 -78.03008116296914
@@ -18047,18 +18055,18 @@ EPSG:7290
EPSG:7291
ll 22.583068792538924 -90.24544181803444
en -99025.25385877647 -1691619.215504491
- ll2 22.58306879251786 -90.24544181806509
+ ll2 22.583068792517857 -90.24544181806509
EPSG:7292
ll 40.117587624234716 -82.65278977864367
en 1989468.6790292002 845649.345293829
ll2 40.11758762380486 -82.65278977838857
EPSG:7293
ll 67.75262715827489 -90.52668648485002
- en 42477.718332975 3060152.582690217
- ll2 67.7526271577554 -90.52668648400892
+ en 42477.71833297485 3060152.5826902157
+ ll2 67.75262715775538 -90.52668648400892
EPSG:7294
ll 53.061340042191375 -79.50528105872874
- en 2182195.7671618983 4706795.318882368
+ en 2182195.767161899 4706795.318882368
ll2 53.06134003608369 -79.50528106644558
EPSG:7295
ll 6.683605586721811 -87.1740192654561
@@ -18066,11 +18074,11 @@ EPSG:7295
ll2 6.683605586721393 -87.17401926544163
EPSG:7296
ll 47.75676437081921 -78.26049430234909
- en 2457180.7375239297 3292427.888209089
- ll2 47.75676436214411 -78.26049431196905
+ en 2457180.737523929 3292427.888209091
+ ll2 47.75676436214412 -78.26049431196905
EPSG:7297
ll 53.58494052289325 -90.77620726251993
- en 9819.39093301716 1557402.1821234196
+ en 9819.39093301716 1557402.1821234203
ll2 53.58494052272428 -90.77620726251473
EPSG:7298
ll 44.19897735284809 -86.92147252439028
@@ -18078,8 +18086,8 @@ EPSG:7298
ll2 44.19897735284809 -86.92147252439028
EPSG:7299
ll 58.66006470465487 -85.37481528583928
- en 293699.0358335516 2011766.4997988257
- ll2 58.66006470465483 -85.37481528583926
+ en 293699.0358335516 2011766.4997988243
+ ll2 58.660064704654815 -85.37481528583926
EPSG:7300
ll 61.837642992682305 -88.20582908690281
en 458050.4177643216 7765448.673882486
@@ -18111,30 +18119,30 @@ EPSG:7306
EPSG:7307
ll -25.430349360116082 -92.01152780596492
en -385653.5980943043 -7183255.297410153
- ll2 -25.430349358804865 -92.0115278082102
+ ll2 -25.430349358804857 -92.0115278082102
EPSG:7308
ll 23.336589929673366 -92.71018846518614
- en -1535075.6807477367 -5760990.800498957
- ll2 23.336589927458867 -92.71018846805457
+ en -1535075.6807477367 -5760990.800498959
+ ll2 23.33658992745887 -92.71018846805458
EPSG:7309
ll -29.8357068683532 -87.27413117903545
- en 131352.06993814968 -7468582.45944597
- ll2 -29.83570686835314 -87.27413117903566
+ en 131352.06993814968 -7468582.459445971
+ ll2 -29.835706868353146 -87.27413117903566
EPSG:7310
ll -1.2958192634769432 -85.99966924658726
en 842291.5007183683 -1.4138260957186604E7
- ll2 -1.2958192634769534 -85.99966924658726
+ ll2 -1.2958192634769472 -85.99966924658726
EPSG:7311
ll -1.2653578140020727 -85.99480945973481
- en 179363.25251286908 -4505888.883577703
- ll2 -1.265357814002075 -85.9948094597348
+ en 179363.25251286908 -4505888.8835777035
+ ll2 -1.2653578140020751 -85.9948094597348
EPSG:7312
ll 53.69870343442457 -78.58222295158927
- en 2274597.678832389 5277601.6509496225
+ en 2274597.678832389 5277601.650949621
ll2 53.69870342473704 -78.58222296850451
EPSG:7313
ll -19.529255137777525 -83.27103959266894
- en 542269.0909072972 -6595392.095121331
+ en 542269.0909072973 -6595392.095121331
ll2 -19.529255137770296 -83.27103959267194
EPSG:7314
ll 75.73240579432237 -80.39204835464452
@@ -18142,43 +18150,43 @@ EPSG:7314
ll2 75.7324057937218 -80.39204836086792
EPSG:7315
ll 35.78309132004786 -78.94325263455622
- en 833226.7258433779 -484350.69984187203
- ll2 35.783091316029385 -78.94325263306726
+ en 833226.725843378 -484350.69984187203
+ ll2 35.783091316029385 -78.94325263306725
EPSG:7316
ll -35.86164881114312 -91.91388586982187
- en -1114529.5586786221 -2.7740234093336944E7
- ll2 -35.86164880759281 -91.9138858713262
+ en -1114529.5586786224 -2.7740234093336944E7
+ ll2 -35.861648807592815 -91.9138858713262
EPSG:7317
ll 47.04585788956132 -82.43903299242223
- en 506795.63993556827 969151.7161192227
+ en 506795.63993556827 969151.7161192234
ll2 47.04585788939228 -82.43903299237869
EPSG:7318
ll -9.60369741912605 -83.68438835978797
- en 1603547.9916527786 -1.7428311265644297E7
+ en 1603547.9916527788 -1.7428311265644297E7
ll2 -9.603697419125199 -83.68438835980481
EPSG:7319
ll 52.40327144324152 -91.127975924507
- en -34090.448800202226 1344632.317518082
- ll2 52.403271442831674 -91.12797592445519
+ en -34090.448800202226 1344632.3175180813
+ ll2 52.40327144283167 -91.12797592445519
EPSG:7320
ll -25.99267161513891 -83.35581431763991
- en 2017903.5127922448 -2.4123494353111923E7
- ll2 -25.992671615077004 -83.35581431751223
+ en 2017903.5127922443 -2.412349435311193E7
+ ll2 -25.992671615077022 -83.35581431751224
EPSG:7321
ll 44.01587905629586 -85.44063223381896
en 204666.6377831862 448856.5366470814
- ll2 44.015879056295844 -85.44063223381896
+ ll2 44.01587905629586 -85.44063223381896
EPSG:7322
ll 53.46908560891433 -78.25223298431565
- en 2256606.290532024 4991038.849603906
- ll2 53.469085600162856 -78.25223299846913
+ en 2256606.2905320246 4991038.849603906
+ ll2 53.46908560016286 -78.25223299846913
EPSG:7323
ll 23.226987403973993 -85.68661043270409
- en 205546.71652638022 -1662881.1684425885
- ll2 23.22698740397399 -85.68661043270409
+ en 205546.71652638022 -1662881.1684425892
+ ll2 23.226987403973993 -85.68661043270409
EPSG:7324
ll 49.06353946149869 -89.43631933670174
- en -192241.9566950856 3977117.3863522653
+ en -192241.95669508542 3977117.3863522653
ll2 49.06353946106256 -89.43631933670835
EPSG:7325
ll 2.0455580021995132 -90.40104784225123
@@ -18186,8 +18194,8 @@ EPSG:7325
ll2 2.0455580021807873 -90.40104784111317
EPSG:7326
ll 51.24107902294938 -81.6052076986718
- en 1748313.1001959937 4681770.238914236
- ll2 51.241079022428174 -81.60520769873527
+ en 1748313.1001959937 4681770.238914235
+ ll2 51.24107902242817 -81.60520769873527
EPSG:7327
ll 18.07043907960474 -81.20530540760407
en 764004.6711085408 -2310078.174326441
@@ -18198,28 +18206,28 @@ EPSG:7328
ll2 31.269840267096153 -90.69676494655786
EPSG:7329
ll 12.52167224328457 -94.23687394232245
- en -499246.0013435584 -2821621.5539328633
- ll2 12.521672242028199 -94.23687393649406
+ en -499246.0013435584 -2821621.553932863
+ ll2 12.521672242028203 -94.23687393649406
EPSG:7330
ll 5.516171382617898 -89.56303455898316
en 19042.412019371823 -1.1829280616757005E7
ll2 5.516171382617556 -89.56303455896834
EPSG:7331
ll 32.398315696778695 -78.83513105948896
- en 862957.9677882289 -927031.5574620364
- ll2 32.39831569348894 -78.83513105661635
+ en 862957.9677882288 -927031.5574620357
+ ll2 32.39831569348895 -78.83513105661635
EPSG:7332
ll -4.767818974104017 -81.10548799243765
en 2370216.8805434955 -1.6605146446158253E7
ll2 -4.76781897407502 -81.10548799319442
EPSG:7333
ll -12.051908733982174 -85.21371564657545
- en 478105.801956624 -5805185.441338321
- ll2 -12.05190873398135 -85.21371564658662
+ en 478105.801956624 -5805185.441338322
+ ll2 -12.051908733981357 -85.21371564658662
EPSG:7334
ll -33.951727814317465 -86.71712189153024
en 994503.98123305 -2.7001225491574936E7
- ll2 -33.95172781431746 -86.71712189153023
+ ll2 -33.95172781431745 -86.71712189153023
EPSG:7335
ll -68.38726636939617 -81.20694359231373
en 467686.12931346253 -1.2093122445219235E7
@@ -18227,7 +18235,7 @@ EPSG:7335
EPSG:7336
ll 11.503588741246745 -82.63931893727525
en 2259954.521679104 -1.055827808818789E7
- ll2 11.503588741204627 -82.63931893760622
+ ll2 11.503588741204625 -82.63931893760622
EPSG:7337
ll -61.59602055351636 -88.49680907145037
en 133996.74739864992 -1.1110800846513841E7
@@ -18235,10 +18243,10 @@ EPSG:7337
EPSG:7338
ll 84.89444437364114 -90.56678537125579
en 654888.8922268683 1.691709066721845E7
- ll2 84.89444437363727 -90.56678537096501
+ ll2 84.89444437363728 -90.56678537096501
EPSG:7339
ll -75.73144052888101 -93.15877659947309
- en 69402.68430796021 -1.275040933278246E7
+ en 69402.68430796018 -1.275040933278246E7
ll2 -75.73144052795739 -93.15877658717079
EPSG:7340
ll -34.5194504324148 -81.67177136630092
@@ -18246,80 +18254,80 @@ EPSG:7340
ll2 -34.519450431400095 -81.67177136527928
EPSG:7341
ll 44.41664808559898 -93.40869622540619
- en -278406.6591546086 641630.3171052245
- ll2 44.416648079449324 -93.4086962215515
+ en -278406.6591546086 641630.3171052252
+ ll2 44.41664807944933 -93.4086962215515
EPSG:7342
ll -47.3387926376022 -88.66916616837453
en 348737.63137492444 -3.1318296356880486E7
- ll2 -47.338792637599376 -88.66916616837631
+ ll2 -47.33879263759938 -88.66916616837631
EPSG:7343
ll 65.81669263746772 -89.48981687001881
- en 142158.281432117 2955013.7151153167
+ en 142158.281432117 2955013.7151153157
ll2 65.81669263746201 -89.48981687001837
EPSG:7344
ll -52.88164502342215 -85.00695397903469
en 1304875.9706303389 -3.3508343726850145E7
- ll2 -52.88164502340621 -85.00695397903115
+ ll2 -52.8816450234062 -85.00695397903115
EPSG:7345
ll 29.100631172346525 -79.95802009122949
en 897110.7031137262 -910037.2432795292
ll2 29.100631169504187 -79.95802008750508
EPSG:7346
ll -40.879427886297904 -88.99190656958704
- en 153568.2554076227 -2.847496391303977E7
+ en 153568.2554076226 -2.847496391303977E7
ll2 -40.87942788628752 -88.99190656959719
EPSG:7347
ll 8.976869221261737 -84.1550299012754
- en 586008.0943936176 -3160721.8882007087
- ll2 8.976869221255477 -84.1550299013744
+ en 586008.0943936177 -3160721.8882007087
+ ll2 8.976869221255475 -84.1550299013744
EPSG:7348
ll -8.80798929490716 -82.59827607775202
en 2486305.489579537 -1.6837888899963256E7
ll2 -8.807989294824155 -82.59827607868966
EPSG:7349
ll 46.91461319822844 -91.403497244983
- en -23070.262847579666 1059812.012240196
- ll2 46.91461319807578 -91.40349724502528
+ en -23070.262847579666 1059812.012240197
+ ll2 46.914613198075784 -91.40349724502529
EPSG:7350
ll 9.172423474300501 -92.85764947811894
en -984301.0070154805 -1.0255151966816224E7
ll2 9.17242347418671 -92.857649476952
EPSG:7351
ll 83.34152022724612 -78.86449994441308
- en 319957.1206967408 4902572.952242002
+ en 319957.1206967408 4902572.952242001
ll2 83.34152022716748 -78.86449995715874
EPSG:7352
ll -49.67078470741636 -89.54100604982321
en -276048.8900137072 -3.2396846069247216E7
- ll2 -49.670784706643175 -89.54100604972048
+ ll2 -49.67078470664317 -89.54100604972048
EPSG:7353
ll 10.88764703596189 -78.81713698440163
en 950208.0619634375 -3059868.940972208
ll2 10.887647035120757 -78.81713698979792
EPSG:7354
ll 47.62976222898476 -83.06942063446614
- en 1337424.5287663348 3308090.3517093975
- ll2 47.62976222897345 -83.06942063446061
+ en 1337424.5287663348 3308090.3517094
+ ll2 47.629762228973455 -83.06942063446061
EPSG:7355
ll 25.312310876714164 -89.10154080411888
- en -82490.94908614841 -1511350.6370143574
- ll2 25.31231087669171 -89.10154080416457
+ en -82490.94908614841 -1511350.6370143571
+ ll2 25.312310876691715 -89.10154080416457
EPSG:7356
ll -28.458015356299974 -89.9777410333693
- en -523564.920686554 -2.4514445666398913E7
+ en -523564.9206865544 -2.4514445666398913E7
ll2 -28.458015356170236 -89.97774103362497
EPSG:7357
ll 20.666341927549666 -80.56076357903157
- en 917280.7080677614 -1844063.4922468504
+ en 917280.7080677614 -1844063.4922468506
ll2 20.66634192625684 -80.5607635780843
EPSG:7358
ll -51.19662432263629 -88.75595443373655
en 396176.7538313569 -3.2215261278468356E7
- ll2 -51.196624322633895 -88.75595443373757
+ ll2 -51.1966243226339 -88.75595443373757
EPSG:7359
ll -88.02915758014692 -87.32364649555836
en 231076.38662956434 -1.4342708400097713E7
- ll2 -88.02915758014693 -87.32364649555647
+ ll2 -88.02915758014692 -87.32364649555647
EPSG:7360
ll -44.51646315158151 -89.30585883824321
en -335847.2693523196 -3.117031775861999E7
@@ -18327,10 +18335,10 @@ EPSG:7360
EPSG:7361
ll -29.765478073695768 -85.23990779860097
en 458611.4817701448 -7567789.531425331
- ll2 -29.765478073691593 -85.23990779859166
+ ll2 -29.765478073691597 -85.23990779859166
EPSG:7362
ll -68.63748318308558 -84.12603355105509
- en 1237391.2555376429 -3.901683501376959E7
+ en 1237391.2555376426 -3.901683501376959E7
ll2 -68.63748318301766 -84.12603355109982
EPSG:7363
ll 64.98516036311207 -88.36033912715774
@@ -18347,10 +18355,10 @@ EPSG:7365
EPSG:7366
ll 33.44817287796897 -86.87089501058016
en 994562.5588244456 -1465370.687714657
- ll2 33.448172877968965 -86.87089501058014
+ ll2 33.44817287796897 -86.87089501058014
EPSG:7367
ll -60.846445463615865 -84.02198092192855
- en 426321.46147337183 -1.1063733508086007E7
+ en 426321.4614733719 -1.1063733508086007E7
ll2 -60.84644546348644 -84.02198092196393
EPSG:7368
ll -6.698002035074239 -80.97069339278526
@@ -18358,72 +18366,72 @@ EPSG:7368
ll2 -6.698002034495913 -80.9706934005485
EPSG:7369
ll -86.30143252938517 -85.27283066767359
- en 239835.4998505365 -1.4043943528159987E7
- ll2 -86.30143252938517 -85.27283066767359
+ en 239835.4998505365 -1.404394352815999E7
+ ll2 -86.30143252938518 -85.27283066767359
EPSG:7370
ll 75.51540648034847 -83.20377343113918
en 974881.2969909543 1.2896913896023788E7
ll2 75.51540648034717 -83.20377343113974
EPSG:7373
ll -29.642078765275826 -174.43564116184328
- en -174.43564116184322 -29.642078766086836
- ll2 -29.642078765274636 -174.43564116184322
+ en -174.43564116184325 -29.64207876608683
+ ll2 -29.64207876527463 -174.43564116184325
EPSG:7374
ll -85.8126409086921 44.897952962702206
- en 450347.39037935087 -9533097.114190051
- ll2 -85.81264090868564 44.897952974112556
+ en 450347.3903793507 -9533097.11419005
+ ll2 -85.81264090868562 44.897952974112556
EPSG:7375
ll 8.671145827110394 62.39436909770357
- en 1094286.6310602739 962722.4006421593
- ll2 8.671145826905455 62.39436909556057
+ en 1094286.6310602757 962722.4006421596
+ ll2 8.67114582690546 62.394369095560606
EPSG:7376
ll -19.118563639481636 57.97436101348686
en -29108.811726149986 -2121560.362466654
- ll2 -19.118563639250244 57.974361013445304
+ ll2 -19.118563639250244 57.9743610134453
EPSG:7400
ll 8.807471614826653 97.13159996726134
en 94.79278785858114 8.805511912883123
- ll2 8.80747157932508 97.13159993877238
+ ll2 8.80747157932508 97.13159993877237
EPSG:7401
ll 0.2619586639155944 -73.50714686837568
- en -9023657.588720316 1532729.4146924305
- ll2 0.26195860807474036 -73.5071468373978
+ en -9023657.588720314 1532729.4146924305
+ ll2 0.26195860807475313 -73.50714683739777
EPSG:7402
ll 55.08191428415611 50.66856291905012
- en 3527688.128284733 4054193.319372765
- ll2 55.08191428562641 50.668562907266335
+ en 3527688.1282847333 4054193.3193727667
+ ll2 55.08191428562642 50.66856290726634
EPSG:7403
ll 51.15675570718767 53.838128436884745
- en 3999091.483693849 5085727.686456003
- ll2 51.15675570928904 53.838128424077404
+ en 3999091.4836938474 5085727.686456004
+ ll2 51.156755709289044 53.8381284240774
EPSG:7404
ll 70.24893947993158 -73.17286544214225
en -73.1835019694986 70.24735487554359
- ll2 70.24893949829942 -73.17286530228444
+ ll2 70.24893949829942 -73.17286530228441
EPSG:7405
ll 86.76861952567566 -7.781942266882916
- en 363785.05272662424 4111583.095227672
- ll2 86.76861948977172 -7.7819423648281125
+ en 363785.05272662424 4111583.095227671
+ ll2 86.76861948977174 -7.781942364828114
EPSG:7408
ll -66.49746884805192 161.4017397709069
- en 161.40707293816016 -66.49447744456656
- ll2 -66.49746946382086 161.40173873758607
+ en 161.40707293816016 -66.49447744456657
+ ll2 -66.49746946382089 161.40173873758604
EPSG:7409
ll 5.238070887260548 134.64836583392827
- en 134.64836583392827 5.23807088743234
- ll2 5.238070887260554 134.64836583392827
+ en 134.64836583392827 5.238070887432339
+ ll2 5.2380708872605535 134.64836583392827
EPSG:7410
ll 31.500943853293435 177.53695393163588
- en 177.53230798082603 31.503756558646767
- ll2 31.50094394588685 177.53695374162808
+ en 177.53230798082606 31.503756558646767
+ ll2 31.50094394588685 177.53695374162805
EPSG:7411
ll 5.604359804699925 31.182509451808997
en 4526025.029814059 -2013523.8688898506
- ll2 5.604359817634461 31.18250945351607
+ ll2 5.604359817634448 31.182509453516072
EPSG:7412
ll 87.46073218762724 -58.6001973184524
- en 86038.10605279228 7674777.210095009
- ll2 87.46073218541551 -58.60019686927454
+ en 86038.10605279228 7674777.21009501
+ ll2 87.46073218541554 -58.600196869274505
EPSG:7413
ll 13.570749483881787 -39.30352180344735
en -4306634.550393724 931843.1459095171
@@ -18434,56 +18442,56 @@ EPSG:7414
ll2 -83.71347494412701 20.36207890629688
EPSG:7415
ll -34.91938563976642 -70.9012278214783
- en -1.5052238318426797E7 -9080346.518404694
- ll2 -34.9193851606237 -70.90122701991581
+ en -1.5052238318426799E7 -9080346.51840469
+ ll2 -34.91938516062369 -70.90122701991582
EPSG:7416
ll 15.117185725470534 8.47359630556732
- en 443437.91751329944 1671355.0853409655
- ll2 15.117185725470533 8.473596305567327
+ en 443437.91751329927 1671355.0853409655
+ ll2 15.117185725470534 8.473596305567325
EPSG:7417
ll 6.487858676149401 20.922773690090814
- en 1156010.8166825874 720975.5524855875
- ll2 6.487858675845381 20.922773685643868
+ en 1156010.816682588 720975.5524855874
+ ll2 6.487858675845381 20.92277368564387
EPSG:7418
ll -19.648742313111583 9.546547059889479
- en 204881.48392451924 -2173373.2808702416
+ en 204881.4839245192 -2173373.280870242
ll2 -19.648742313111537 9.546547059889479
EPSG:7419
ll 67.46374487428986 5.766647384887816
- en 233675.3547368283 7499096.624294571
- ll2 67.46374487137804 5.766647396088978
+ en 233675.35473682854 7499096.624294574
+ ll2 67.46374487137805 5.766647396088978
EPSG:7420
ll -40.4528733849578 20.72173330603879
en 1385486.064737911 -4495572.249804553
- ll2 -40.452873382550415 20.721733306364026
+ ll2 -40.45287338255042 20.721733306364026
EPSG:7421
ll 83.96232081395449 -0.9577068736044652
- en 542169.7335233311 6818760.562306338
- ll2 83.96232080207054 -0.9577068174516599
+ en 542169.7335233307 6818760.562306329
+ ll2 83.9623208020705 -0.9577068174516613
EPSG:7422
ll -5.359056160841542 61.454596079153305
en 8986664.859684568 191556.07521004044
- ll2 -5.359056132702596 61.45459608809148
+ ll2 -5.359056132702595 61.45459608809148
EPSG:7423
ll -21.211437381556237 161.89532045449164
- en 161.89532045449164 -21.211437382193285
- ll2 -21.211437381556156 161.89532045449167
+ en 161.89532045449167 -21.211437382193285
+ ll2 -21.21143738155616 161.8953204544917
EPSG:7528
ll 80.83370898677578 -89.05785481122483
- en 163980.64664291393 4175067.40746447
- ll2 80.83370898677578 -89.05785481122483
+ en 163980.6466429139 4175067.407464471
+ ll2 80.83370898677579 -89.05785481122483
EPSG:7529
ll 18.03366888451457 -93.14002283202294
- en -93858.10358705616 -3067049.5297096083
- ll2 18.033668884511723 -93.14002283201653
+ en -93858.10358705616 -3067049.529709608
+ ll2 18.03366888451173 -93.14002283201653
EPSG:7530
ll -84.64165804700353 -94.40635178738886
en 66494.20053298718 -1.4404544023877114E7
- ll2 -84.64165804700326 -94.40635178738445
+ ll2 -84.64165804700328 -94.40635178738445
EPSG:7531
ll 44.99561147807031 -56.013715458385576
- en 2909636.658947438 570597.4646678589
- ll2 44.995611478070344 -56.01371545838558
+ en 2909636.658947439 570597.4646678582
+ ll2 44.995611478070316 -56.013715458385576
EPSG:7532
ll -33.05847541384092 -90.9710220139635
en -245924.54739372438 -8421448.767246978
@@ -18494,15 +18502,15 @@ EPSG:7533
ll2 -43.204928694905824 -90.50178722451624
EPSG:7534
ll 58.5163810408952 -21.41827791065694
- en 3776241.8464969327 3246920.6315707266
- ll2 58.51638104089518 -21.41827791065694
+ en 3776241.8464969317 3246920.631570727
+ ll2 58.516381040895176 -21.418277910656954
EPSG:7535
ll -5.369838505079983 -84.61919460230946
en 675218.8516240716 -5326854.878705846
- ll2 -5.369838505064505 -84.61919460269819
+ ll2 -5.369838505064506 -84.61919460269819
EPSG:7536
ll 7.517623807326171 -103.51457453738671
- en -1566290.6034709068 -4268016.893559913
+ en -1566290.6034709066 -4268016.893559913
ll2 7.517623807326193 -103.51457453738671
EPSG:7537
ll 88.52517816706859 -89.03579145761634
@@ -18510,12 +18518,12 @@ EPSG:7537
ll2 88.52517816706859 -89.03579145761644
EPSG:7538
ll 66.34271495482106 -34.018425140383954
- en 2707116.438599158 3614756.024653667
+ en 2707116.438599158 3614756.0246536653
ll2 66.34271495482105 -34.01842514038394
EPSG:7539
ll 45.49212304886874 -60.23137347399883
- en 2462556.1778870705 744249.3701189875
- ll2 45.492123048868734 -60.23137347399883
+ en 2462556.1778870705 744249.3701189896
+ ll2 45.492123048868756 -60.23137347399882
EPSG:7540
ll 1.9586135012512926 -117.09145628684695
en -3563991.6689363997 -4154159.140112087
@@ -18526,7 +18534,7 @@ EPSG:7541
ll2 54.0542183704053 -93.62014683600262
EPSG:7542
ll 41.414406365351084 -85.97086177932341
- en 267605.90545071766 -330861.1940465767
+ en 267605.9054507177 -330861.1940465767
ll2 41.41440636535073 -85.97086177932289
EPSG:7543
ll -10.490323315615214 -98.7291232065076
@@ -18542,12 +18550,12 @@ EPSG:7545
ll2 -7.403597429340873 -12.838344219641584
EPSG:7546
ll 28.559374159227758 -86.48848522062426
- en 295286.45714407024 -1872274.3431818972
- ll2 28.55937415922719 -86.48848522062274
+ en 295286.4571440702 -1872274.343181896
+ ll2 28.559374159227193 -86.48848522062274
EPSG:7547
ll -53.33784862387737 -84.35342816378162
- en 560880.6085870996 -1.0795931587401746E7
- ll2 -53.33784862328997 -84.35342816392546
+ en 560880.6085870996 -1.0795931587401748E7
+ ll2 -53.337848623289986 -84.35342816392546
EPSG:7548
ll -33.02716221113181 -95.12938320295527
en -162325.77983602253 -8250620.936166887
@@ -18566,16 +18574,16 @@ EPSG:7551
ll2 -50.17634155868665 -93.25192660581155
EPSG:7552
ll 55.24821830459922 -90.09058776393613
- en 231472.8453697525 1091846.4495455544
- ll2 55.24821830459921 -90.09058776393613
+ en 231472.8453697525 1091846.4495455557
+ ll2 55.24821830459922 -90.09058776393613
EPSG:7553
ll 60.97531575369828 -95.28494942527664
- en -213339.9642636158 1893987.0350589496
- ll2 60.97531575309321 -95.28494942485293
+ en -213339.96426361596 1893987.0350589482
+ ll2 60.9753157530932 -95.28494942485293
EPSG:7554
ll 32.31148196080636 -90.93947180467936
- en -100894.62409928546 -1095263.0163589618
- ll2 32.31148196077498 -90.93947180473383
+ en -100894.62409928546 -1095263.0163589611
+ ll2 32.311481960774984 -90.93947180473383
EPSG:7555
ll -10.95191987792552 -91.08402328867936
en -306667.4808617982 -6005900.1243582545
@@ -18591,10 +18599,10 @@ EPSG:7557
EPSG:7558
ll -47.894539269194944 -84.40768845133931
en 514332.4806446564 -1.0288723466868654E7
- ll2 -47.894539267120685 -84.40768845201694
+ ll2 -47.89453926712068 -84.40768845201694
EPSG:7559
ll 86.79414949837545 -96.48902725235338
- en -4411.786520441121 5513094.00972631
+ en -4411.786520441077 5513094.00972631
ll2 86.79414949837545 -96.48902725235338
EPSG:7560
ll -48.5043834839889 -93.13014930023208
@@ -18602,8 +18610,8 @@ EPSG:7560
ll2 -48.504383481662025 -93.13014929928643
EPSG:7561
ll 68.03420914692649 -93.79709544108154
- en -118994.6613461573 2606117.540759786
- ll2 68.0342091457643 -93.79709543808302
+ en -118994.66134615745 2606117.5407597846
+ ll2 68.03420914576428 -93.79709543808302
EPSG:7562
ll 44.94797730503094 -160.62933090815085
en -4680305.078376592 2433751.7879976323
@@ -18614,28 +18622,28 @@ EPSG:7563
ll2 -18.559720608195825 -88.71421218351193
EPSG:7564
ll 74.41741845664411 -6.485275625051173
- en 2533486.9563924177 4837968.834354387
- ll2 74.41741845664411 -6.485275625051145
+ en 2533486.956392418 4837968.834354388
+ ll2 74.41741845664411 -6.485275625051173
EPSG:7565
ll -6.166592316238159 -126.03903090466864
en -5002864.929704275 -5190976.968805311
ll2 -6.16659231623812 -126.03903090466864
EPSG:7566
ll -7.359808585894754 -92.67046260897123
- en 137632.71938157524 -5761384.591822461
- ll2 -7.359808585894746 -92.67046260897123
+ en 137632.71938157524 -5761384.591822462
+ ll2 -7.359808585894747 -92.67046260897123
EPSG:7567
ll 26.872859963009184 -67.98854538439909
- en 2263202.9671058794 -1633974.0691940552
- ll2 26.872859963009173 -67.9885453843991
+ en 2263202.9671058794 -1633974.0691940538
+ ll2 26.872859963009176 -67.9885453843991
EPSG:7568
ll -17.331229755019564 -85.83943216807485
- en 722695.9835014225 -6858953.048649822
- ll2 -17.331229754891893 -85.83943216821119
+ en 722695.9835014225 -6858953.048649821
+ ll2 -17.331229754891886 -85.83943216821119
EPSG:7569
ll 16.32593216540579 -70.52744954235047
en 2533076.927607182 -2684979.006279299
- ll2 16.325932165405803 -70.52744954235047
+ ll2 16.3259321654058 -70.52744954235047
EPSG:7570
ll 21.641851059019842 -85.48783405511534
en 517548.10177325906 -2247112.13939094
@@ -18643,15 +18651,15 @@ EPSG:7570
EPSG:7571
ll -74.47406230878006 -86.38625722932053
en 390319.146771707 -1.3139261825986564E7
- ll2 -74.47406230855638 -86.38625723026496
+ ll2 -74.47406230855637 -86.38625723026496
EPSG:7572
ll -68.30420096259806 -85.53564776953714
- en 365628.68194432865 -1.2329309004456982E7
+ en 365628.6819443287 -1.2329309004456982E7
ll2 -68.30420096227148 -85.53564776999295
EPSG:7573
ll 61.9334419734492 -8.531161176895722
en 3984299.7841327838 4076195.8963838336
- ll2 61.93344197344918 -8.531161176895694
+ ll2 61.93344197344918 -8.531161176895708
EPSG:7574
ll -24.201220249197235 -82.57438985480421
en 875934.0008396239 -7568923.336528675
@@ -18671,27 +18679,27 @@ EPSG:7577
EPSG:7578
ll 61.02582715200423 -38.199073947645275
en 3024572.9714582595 2940019.443313957
- ll2 61.02582715200418 -38.19907394764529
+ ll2 61.02582715200419 -38.19907394764529
EPSG:7579
ll 26.609296126139007 -88.34319714674221
- en 254728.59849019453 -2148688.0216090996
- ll2 26.609296126139004 -88.34319714674221
+ en 254728.59849019453 -2148688.0216090977
+ ll2 26.609296126139007 -88.34319714674221
EPSG:7580
ll 48.170574328330716 -85.85388392199373
en 433402.40754518594 726657.9424451672
- ll2 48.1705743283307 -85.85388392199373
+ ll2 48.17057432833071 -85.85388392199373
EPSG:7581
ll 23.059662671288983 -22.840488174430874
en 6918998.552447815 669816.6863212121
- ll2 23.05966267128899 -22.840488174430874
+ ll2 23.059662671288994 -22.840488174430874
EPSG:7582
ll 73.33339001648824 -93.17807965127886
en -43515.98550212987 3394437.9223936265
- ll2 73.33339001603592 -93.17807964920961
+ ll2 73.3333900160359 -93.17807964920961
EPSG:7583
ll -1.4282874739770506 -88.43282505956172
- en 185659.7263768545 -4872992.004889718
- ll2 -1.4282874739770506 -88.43282505956172
+ en 185659.7263768545 -4872992.004889719
+ ll2 -1.4282874739770568 -88.43282505956172
EPSG:7584
ll -59.68829758488793 -85.87205766894922
en 350836.05275594373 -1.143281865261195E7
@@ -18699,10 +18707,10 @@ EPSG:7584
EPSG:7585
ll 11.134908926964247 -99.57779351801824
en -1187129.086214005 -3720656.573224584
- ll2 11.134908926964279 -99.57779351801824
+ ll2 11.134908926964277 -99.57779351801824
EPSG:7586
ll 31.29923569791844 -173.4731100110552
- en -6598173.839585136 2473853.2357786978
+ en -6598173.839585138 2473853.2357786987
ll2 31.299235697918466 -173.4731100110552
EPSG:7587
ll 36.116571122074745 -94.07324591480709
@@ -18714,16 +18722,16 @@ EPSG:7588
ll2 24.140404127552834 -84.87984569434752
EPSG:7589
ll 26.80042757468803 -91.01768121663594
- en 577140.6204511911 -6673453.79012691
- ll2 26.800427574688023 -91.0176812166359
+ en 577140.6204511911 -6673453.7901269095
+ ll2 26.800427574688026 -91.0176812166359
EPSG:7590
ll 21.458004801552917 -13.947160833503403
- en 2.5029012379588537E7 3985427.9584201137
- ll2 21.45800480155294 -13.947160833503418
+ en 2.502901237958854E7 3985427.9584201183
+ ll2 21.45800480155293 -13.947160833503403
EPSG:7591
ll -39.62207364201101 -83.72948015959452
- en 1306919.5910610883 -3.0034702093369E7
- ll2 -39.62207364160817 -83.7294801593337
+ en 1306919.591061088 -3.0034702093369007E7
+ ll2 -39.62207364160818 -83.7294801593337
EPSG:7592
ll -65.82102628017492 -96.26533701212583
en -94829.5300401095 -3.978605755073025E7
@@ -18734,8 +18742,8 @@ EPSG:7593
ll2 14.504066418438644 -69.66598604172546
EPSG:7594
ll -66.59074545414987 -90.33435523578461
- en 536103.7274878827 -3.976963732136129E7
- ll2 -66.59074545414772 -90.33435523578454
+ en 536103.7274878826 -3.976963732136128E7
+ ll2 -66.59074545414771 -90.33435523578454
EPSG:7595
ll 42.2134427921182 -129.16776106451104
en -9705674.58449587 1492983.898298291
@@ -18743,31 +18751,31 @@ EPSG:7595
EPSG:7596
ll -39.396791624287545 -88.41209647816194
en 1305009.6338266893 -3.0166858125936482E7
- ll2 -39.396791624277874 -88.41209647815108
+ ll2 -39.39679162427787 -88.41209647815108
EPSG:7597
ll 8.888500372420001 -93.23450829790009
- en -1077264.399498982 -1.2897944894415118E7
+ en -1077264.399498982 -1.2897944894415123E7
ll2 8.888500372420031 -93.23450829790009
EPSG:7598
ll 34.02824687778482 -113.05189794242003
en -6331264.284213004 -2287289.7851535673
- ll2 34.02824687778501 -113.05189794242004
+ ll2 34.02824687778501 -113.05189794242003
EPSG:7599
ll -16.592194249597686 -33.15263068366366
- en 3.0787333210863493E7 -1.4883649560301343E7
- ll2 -16.59219424959765 -33.15263068366366
+ en 3.07873332108635E7 -1.4883649560301343E7
+ ll2 -16.59219424959765 -33.15263068366365
EPSG:7600
ll -64.65914456223187 -90.57177358537452
- en 582385.1558123883 -3.860877721691316E7
- ll2 -64.65914456222967 -90.57177358537453
+ en 582385.1558123884 -3.860877721691317E7
+ ll2 -64.6591445622297 -90.57177358537453
EPSG:7601
ll 9.898796955740195 -86.00001560709757
en 978808.6192989306 -1.2543981312429741E7
ll2 9.898796955740174 -86.00001560709843
EPSG:7602
ll 88.68098193746124 -95.35408762595468
- en 165020.4202737258 1.5656038541393021E7
- ll2 88.68098193746121 -95.35408762589013
+ en 165020.42027372608 1.5656038541393029E7
+ ll2 88.68098193746124 -95.35408762589016
EPSG:7603
ll 81.71278613110044 -85.60656241301352
en 501466.99669916974 1.3657670250014238E7
@@ -18778,16 +18786,16 @@ EPSG:7604
ll2 73.47462110187402 -58.89305510030332
EPSG:7605
ll 9.840597751694958 -93.04550518832431
- en -1328948.5855616264 -1.293228583515099E7
+ en -1328948.5855616264 -1.2932285835150989E7
ll2 9.840597751575554 -93.04550518723423
EPSG:7606
ll -65.14940839383537 -94.58269184656842
- en -9662.05597034966 -3.975189337238054E7
+ en -9662.05597034947 -3.975189337238054E7
ll2 -65.14940839115192 -94.58269183958187
EPSG:7607
ll -57.753051463380984 -90.5086785592181
- en 851908.2813679898 -3.605777046172931E7
- ll2 -57.75305146338096 -90.5086785592181
+ en 851908.2813679898 -3.605777046172932E7
+ ll2 -57.75305146338098 -90.5086785592181
EPSG:7608
ll 54.30131719785708 -54.08143254366618
en 8137696.720934708 6063360.872370744
@@ -18802,15 +18810,15 @@ EPSG:7610
ll2 0.38193233289751005 -96.29399831731038
EPSG:7611
ll 63.922414110493236 -89.2119873221123
- en 893001.2491284296 6754120.401538889
- ll2 63.92241411049316 -89.21198732211228
+ en 893001.2491284296 6754120.401538891
+ ll2 63.92241411049314 -89.21198732211228
EPSG:7612
ll -60.14319884915163 -87.50878120262189
- en 696424.3720898833 -3.790046966962284E7
- ll2 -60.143198849038384 -87.50878120264683
+ en 696424.3720898831 -3.7900469669622846E7
+ ll2 -60.14319884903841 -87.50878120264683
EPSG:7613
ll -17.16903437873607 -88.22733368859215
- en 493802.25040605804 -2.1571213998620477E7
+ en 493802.250406058 -2.1571213998620477E7
ll2 -17.16903437873605 -88.22733368859215
EPSG:7614
ll 87.84048450760969 -82.18246631500656
@@ -18822,19 +18830,19 @@ EPSG:7615
ll2 65.51181012456007 -92.49690014020666
EPSG:7616
ll 51.53675853209179 -69.62125712497742
- en 5056191.910412534 3210632.9061675686
+ en 5056191.910412536 3210632.9061675686
ll2 51.53675853209179 -69.62125712497742
EPSG:7617
ll 62.06518926602956 -88.88461082212812
en 526597.7031054896 6289173.002274842
- ll2 62.06518926602953 -88.88461082212812
+ ll2 62.06518926602952 -88.88461082212812
EPSG:7618
ll 28.237248714073225 -7.956454037136837
- en 2.32345752437388E7 6710041.168304934
+ en 2.32345752437388E7 6710041.168304939
ll2 28.237248714073235 -7.956454037136837
EPSG:7619
ll -66.88094807967045 -91.63969254172004
- en 218327.42610999572 -4.060843897315333E7
+ en 218327.42610999563 -4.060843897315333E7
ll2 -66.88094807947199 -91.63969254154978
EPSG:7620
ll -43.80940712530883 -85.77070314200591
@@ -18850,8 +18858,8 @@ EPSG:7622
ll2 21.11594045987605 -88.32369510220694
EPSG:7623
ll 37.71925749594717 -110.02719616373051
- en -5685445.310932253 -1969105.2840291716
- ll2 37.719257495947254 -110.02719616373051
+ en -5685445.310932253 -1969105.2840291648
+ ll2 37.71925749594726 -110.02719616373051
EPSG:7624
ll 7.349634990562237 -78.71237826648789
en 6440292.561060999 -1.3703081902563434E7
@@ -18859,14 +18867,14 @@ EPSG:7624
EPSG:7625
ll -85.15633065542207 -88.7821489512825
en 584077.2134187203 -4.727712068789838E7
- ll2 -85.15633065541968 -88.7821489514606
+ ll2 -85.15633065541967 -88.7821489514606
EPSG:7626
ll 15.672494908310203 -116.72224975323806
en -1.0346847582699567E7 -8940512.91828488
- ll2 15.672494908310215 -116.72224975323806
+ ll2 15.672494908310217 -116.72224975323806
EPSG:7627
ll 39.79889119088625 -95.18196115675929
- en -571028.5027410169 -1698936.5691193521
+ en -571028.5027410169 -1698936.5691193498
ll2 39.79889119017146 -95.1819611571366
EPSG:7628
ll -11.07879746801869 -164.63930313854803
@@ -18878,11 +18886,11 @@ EPSG:7629
ll2 17.493422151235933 -95.0895185100559
EPSG:7630
ll 82.16857960051408 -84.83165933336129
- en 1132730.7682777348 1.4001770678332893E7
- ll2 82.16857960036685 -84.8316593469559
+ en 1132730.7682777352 1.4001770678332888E7
+ ll2 82.16857960036687 -84.8316593469559
EPSG:7631
ll 88.89105957349926 -90.14607162818206
- en 607254.788562919 1.68491633832731E7
+ en 607254.788562919 1.6849163383273102E7
ll2 88.89105957349926 -90.14607162818206
EPSG:7632
ll 82.17651938775501 -52.38153819054172
@@ -18894,15 +18902,15 @@ EPSG:7633
ll2 6.0174758307788485 -85.02318019004294
EPSG:7634
ll 40.23765700885818 -99.2279872851007
- en -1298902.4356348421 -1315655.236106154
- ll2 40.23765700336565 -99.22798728378768
+ en -1298902.4356348426 -1315655.2361061566
+ ll2 40.23765700336565 -99.2279872837877
EPSG:7635
ll 35.60266749541804 -39.40770469176883
en 1.4996919706037115E7 1554223.238648964
- ll2 35.60266749541817 -39.407704691768835
+ ll2 35.60266749541817 -39.40770469176883
EPSG:7636
ll -8.776083940807368 -95.09856344926291
- en -505077.43007210636 -1.8875799377567142E7
+ en -505077.4300721067 -1.8875799377567142E7
ll2 -8.776083940789023 -95.0985634490082
EPSG:7637
ll 1.467790406767282 -90.69066092641317
@@ -18910,7 +18918,7 @@ EPSG:7637
ll2 1.467790406767295 -90.69066092641317
EPSG:7638
ll 83.18059283984063 -45.83017234739779
- en 3101472.804823285 1.6003870901496407E7
+ en 3101472.8048232873 1.6003870901496416E7
ll2 83.18059283984064 -45.83017234739778
EPSG:7639
ll 65.1563545402408 -83.5871756102203
@@ -18922,16 +18930,16 @@ EPSG:7640
ll2 25.390909462984343 -124.18069332109923
EPSG:7641
ll 16.392756185596 -89.88529430694774
- en -244458.82547952308 -9644821.093631806
- ll2 16.392756185595644 -89.88529430694545
+ en -244458.82547952296 -9644821.093631804
+ ll2 16.39275618559565 -89.88529430694545
EPSG:7642
ll 58.982194186686854 -88.06214048573408
- en 715726.8090782783 5990375.579622136
+ en 715726.8090782783 5990375.579622134
ll2 58.982194186686876 -88.06214048573408
EPSG:7643
ll 84.77342648985149 -90.03865212559815
- en 566211.1127354515 1.5121622221465144E7
- ll2 84.77342648985149 -90.03865212559815
+ en 566211.1127354517 1.5121622221465152E7
+ ll2 84.7734264898515 -90.03865212559815
EPSG:7644
ll 16.400141394068214 -31.26753551614084
en 2.1162145970024213E7 -2674455.2145745712
@@ -18939,12 +18947,4 @@ EPSG:7644
EPSG:7645
ll -7.287777357194264 -99.21276976541854
en -4112844.748691825 -2.0612730742246613E7
- ll2 -7.287777357194223 -99.21276976541854
-EPSG:53008
- ll 58.982194186686854 -88.06214048573408
- en -5045893.591670716 6558520.755923763
- ll2 58.982194186686850 -88.06214048573406
-EPSG:54008
- ll 58.982194186686854 -88.06214048573408
- en -5064010.776136052 6540685.607089906
- ll2 58.982194186686850 -88.06214048573408
+ ll2 -7.287777357194222 -99.21276976541854
diff --git a/data_nodist/trans/ast.lang b/data_nodist/trans/ast.lang
index aafb415..90d3c81 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 b20cfdf..05c0651 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 f5eaf70..3ad390a 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 e57853d..9273032 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 78b8e62..d3274ec 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 a3cbfdc..735a048 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 e449c10..83dd3a5 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 fe8e1f3..ea67c4f 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 cda1c85..9f17df7 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 dfc3f2d..01e5734 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 cc61c12..2e44908 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 2531f27..a3b3e67 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 1a701c3..e346274 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 12aef75..059c7fa 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 4296aac..d245269 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 2a8c6ab..8882c59 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 1c0052b..26ddb63 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 94569ca..98f5072 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 8bc1393..54fb264 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 2a029c5..e4bab45 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 5b5d52f..fbaa79e 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 f44c966..ebb95b6 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 5b6b1df..2a3168d 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 5c51edc..7cba002 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 f37887c..ed79d86 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 f8e500c..ac8c232 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 497cd6f..c035ddb 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 23c26dc..7dde10c 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 76f7fd5..4a71693 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 f9356b5..40d3628 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 e8c2e4c..4f25d16 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 8f36183..7c797a7 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 ae5239d..3e74ea6 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 65dc2cb..ef474b0 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 e6d6e59..f336bef 100644
Binary files a/data_nodist/trans/zh_TW.lang and b/data_nodist/trans/zh_TW.lang differ
diff --git a/eclipse/JOSM (Java 8).launch b/eclipse/JOSM (Java 8).launch
index 592e489..caf075b 100644
--- a/eclipse/JOSM (Java 8).launch
+++ b/eclipse/JOSM (Java 8).launch
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/JOSM/src/JOSM.java"/>
+<listEntry value="/JOSM/src/org/openstreetmap/josm/gui/MainApplication.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
@@ -9,7 +9,7 @@
<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<sourceLookupDirector>
<sourceContainers duplicates="false">
<container memento="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <javaProject name="JOSM&quo [...]
<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="JOSM"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--debug"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="JOSM"/>
</launchConfiguration>
diff --git a/i18n/convwiki.pl b/i18n/convwiki.pl
index e05ba16..cd2f25b 100644
--- a/i18n/convwiki.pl
+++ b/i18n/convwiki.pl
@@ -9,6 +9,7 @@ use open qw/:std :encoding(utf8)/;
my $filename;
my $dir = $ARGV[1] || "build/josmfiles";
+print "$ARGV[0]\n";
if($ARGV[0] && $ARGV[0] =~ /^http:\/\//)
{
$filename = $ARGV[2] || "build/josmfiles.zip";
diff --git a/i18n/po/af.po b/i18n/po/af.po
index 2093af2..912294b 100644
--- a/i18n/po/af.po
+++ b/i18n/po/af.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2011-10-13 02:39+0000\n"
"Last-Translator: Grant Slater <Unknown>\n"
"Language-Team: Afrikaans <af at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:34+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:33+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: af\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3305,6 +3305,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3313,6 +3316,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3977,6 +3985,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4033,6 +4044,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9011,46 +9025,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9165,7 +9182,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9279,9 +9302,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9292,8 +9312,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9455,16 +9478,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9594,12 +9607,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9759,6 +9782,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11175,15 +11228,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11232,6 +11276,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12407,6 +12454,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13549,6 +13599,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13747,9 +13800,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14453,6 +14503,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14464,6 +14522,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14476,6 +14546,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14831,6 +14925,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14933,6 +15035,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14984,10 +15089,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15020,6 +15125,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15072,6 +15252,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15218,6 +15404,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15257,6 +15449,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15281,6 +15481,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15325,34 +15528,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15493,6 +15705,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15521,7 +15741,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15670,6 +15890,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15745,6 +15973,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15850,33 +16081,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15886,12 +16160,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16210,8 +16497,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16352,9 +16639,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18259,24 +18543,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19449,6 +19740,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21264,10 +21558,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22668,6 +22958,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24209,6 +24514,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25705,15 +26025,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25955,6 +26266,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25990,6 +26338,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25999,6 +26350,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26008,15 +26362,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26049,7 +26421,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26066,9 +26444,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26761,6 +27136,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27599,6 +27977,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27619,46 +28003,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27691,6 +28083,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28066,9 +28464,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28553,9 +28948,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28674,42 +29066,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28722,15 +29105,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30823,9 +31197,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/am.po b/i18n/po/am.po
index fabdee1..04d417f 100644
--- a/i18n/po/am.po
+++ b/i18n/po/am.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2010-03-30 12:09+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Amharic <am at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:35+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:34+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: am\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3305,6 +3305,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3313,6 +3316,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3977,6 +3985,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4033,6 +4044,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9011,46 +9025,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9165,7 +9182,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9279,9 +9302,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9292,8 +9312,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9455,16 +9478,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9594,12 +9607,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9759,6 +9782,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11175,15 +11228,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11232,6 +11276,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12407,6 +12454,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13549,6 +13599,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13747,9 +13800,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14453,6 +14503,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14464,6 +14522,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14476,6 +14546,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14831,6 +14925,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14933,6 +15035,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14984,10 +15089,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15020,6 +15125,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15072,6 +15252,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15218,6 +15404,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15257,6 +15449,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15281,6 +15481,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15325,34 +15528,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15493,6 +15705,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15521,7 +15741,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15670,6 +15890,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15745,6 +15973,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15850,33 +16081,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15886,12 +16160,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16210,8 +16497,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16352,9 +16639,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18259,24 +18543,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19449,6 +19740,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21264,10 +21558,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22668,6 +22958,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24209,6 +24514,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25705,15 +26025,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25955,6 +26266,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25990,6 +26338,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25999,6 +26350,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26008,15 +26362,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26049,7 +26421,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26066,9 +26444,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26761,6 +27136,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27599,6 +27977,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27619,46 +28003,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27691,6 +28083,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28066,9 +28464,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28553,9 +28948,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28674,42 +29066,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28722,15 +29105,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30823,9 +31197,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/ar.po b/i18n/po/ar.po
index 9a7a55d..1a06380 100644
--- a/i18n/po/ar.po
+++ b/i18n/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\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: 2017-03-24 04:35+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:35+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: ar\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3324,6 +3324,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3332,6 +3335,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4008,6 +4016,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4064,6 +4075,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9051,46 +9065,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9205,7 +9222,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr "إحفظ ملف GPX"
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9319,9 +9342,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "إحفظ ملف أو.أس.أم"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9332,8 +9352,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9495,16 +9518,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9634,12 +9647,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9799,6 +9822,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11221,15 +11274,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11278,6 +11322,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12457,6 +12504,9 @@ msgstr "ميزات خيارية:"
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13601,6 +13651,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13799,9 +13852,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr "لا يوجدأي وصف"
@@ -14505,6 +14555,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14516,6 +14574,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14528,6 +14598,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14883,6 +14977,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14985,6 +15087,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15036,10 +15141,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15072,6 +15177,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15124,6 +15304,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15270,6 +15456,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15309,6 +15501,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15333,6 +15533,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15377,34 +15580,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15545,6 +15757,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15573,7 +15793,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15722,6 +15942,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15797,6 +16025,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15902,33 +16133,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15938,12 +16212,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16262,8 +16549,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16404,9 +16691,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18311,24 +18595,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19501,6 +19792,9 @@ msgstr ""
msgid "Wash"
msgstr "غسيل سيارات"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21316,10 +21610,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22720,6 +23010,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "موقع أثري"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "ساحة معركة"
@@ -24261,6 +24566,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25757,15 +26077,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -26007,6 +26318,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26042,6 +26390,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26051,6 +26402,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26060,15 +26414,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26101,7 +26473,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26118,9 +26496,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26813,6 +27188,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27651,6 +28029,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27671,46 +28055,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27743,6 +28135,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28118,9 +28516,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28605,9 +29000,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28726,42 +29118,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28774,15 +29157,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30875,9 +31249,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr "دولة/ولاية"
diff --git a/i18n/po/ast.po b/i18n/po/ast.po
index 25997df..6e0ff9c 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: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2017-02-27 10:21+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\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: 2017-03-24 04:37+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:36+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: ast\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3604,6 +3604,9 @@ msgstr "Proyección"
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Nun hai capes definíes pol documentu getCapabilities: {0}"
@@ -3612,6 +3615,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4326,6 +4334,9 @@ msgstr "Esta prueba verifica si los multipolígonos son válidos."
msgid "Area style way is not closed"
msgstr "La vía estilu área non foi pesllada"
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "Nenguna vía esterior pal multipolígono"
@@ -4388,6 +4399,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr "El miembru de multipolígonu non tien un rol útil"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "Non hai vía dientro del multipolígonu"
@@ -9863,46 +9877,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} oxetu pa esaniciar:"
msgstr[1] "{0} oxetos pa esaniciar:"
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
-msgstr "Información del cuadru"
+msgid "Offset"
+msgstr "Desplazamientu"
-msgid "Metadata "
-msgstr "Metadatos "
+msgid "Tile download projection"
+msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
-msgstr "Cargar teseles automáticamente"
+msgid "Show tile info"
+msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
+msgstr "Información del cuadru"
+
+msgid "Tile name"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile size"
msgstr ""
-msgid "Zoom to native resolution"
-msgstr "Averar a resolución nativa"
+msgid "Tile display size"
+msgstr ""
-msgid "Change resolution"
-msgstr "Camudar resolvimientu"
+msgid "Reprojection"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Aumentar zoom"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Amenorgar zoom"
+msgid "Metadata "
+msgstr "Metadatos "
-msgid "Flush tile cache"
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -10017,8 +10034,14 @@ msgstr[1] "{0} pistes, "
msgid "Save GPX file"
msgstr "Guardar ficheru GPX"
-msgid "Imagery fade"
-msgstr "Tresparencia d''imaxes"
+msgid "Id"
+msgstr "Id"
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
+msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr "Tipu d’imaxes sin sofitu: {0}"
@@ -10133,9 +10156,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Guardar ficheru OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "Compatible con EPSG:4326 y la proyección de Mercator"
-
msgid "Validation errors"
msgstr "Erros de validación"
@@ -10146,11 +10166,12 @@ msgid "Set WMS Bookmark"
msgstr "Afitar marcador WMS"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
-"JOSM usará EPSG:4326 pa consultar al sirvidor, pero la respuesta pué variar "
-"dependiendo del sirvidor WMS"
msgid "Correlate to GPX"
msgstr "Correlacionar con GPX"
@@ -10327,20 +10348,6 @@ msgstr "Tien d''escoyer una traza GPX"
msgid "No selected GPX track"
msgstr "Nun s''escoyó una traza GPX"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Erru al analizar la zona horaria.\n"
-"Formatu esperáu: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Erru mientres se realizaba l´analís sintácticu.\n"
-"Formatu esperáu: {0}"
-
msgid "Geotagged Images"
msgstr "Imaxes Xeomarcáes"
@@ -10482,12 +10489,26 @@ msgstr ""
"\n"
"Tiempu de GPS : {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Erru mientres se realizaba l´analís sintácticu.\n"
+"Formatu esperáu: {0}"
+
msgid "Show thumbnails"
msgstr "Amosar miniatures"
msgid "Show image thumbnails instead of icons."
msgstr "Amosar miniatures de les imaxes en llugar d’iconos"
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Erru al analizar la zona horaria.\n"
+"Formatu esperáu: {0}"
+
msgid "Choose visible tracks"
msgstr "Escoyer traces visibles"
@@ -10664,6 +10685,36 @@ msgstr "Marcadores dende puntos nomaos"
msgid "Named Trackpoints from {0}"
msgstr "Puntos de traza nomaos dende {0}"
+msgid "Auto load tiles"
+msgstr "Cargar teseles automáticamente"
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr "Amenorgar zoom"
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr "Aumentar zoom"
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr "Camudar resolvimientu"
+
+msgid "Zoom to native resolution"
+msgstr "Averar a resolución nativa"
+
msgid "gps marker"
msgstr "Marcador GPS"
@@ -12275,15 +12326,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr "opacidá d''imaxes"
-
-msgid "Fade Color: "
-msgstr "Color de tresparencia: "
-
-msgid "Fade amount: "
-msgstr "Nivel de trasparencia: "
-
msgid "Soft"
msgstr "Nidiu"
@@ -12332,6 +12374,9 @@ msgstr "Fondu de les capes d''imaxes: por defeutu"
msgid "Available default entries:"
msgstr "Entraes disponibles por defeutu:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "Entraes escoyíes:"
@@ -13621,6 +13666,9 @@ msgstr "Atributos opcionales:"
msgid "Unknown requisite: {0}"
msgstr "Requisitu desconocíu: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "Espresión de miembru illegal: {0}"
@@ -14901,6 +14949,9 @@ msgstr "reemplazáu pol nuevu complementu {0}"
msgid "no longer required"
msgstr "yá nun ye necesariu"
+msgid "Plugin information"
+msgstr "Información del complementu"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -15140,9 +15191,6 @@ msgstr ""
"El complementu foi esaniciáu de la configuración. Por favor, reinicie JOSM "
"pa descargalo."
-msgid "Plugin information"
-msgstr "Información del complementu"
-
msgid "no description available"
msgstr "nun hai descripción disponible"
@@ -16022,6 +16070,14 @@ msgid "farmland"
msgstr "tierres de cultivu"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "residencial"
@@ -16033,6 +16089,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr "monte baxu (marrotales, carba o maleza)"
@@ -16045,6 +16113,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "industrial"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "associatedStreet (Cai Acomuñada)"
@@ -16400,6 +16492,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -16502,6 +16602,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -16553,10 +16656,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -16589,6 +16692,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Xeobase d''Hidrografía"
@@ -16641,6 +16819,12 @@ msgstr "Czech RUIAN parcely"
msgid "Czech pLPIS"
msgstr "Czech pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Denmark)"
@@ -16789,6 +16973,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16829,6 +17019,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -16853,6 +17051,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -16897,34 +17098,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -17065,6 +17275,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -17093,8 +17311,8 @@ 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)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: Ortofotomapa (aerial image)"
@@ -17242,6 +17460,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Car"
@@ -17317,6 +17543,9 @@ msgstr "Kanton Aargau 25cm (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -17422,33 +17651,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
msgid "NC Latest Orthoimagery"
msgstr "NC Latest Orthoimagery"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -17458,12 +17730,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -17790,8 +18075,8 @@ msgstr ""
"fondu. Optimizáu pa basemap.at."
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -17964,9 +18249,6 @@ msgstr ""
"Base de datos d''imaxes rectificaes: comparte y llogra por aciu un botón "
"imaxes aérees movíes yá compensaes."
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "Mou de mapa con axuste d''imaxes aérees por aciu el WMSPlugin-style"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -19964,26 +20246,33 @@ msgstr "Pista o carril pa bicicletes"
msgid "Cycleway"
msgstr "Carril bici"
+msgctxt "cycleway"
msgid "lane"
-msgstr "carril"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "pista"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "carril en sentíu opuestu"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "ciclovía en sentíu opuestu"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
-msgstr "en sentíu opuestu (tramos pequenos de cais ensin ciclocarril)"
+msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "carril bus compartíu"
+msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "carril_compartíu"
+msgstr ""
msgid "Cycleway left"
msgstr "Ciclovía a la izquierda"
@@ -21161,6 +21450,9 @@ msgstr ""
msgid "Wash"
msgstr "Llimpieza"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Concesionariu d''automóviles"
@@ -22980,10 +23272,6 @@ msgid "garages"
msgstr "talleres"
msgctxt "building"
-msgid "industrial"
-msgstr "industrial"
-
-msgctxt "building"
msgid "school"
msgstr "colexu"
@@ -24386,6 +24674,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Xacimientu arqueolóxicu"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Campu de batalla"
@@ -25951,6 +26254,21 @@ msgstr "Centru alministrativu"
msgid "Label point"
msgstr "Etiqueta del puntu"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "Llugar"
@@ -27488,15 +27806,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -27738,6 +28047,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Importar"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -27773,6 +28119,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -27782,6 +28131,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -27791,15 +28143,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -27832,7 +28202,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -27849,9 +28225,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -28667,6 +29040,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -29575,6 +29951,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -29595,46 +29977,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
-msgstr ""
+msgid "Replace Geometry"
+msgstr "Reemplazar xeometría"
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
-msgstr "Configurar los parámetros de combinación"
+msgid "List of tags to merge"
+msgstr ""
-msgid "Generate matches"
-msgstr "Xenerar axugamientos"
+msgid "except"
+msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Reemplazar xeometría"
+msgid "Advanced Example"
+msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
+msgstr "Configurar los parámetros de combinación"
+
+msgid "Generate matches"
+msgstr "Xenerar axugamientos"
+
+msgid "Merging"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -29668,6 +30058,12 @@ msgstr "Selección vacida"
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -30051,9 +30447,6 @@ msgstr "Importar Globalsat"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Importar datos del Globalsat Datalogger DG100 na capa gpx"
-msgid "Import"
-msgstr "Importar"
-
msgid "GPS Blams"
msgstr "GPS Blams"
@@ -30578,9 +30971,6 @@ msgstr "Cargando imaxes rectificaes..."
msgid "Error processing XML response: {0}"
msgstr "Erru al procesar la respuesta XML: {0}"
-msgid "Offset"
-msgstr "Desplazamientu"
-
msgid "Imagery Offset Database"
msgstr "Bases de datos d''imaxes rectificaes"
@@ -30723,24 +31113,6 @@ msgid "This string should be 3 to 200 letters long."
msgstr ""
"Esta cadena de calteres tendría de tener ente 3 y 200 lletres de llargor."
-msgid "Adjust imagery"
-msgstr "Axustar imaxe aérea"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Axustar la posición de la capa d''imaxe aérea escoyida"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Por favor escueya la capa d''imaxe aérea a axustar."
-
-msgid "Start adjusting"
-msgstr "Empecipiar l''axuste."
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "Anguaño nun hai nenguna capa d''imaxe aérea p''afaer."
-
-msgid "No layers to adjust"
-msgstr "Nun hai capes p''axustar"
-
msgid "Normal"
msgstr "Normal"
@@ -30753,12 +31125,21 @@ msgstr "Rotar 180"
msgid "Rotate 270"
msgstr "Rotar 270"
-msgid "Previous image"
-msgstr "Imaxe anterior"
+msgid "WayPoint Image"
+msgstr "imaxe del puntu de ruta"
+
+msgid "Display non-geotagged photos"
+msgstr "Amosar semeyes ensin xeoetiquetar"
+
+msgid "Imported Images"
+msgstr "Imaxes importaes"
msgid "Next image"
msgstr "Imaxe siguiente"
+msgid "Previous image"
+msgstr "Imaxe anterior"
+
msgid "Rotate left"
msgstr "Rotar escontra la esquierda"
@@ -30771,15 +31152,6 @@ msgstr "Rotar escontra la derecha"
msgid "Rotate image right"
msgstr "Rotar imaxe escontra la derecha"
-msgid "WayPoint Image"
-msgstr "imaxe del puntu de ruta"
-
-msgid "Display non-geotagged photos"
-msgstr "Amosar semeyes ensin xeoetiquetar"
-
-msgid "Imported Images"
-msgstr "Imaxes importaes"
-
msgid "Import vector graphics"
msgstr "Importar gráficos vectoriales"
@@ -32995,9 +33367,6 @@ msgstr "Xunir"
msgid "Public Transport: Join GTFS stops"
msgstr "Tresporte públicu: xunir paraes GTFS"
-msgid "Id"
-msgstr "Id"
-
msgid "State"
msgstr "Estáu/Provincia"
diff --git a/i18n/po/az.po b/i18n/po/az.po
index 2909b84..3e58760 100644
--- a/i18n/po/az.po
+++ b/i18n/po/az.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2016-12-17 13:38+0000\n"
"Last-Translator: iAZISS <iss-sash at mail.ru>\n"
"Language-Team: Azerbaijani <az at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:37+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:37+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -3304,6 +3304,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3312,6 +3315,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3976,6 +3984,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4032,6 +4043,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9010,46 +9024,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9164,7 +9181,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9278,9 +9301,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9291,8 +9311,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9454,16 +9477,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9593,12 +9606,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9758,6 +9781,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11174,15 +11227,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11231,6 +11275,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12406,6 +12453,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13548,6 +13598,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13746,9 +13799,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14452,6 +14502,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14463,6 +14521,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14475,6 +14545,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14830,6 +14924,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14932,6 +15034,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14983,10 +15088,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15019,6 +15124,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15071,6 +15251,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15217,6 +15403,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15256,6 +15448,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15280,6 +15480,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15324,34 +15527,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15492,6 +15704,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15520,7 +15740,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15669,6 +15889,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15744,6 +15972,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15849,33 +16080,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15885,12 +16159,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16209,8 +16496,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16351,9 +16638,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18258,24 +18542,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19448,6 +19739,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21263,10 +21557,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22667,6 +22957,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24208,6 +24513,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25704,15 +26024,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25954,6 +26265,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25989,6 +26337,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25998,6 +26349,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26007,15 +26361,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26048,7 +26420,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26065,9 +26443,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26760,6 +27135,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27598,6 +27976,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27618,46 +28002,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27690,6 +28082,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28065,9 +28463,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28552,9 +28947,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28673,42 +29065,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28721,15 +29104,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30822,9 +31196,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/be.po b/i18n/po/be.po
index 2194ae6..8f771d8 100644
--- a/i18n/po/be.po
+++ b/i18n/po/be.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2017-02-19 15:59+0000\n"
"Last-Translator: Darafei Praliaskouski <komzpa at gmail.com>\n"
"Language-Team: Belarusian <i18n at mova.org>\n"
@@ -19,8 +19,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:38+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:38+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: be\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3649,6 +3649,9 @@ msgstr "Праекцыя"
msgid "Matrix set identifier"
msgstr "Ідэнтыфікатар набору матрыц"
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Не вызначана ні аднаго пласта праз getCapabilities дакмент: {0}"
@@ -3659,6 +3662,11 @@ msgstr ""
"канчатковага элемента {2}"
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4360,6 +4368,9 @@ msgstr "Гэты тэст правярае правільнасць мульты
msgid "Area style way is not closed"
msgstr "Лінія стылю \"палігон\" не замкнёна"
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "У мультыпалігона адсутнічае знешняя лінія"
@@ -4427,6 +4438,9 @@ msgstr "Вонкавая лінія мультыпалігона мае агул
msgid "No useful role for multipolygon member"
msgstr "Роля для ўдзельніка мультыпалігона зададзена няўдала"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "Ня-лінія ў мультыпалігоне"
@@ -9961,47 +9975,50 @@ msgstr[0] "Выдаліць {0} аб’ект:"
msgstr[1] "Выдаліць {0} аб’екта:"
msgstr[2] "Выдаліць {0} аб’ектаў:"
-msgid "Show tile info"
-msgstr "Паказаць інфармацыю пра квадрат"
+msgid "Native projections"
+msgstr ""
-msgid "Tile Info"
-msgstr "Інфармацыя пра квадрат"
+msgid "Offset"
+msgstr "Зрушэнне"
-msgid "Metadata "
-msgstr "Метададзеныя "
+msgid "Tile download projection"
+msgstr ""
-msgid "Load tile"
-msgstr "Запампаваць квадрат"
+msgid "Tile display projection"
+msgstr ""
-msgid "Auto zoom"
-msgstr "Аўтамаштабаванне"
+msgid "Current zoom"
+msgstr ""
-msgid "Auto load tiles"
-msgstr "Аўтазагрузка квадратаў"
+msgid "Show tile info"
+msgstr "Паказаць інфармацыю пра квадрат"
-msgid "Show errors"
-msgstr "Паказваць памылкі"
+msgid "Tile Info"
+msgstr "Інфармацыя пра квадрат"
-msgid "Load all tiles"
-msgstr "Запампаваць усе квадраты"
+msgid "Tile name"
+msgstr ""
-msgid "Load all error tiles"
-msgstr "Запампаваць усе квадраты з памылкамі"
+msgid "Tile URL"
+msgstr ""
-msgid "Zoom to native resolution"
-msgstr "Маштабаваць да зыходнага разрознення"
+msgid "Tile size"
+msgstr ""
-msgid "Change resolution"
-msgstr "Змяніць разрозненне"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Павялічыць маштаб"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Паменшыць маштаб"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
-msgstr "Скінуць кэш квадратаў"
+msgid "Metadata "
+msgstr "Метададзеныя "
+
+msgid "Load tile"
+msgstr "Запампаваць квадрат"
msgid "Failed to create tile source"
msgstr "Не атрымалася стварыць крыніцу тайлаў"
@@ -10122,8 +10139,14 @@ msgstr[2] "{0} дарожак, "
msgid "Save GPX file"
msgstr "Запісаць файл GPX"
-msgid "Imagery fade"
-msgstr "Падкладка: згасанне да"
+msgid "Id"
+msgstr "Ідэнтыфікатар"
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
+msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr "Непадтрымоўваемы тып фонавага здымка: {0}"
@@ -10240,9 +10263,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Запісаць файл OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "Падтрымліваюцца EPSG:4326 і праекцыя Меркатара"
-
msgid "Validation errors"
msgstr "Памылкі пры праверцы"
@@ -10253,11 +10273,12 @@ msgid "Set WMS Bookmark"
msgstr "Усталяваць закладку WMS"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
-"JOSM будзе выкарыстоўваць EPSG: 4326 пры запыце да сервера, але вынікі "
-"могуць адрознівацца ў залежнасці ад WMS-сервера"
msgid "Correlate to GPX"
msgstr "Адносяцца да GPX"
@@ -10430,20 +10451,6 @@ msgstr "Неабходна абраць трэк GPX"
msgid "No selected GPX track"
msgstr "Трэк GPX не вылучаны"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Памылка пры разборы гадзіннага пояса.\n"
-"Чаканы фармат: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Памылка пры разборы зрушэння.\n"
-"Чаканы фармат: {0}"
-
msgid "Geotagged Images"
msgstr "Малюнкі з дадзенымі пра месцазнаходжанне"
@@ -10588,12 +10595,26 @@ msgstr ""
"\n"
"Час GPS: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Памылка пры разборы зрушэння.\n"
+"Чаканы фармат: {0}"
+
msgid "Show thumbnails"
msgstr "Паказваць мініяцюры"
msgid "Show image thumbnails instead of icons."
msgstr "Паказваць мініяцюры малюнкаў замест значкоў"
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Памылка пры разборы гадзіннага пояса.\n"
+"Чаканы фармат: {0}"
+
msgid "Choose visible tracks"
msgstr "Фільтраваць трэкі"
@@ -10770,6 +10791,36 @@ msgstr "Маркеры з найменных пунктаў"
msgid "Named Trackpoints from {0}"
msgstr "Найменныя пункты трэка з {0}"
+msgid "Auto load tiles"
+msgstr "Аўтазагрузка квадратаў"
+
+msgid "Auto zoom"
+msgstr "Аўтамаштабаванне"
+
+msgid "Decrease zoom"
+msgstr "Паменшыць маштаб"
+
+msgid "Flush tile cache"
+msgstr "Скінуць кэш квадратаў"
+
+msgid "Increase zoom"
+msgstr "Павялічыць маштаб"
+
+msgid "Load all tiles"
+msgstr "Запампаваць усе квадраты"
+
+msgid "Load all error tiles"
+msgstr "Запампаваць усе квадраты з памылкамі"
+
+msgid "Show errors"
+msgstr "Паказваць памылкі"
+
+msgid "Change resolution"
+msgstr "Змяніць разрозненне"
+
+msgid "Zoom to native resolution"
+msgstr "Маштабаваць да зыходнага разрознення"
+
msgid "gps marker"
msgstr "маркер GPS"
@@ -12356,15 +12407,6 @@ msgstr "Назва кэшу"
msgid "Object Count"
msgstr "Колькасць аб''ектаў"
-msgid "imagery fade"
-msgstr "зацямненне фону"
-
-msgid "Fade Color: "
-msgstr "Колер згасання: "
-
-msgid "Fade amount: "
-msgstr "Значэнне згасання: "
-
msgid "Soft"
msgstr "Згладзіць"
@@ -12414,6 +12456,9 @@ msgstr "Падкладка: па змаўчанні"
msgid "Available default entries:"
msgstr "Даступныя па змаўчанні:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "Абраныя:"
@@ -13707,6 +13752,9 @@ msgstr "Дадатковыя атрыбуты:"
msgid "Unknown requisite: {0}"
msgstr "Невядомы запыт: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "Недапушчальны выраз у {0}"
@@ -14995,6 +15043,9 @@ msgstr "заменена новым {0} модулем"
msgid "no longer required"
msgstr "больш не патрабуецца"
+msgid "Plugin information"
+msgstr "Інфармацыя пра модуль"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -15237,9 +15288,6 @@ msgstr ""
"Модуль быў выдалены з канфігурацыі. Калі ласка, перазагрузіце JOSM, каб "
"выгрузіць модуль."
-msgid "Plugin information"
-msgstr "Інфармацыя пра модуль"
-
msgid "no description available"
msgstr "апісанне адсутнічае"
@@ -16166,6 +16214,14 @@ msgid "farmland"
msgstr "поле"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "жылыя кварталы"
@@ -16177,6 +16233,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr "хмызняк"
@@ -16189,6 +16257,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "прамысловае"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "Вуліца"
@@ -16545,6 +16637,14 @@ msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
"Здымкі з imagico.de: выспа Мардвінава (Элефант)/выспа Шышкава (Кларанс)"
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr "IGN Аргентына (TMS)"
@@ -16647,6 +16747,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr "AGIV Фландрыя - найноўшыя аэрафотаздымкі"
@@ -16698,11 +16801,11 @@ msgstr "SPW(allonie) 2012-2013 аэрафотаздымка"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 аэрафотаздымка"
-msgid "TEC bus lines (2014)"
-msgstr "TEC аўтобусныя маршруты (2014)"
+msgid "TEC bus lines"
+msgstr ""
-msgid "TEC bus stops (2014)"
-msgstr "Аўтобусныя прыпынкі TEC (2014)"
+msgid "TEC bus stops"
+msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
msgstr "Бенін: Катану 2016 (Pleiade)"
@@ -16734,6 +16837,81 @@ msgstr "Ландрына - артафота 2011"
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr "SIG Санта-Катарына - OrtoRGB 2012"
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Geobase Гідраграфія"
@@ -16786,6 +16964,12 @@ msgstr "Чэхія RUIAN ўчасткі"
msgid "Czech pLPIS"
msgstr "Чэхія pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Данія)"
@@ -16933,6 +17117,12 @@ msgstr "Берлін - аэрафотаздымка 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Берлін - аэрафотаздымка 2016"
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Эрланген - аэрафотаздымка (2016 5.0 cm)"
@@ -16976,6 +17166,14 @@ msgstr ""
"imagico.de - здымкі OSM для картаграфіі: узбярэжныя водмелі Паўночнай "
"Германіі (інфрачырвоныя здымкі)"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -17000,6 +17198,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr "Здымкі з imagico.de: Касігіянгуіт"
@@ -17046,35 +17247,44 @@ msgstr "Canaan (Гаіці) - здымка з дрона, лістапад 2015"
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr "Matthew (Гаіці) - здымка з дрона, кастрычнік 2016"
-msgid "FÖMI ortophoto 2000"
-msgstr "FÖMI артафота 2000"
+msgid "FÖMI orthophoto 2000"
+msgstr ""
-msgid "FÖMI ortophoto 2005"
-msgstr "FÖMI артафота 2005"
+msgid "FÖMI orthophoto 2005"
+msgstr ""
-msgid "Szeged ortophoto 2011"
-msgstr "Сегед - артафота 2011"
+msgid "Szeged orthophoto 2011"
+msgstr ""
msgid "Inner part of Szeged"
msgstr "Унутраная частка Сегеда"
-msgid "Törökbálint ortophoto 2013"
-msgstr "Törökbálint - артафота 2013"
+msgid "Törökbálint orthophoto 2013"
+msgstr ""
msgid "5 cm resolution bald image"
msgstr "Выява без расліннасці з рэзалюцыяй 5 см"
-msgid "Törökbálint ortophoto 2015"
-msgstr "Таракбалінт - артафота 2015"
+msgid "Törökbálint orthophoto 2015"
+msgstr ""
-msgid "Danube flood ortophoto 2013"
-msgstr "Разліў Дуная - артафота 2013"
+msgid "Danube flood orthophoto 2013"
+msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Рэчышча Дуная ў Будапешце, Сентэндры і Сігетманасторы"
-msgid "Budapest district XI ortophoto 2015"
-msgstr "Будапешт, раён XI - ортафота 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
+msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Вугоршчына (маршруты пешага турызму)"
@@ -17215,6 +17425,14 @@ msgstr "Аэрафотаздымкі PDOK 25 см (WMTS)"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Шпіцберген - артафота 2009/2011 EPSG: 25833"
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr "Здымкі з imagico.de: заходняя частка Каракарума"
@@ -17245,8 +17463,8 @@ msgstr ""
"Здымкі з imagico.de: хрыбет Кардыльера-дэ-Вільканота і ледавіковая шапка "
"Келькая"
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr "Пангасінан/Булакан (Філіпіны HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: артафота"
@@ -17394,6 +17612,14 @@ msgstr "Здымкі з imagico.de: Паўночны і Палярны Урал,
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr "Здымкі з imagico.de: касмадром Усходні"
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Аўтамабільная"
@@ -17469,6 +17695,9 @@ msgstr "Кантон Аргаў 25 см (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Кантон Аргаў 25 см (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr "Кантон Цюрых - артафота 2014/2015 10см"
@@ -17574,33 +17803,76 @@ msgstr "TIGER 2012 пласт дарог"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr "Новыя ды неправераныя дарогі TIGER (2015)"
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
msgid "NC Latest Orthoimagery"
msgstr "Паўночная Караліна: апошнія артаздымкі"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+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 ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr "NJ 2015 аэрафотаздымка (інфрачырвоная)"
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr "NJ 2015 аэрафотаздымка (натуральныя колеры)"
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr "Метрапалітэнскі арэал Сан-Хуан: орта-здымка 2013 USACE"
msgid "WA 2013 aerial imagery for San Juan County"
msgstr "Акруга Сан-Хуан (Вашынгтон) - аэрафотаздымка 2013"
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr "Вектарная карта вуліц акругі Сан-Хуан (Вашынгтон)"
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr "Ортафота Тэхаса"
@@ -17610,12 +17882,25 @@ msgstr "Філадэльфія - здымкі 2015"
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr "Мэрыленд: здымкі 3 цалі"
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr "Мэрыленд: базавая карта транспарта"
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr "Дэлавэр - ортафота 2012"
@@ -17946,8 +18231,8 @@ msgstr ""
"basemap.at."
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -18123,9 +18408,6 @@ msgstr ""
"База дадзеных зрушэнняў здымкаў: дзяліцеся і атрымлівайце зрушэнні з "
"дапамогай адной кнопкі"
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "WMSPlugin-падобны модуль для падкладкі фонавай выявы"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -20148,26 +20430,33 @@ msgstr "Веласіпедная паласа/дарожка"
msgid "Cycleway"
msgstr "Веладарожка"
+msgctxt "cycleway"
msgid "lane"
-msgstr "паласа"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "трэк"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "сустрэчная_паласа"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "сустрэчная_дарожка"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
-msgstr "сустрэчная"
+msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "сумесна_з_аўтобусам"
+msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "сумесная"
+msgstr ""
msgid "Cycleway left"
msgstr "Веладарожка злева"
@@ -21344,6 +21633,9 @@ msgstr "Членская карта"
msgid "Wash"
msgstr "Аўтамыйка"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Аўтасалон"
@@ -23160,10 +23452,6 @@ msgid "garages"
msgstr "гаражы"
msgctxt "building"
-msgid "industrial"
-msgstr "прамысловае"
-
-msgctxt "building"
msgid "school"
msgstr "школа"
@@ -24566,6 +24854,21 @@ msgstr "палац"
msgid "Archaeological Site"
msgstr "Археалагічныя раскопкі"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Поле бітвы"
@@ -26126,6 +26429,21 @@ msgstr "Адміністрацыйны цэнтр"
msgid "Label point"
msgstr "Кропка подпісу"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "Месца"
@@ -27696,15 +28014,6 @@ msgstr "Імпартаваць лакальныя выявы"
msgid "Import pictures into Mapillary layer"
msgstr "Імпартаваць выявы на пласт Mapillary"
-msgid "Select pictures"
-msgstr "Выберыце выявы"
-
-msgid "Import pictures into sequence"
-msgstr "Імпартаваць выявы ў паслядоўнасць"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Імпартаваць выявы ў паслядоўнасць у пласце Mapillary"
-
msgid "Join mode"
msgstr "Рэжым злучэння"
@@ -27953,6 +28262,43 @@ msgstr "Прытрымлівацца вылучанага здымка"
msgid "Go forward"
msgstr "Ісці наперад"
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Імпартаваць"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -27988,6 +28334,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -27997,6 +28346,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -28006,15 +28358,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -28051,7 +28421,13 @@ msgstr[2] "Павернута {0} выяў"
msgid "2 images unjoined"
msgstr "2 выявы раз''яднаныя"
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -28070,9 +28446,6 @@ msgstr ""
"Спампаваная вобласць OSM занадта вялікая. Рэжым загрузкі зменены на вобласць "
"са спампаванымі дадзенымі OSM да наступнага перазапуску пласта."
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr "Сцягванне"
@@ -28888,6 +29261,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -29793,6 +30169,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -29813,46 +30195,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
-msgstr ""
+msgid "Replace Geometry"
+msgstr "Замяніць геаметрыю"
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
-msgstr "Налада параметраў зліцця"
+msgid "List of tags to merge"
+msgstr ""
-msgid "Generate matches"
-msgstr "Падабраць пары"
+msgid "except"
+msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Замяніць геаметрыю"
+msgid "Advanced Example"
+msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
+msgstr "Налада параметраў зліцця"
+
+msgid "Generate matches"
+msgstr "Падабраць пары"
+
+msgid "Merging"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -29885,6 +30275,12 @@ msgstr "Нічога не вылучана"
msgid "Freeze reference selection"
msgstr "Заблакаваць вылучэнне ў даведкавым пласце"
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -30287,9 +30683,6 @@ msgstr "Імпарт з Globalsat"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Імпартаваць дадзеныя з Globalsat Datalogger DG100 на пласт GPX."
-msgid "Import"
-msgstr "Імпартаваць"
-
msgid "GPS Blams"
msgstr "Дадзеныя GPS Blam"
@@ -30804,9 +31197,6 @@ msgstr "Загружаю зрушэнні..."
msgid "Error processing XML response: {0}"
msgstr "Памылка апрацоўкі XML-адказу: {0}"
-msgid "Offset"
-msgstr "Зрушэнне"
-
msgid "Imagery Offset Database"
msgstr "База зрушэнняў здымкаў"
@@ -30942,24 +31332,6 @@ msgstr "Захоўваю новае зрушэнне..."
msgid "This string should be 3 to 200 letters long."
msgstr "Гэты радок павінен быць даўжынёй ад 3 да 200 знакаў."
-msgid "Adjust imagery"
-msgstr "Выраўноўванне падкладкі"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Наладзіць зрушэнне абранага пласта здымкаў"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Калі ласка, абярыце пласт са здымкамі для выраўноўвання"
-
-msgid "Start adjusting"
-msgstr "Пачаць выраўноўванне"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "Няма даступных пластоў са здымкамі для выраўноўвання"
-
-msgid "No layers to adjust"
-msgstr "Няма пластоў для выраўноўвання"
-
msgid "Normal"
msgstr "Звычайны"
@@ -30972,12 +31344,21 @@ msgstr "Павярнуць на 180°"
msgid "Rotate 270"
msgstr "Павярнуць на 270°"
-msgid "Previous image"
-msgstr "Папярэдні малюнак"
+msgid "WayPoint Image"
+msgstr "Малюначак шляхавага пункта"
+
+msgid "Display non-geotagged photos"
+msgstr "Паказаць фатаграфіі, якія не маюць каардынатаў"
+
+msgid "Imported Images"
+msgstr "Імпартаваныя малюнкі"
msgid "Next image"
msgstr "Наступны малюнак"
+msgid "Previous image"
+msgstr "Папярэдні малюнак"
+
msgid "Rotate left"
msgstr "Павярнуць налева"
@@ -30990,15 +31371,6 @@ msgstr "Павярнуць направа"
msgid "Rotate image right"
msgstr "Круціць малюнак направа"
-msgid "WayPoint Image"
-msgstr "Малюначак шляхавага пункта"
-
-msgid "Display non-geotagged photos"
-msgstr "Паказаць фатаграфіі, якія не маюць каардынатаў"
-
-msgid "Imported Images"
-msgstr "Імпартаваныя малюнкі"
-
msgid "Import vector graphics"
msgstr "Імпарт вектарнай графікі"
@@ -33216,9 +33588,6 @@ msgstr "Злучыць"
msgid "Public Transport: Join GTFS stops"
msgstr "Грамадскі транспарт: Злучэнне GTFS прыпынкаў"
-msgid "Id"
-msgstr "Ідэнтыфікатар"
-
msgid "State"
msgstr "Даступныя"
diff --git a/i18n/po/bg.po b/i18n/po/bg.po
index 6a8552a..c6d59f8 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: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\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: 2017-03-24 04:41+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:40+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: bg\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3439,6 +3439,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3447,6 +3450,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4116,6 +4124,9 @@ msgstr "Това е проверка за валидни мултиполиго
msgid "Area style way is not closed"
msgstr "Незатворена площ (area)"
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "Мултиполигонът няма външен път."
@@ -4172,6 +4183,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "В мултиполигона има член, който не е път."
@@ -9201,46 +9215,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} обект за изтриване:"
msgstr[1] "{0} обекта за изтриване:"
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
+msgstr "Отместване"
+
+msgid "Tile download projection"
msgstr ""
-msgid "Metadata "
+msgid "Tile display projection"
msgstr ""
-msgid "Load tile"
+msgid "Current zoom"
msgstr ""
-msgid "Auto zoom"
+msgid "Show tile info"
msgstr ""
-msgid "Auto load tiles"
+msgid "Tile Info"
msgstr ""
-msgid "Show errors"
+msgid "Tile name"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile size"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Change resolution"
-msgstr "Смяна разделителна способност"
+msgid "Reprojection"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Увеличаване на мащаба"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Намаляне на мащаба"
+msgid "Metadata "
+msgstr ""
-msgid "Flush tile cache"
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9355,7 +9372,13 @@ msgstr[1] "{0} следи, "
msgid "Save GPX file"
msgstr "Съхраняване GPX файл"
-msgid "Imagery fade"
+msgid "Id"
+msgstr "Id"
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9471,9 +9494,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Съхраняване OSM файл"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr "Грешки при проверка"
@@ -9484,8 +9504,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9652,20 +9675,6 @@ msgstr "Трябва да изберете GPX следа"
msgid "No selected GPX track"
msgstr "Няма избрана GPX следа"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Грешка при разбор на времева зона.\n"
-"Очакван формат: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Грешка при разбор на отместване.\n"
-"Очакван формат: {0}"
-
msgid "Geotagged Images"
msgstr "Изображения с данни за местоположение"
@@ -9801,12 +9810,26 @@ msgstr ""
"\n"
"GPS време: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Грешка при разбор на отместване.\n"
+"Очакван формат: {0}"
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Грешка при разбор на времева зона.\n"
+"Очакван формат: {0}"
+
msgid "Choose visible tracks"
msgstr ""
@@ -9970,6 +9993,36 @@ msgstr "Маркери от наименувани точки."
msgid "Named Trackpoints from {0}"
msgstr "Наименувани точки от следа от {0}"
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr "Намаляне на мащаба"
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr "Увеличаване на мащаба"
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr "Смяна разделителна способност"
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr "GPS маркер"
@@ -11426,15 +11479,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11483,6 +11527,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12661,6 +12708,9 @@ msgstr "Незадължителни Атрибути:"
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13815,6 +13865,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr "Информация за добавка"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -14020,9 +14073,6 @@ msgstr ""
"Разширението беше премахнато от конфигурацията. Моля рестартирайте JOSM за "
"да изключим разширенето."
-msgid "Plugin information"
-msgstr "Информация за добавка"
-
msgid "no description available"
msgstr "няма описание"
@@ -14732,6 +14782,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "жилищна зона"
@@ -14743,6 +14801,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14755,6 +14825,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "промишлена сграда"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -15110,6 +15204,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -15212,6 +15314,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15263,10 +15368,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15299,6 +15404,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Geobase Hydrography"
@@ -15351,6 +15531,12 @@ msgstr "Czech RUIAN parcely"
msgid "Czech pLPIS"
msgstr "Czech pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Denmark)"
@@ -15499,6 +15685,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15538,6 +15730,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15562,6 +15762,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15606,34 +15809,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15774,6 +15986,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15802,8 +16022,8 @@ 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)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15951,6 +16171,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Car"
@@ -16026,6 +16254,9 @@ msgstr "Kanton Aargau 25cm (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Kanton Aargau 25cm (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -16131,33 +16362,76 @@ msgstr "TIGER 2012 Roads Overlay"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
msgid "NC Latest Orthoimagery"
msgstr "NC Latest Orthoimagery"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr "U.S. Forest Service roads"
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -16167,12 +16441,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16491,8 +16778,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16635,9 +16922,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18555,24 +18839,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
-msgstr "лента"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "следа"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19745,6 +20036,9 @@ msgstr ""
msgid "Wash"
msgstr "Автомивка"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Автомобили"
@@ -21560,10 +21854,6 @@ msgid "garages"
msgstr "гаражи"
msgctxt "building"
-msgid "industrial"
-msgstr "промишлена сграда"
-
-msgctxt "building"
msgid "school"
msgstr "училище"
@@ -22964,6 +23254,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Архиологични разкопки"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Поле на битка"
@@ -24507,6 +24812,21 @@ msgstr ""
msgid "Label point"
msgstr "Точка за етикет"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -26005,15 +26325,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -26255,6 +26566,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Импорт"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26290,6 +26638,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26299,6 +26650,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26308,15 +26662,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26349,7 +26721,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26366,9 +26744,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -27061,6 +27436,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27920,6 +28298,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27940,46 +28324,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
+msgstr ""
+
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -28012,6 +28404,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28392,9 +28790,6 @@ msgstr "Globalsat Импорт"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Импорт данни от Globalsat Datalogger DG100 в GPX слой."
-msgid "Import"
-msgstr "Импорт"
-
msgid "GPS Blams"
msgstr ""
@@ -28879,9 +29274,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr "Отместване"
-
msgid "Imagery Offset Database"
msgstr ""
@@ -29000,24 +29392,6 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
-msgstr ""
-
-msgid "Start adjusting"
-msgstr ""
-
-msgid "There are currently no imagery layer to adjust."
-msgstr ""
-
-msgid "No layers to adjust"
-msgstr ""
-
msgid "Normal"
msgstr "Нормално"
@@ -29030,12 +29404,21 @@ msgstr "Завъртане на 180°"
msgid "Rotate 270"
msgstr "Завъртане на 270°"
-msgid "Previous image"
-msgstr "Предишно изображение"
+msgid "WayPoint Image"
+msgstr "WayPoint изображение"
+
+msgid "Display non-geotagged photos"
+msgstr "Показване на не-геомаркирани фотографии"
+
+msgid "Imported Images"
+msgstr "Импортирани изображения"
msgid "Next image"
msgstr "Следващо изображение"
+msgid "Previous image"
+msgstr "Предишно изображение"
+
msgid "Rotate left"
msgstr "Завърти наляво"
@@ -29048,15 +29431,6 @@ msgstr "Завърти надясно"
msgid "Rotate image right"
msgstr "Завърти изображението надясно"
-msgid "WayPoint Image"
-msgstr "WayPoint изображение"
-
-msgid "Display non-geotagged photos"
-msgstr "Показване на не-геомаркирани фотографии"
-
-msgid "Imported Images"
-msgstr "Импортирани изображения"
-
msgid "Import vector graphics"
msgstr ""
@@ -31171,9 +31545,6 @@ msgstr "Присъедини"
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr "Id"
-
msgid "State"
msgstr "Област/Щат"
diff --git a/i18n/po/bn.po b/i18n/po/bn.po
index b7586d3..640c43b 100644
--- a/i18n/po/bn.po
+++ b/i18n/po/bn.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2015-04-03 09:24+0000\n"
"Last-Translator: Md Alamgir <alamgircu at hotmail.com>\n"
"Language-Team: Bengali <bn at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:39+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:38+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: bn\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3308,6 +3308,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3316,6 +3319,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3980,6 +3988,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4036,6 +4047,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9014,46 +9028,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9168,7 +9185,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9282,9 +9305,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9295,8 +9315,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9458,16 +9481,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9597,12 +9610,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9762,6 +9785,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11178,15 +11231,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11235,6 +11279,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12410,6 +12457,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13552,6 +13602,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13750,9 +13803,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14456,6 +14506,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14467,6 +14525,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14479,6 +14549,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14834,6 +14928,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14936,6 +15038,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14987,10 +15092,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15023,6 +15128,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15075,6 +15255,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15221,6 +15407,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15260,6 +15452,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15284,6 +15484,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15328,34 +15531,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15496,6 +15708,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15524,7 +15744,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15673,6 +15893,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15748,6 +15976,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15853,33 +16084,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15889,12 +16163,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16213,8 +16500,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16355,9 +16642,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18262,24 +18546,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19452,6 +19743,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21267,10 +21561,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22671,6 +22961,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24212,6 +24517,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25708,15 +26028,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25958,6 +26269,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25993,6 +26341,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26002,6 +26353,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26011,15 +26365,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26052,7 +26424,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26069,9 +26447,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26764,6 +27139,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27602,6 +27980,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27622,46 +28006,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27694,6 +28086,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28069,9 +28467,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28556,9 +28951,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28677,42 +29069,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28725,15 +29108,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30826,9 +31200,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/br.po b/i18n/po/br.po
index b7b257d..dcd1550 100644
--- a/i18n/po/br.po
+++ b/i18n/po/br.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2011-10-17 12:11+0000\n"
"Last-Translator: Fulup <Unknown>\n"
"Language-Team: Breton <br at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:40+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:39+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: br\n"
msgid "License"
@@ -3305,6 +3305,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3313,6 +3316,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3977,6 +3985,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4033,6 +4044,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9011,46 +9025,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9165,7 +9182,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9279,9 +9302,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9292,8 +9312,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9455,16 +9478,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9594,12 +9607,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9759,6 +9782,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11175,15 +11228,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11232,6 +11276,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12407,6 +12454,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13549,6 +13599,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13747,9 +13800,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14453,6 +14503,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14464,6 +14522,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14476,6 +14546,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14831,6 +14925,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14933,6 +15035,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14984,10 +15089,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15020,6 +15125,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15072,6 +15252,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15218,6 +15404,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15257,6 +15449,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15281,6 +15481,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15325,34 +15528,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15493,6 +15705,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15521,7 +15741,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15670,6 +15890,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15745,6 +15973,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15850,33 +16081,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15886,12 +16160,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16210,8 +16497,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16352,9 +16639,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18259,24 +18543,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19449,6 +19740,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21264,10 +21558,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22668,6 +22958,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24209,6 +24514,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25705,15 +26025,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25955,6 +26266,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25990,6 +26338,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25999,6 +26350,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26008,15 +26362,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26049,7 +26421,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26066,9 +26444,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26761,6 +27136,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27599,6 +27977,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27619,46 +28003,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27691,6 +28083,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28066,9 +28464,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28553,9 +28948,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28674,42 +29066,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28722,15 +29105,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30823,9 +31197,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/bs.po b/i18n/po/bs.po
index 9e536ba..8d3f007 100644
--- a/i18n/po/bs.po
+++ b/i18n/po/bs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2012-11-03 23:07+0000\n"
"Last-Translator: Alen Mahovic <eyeofthestorm at windowslive.com>\n"
"Language-Team: Bosnian <bs at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:40+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:39+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: bs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3308,6 +3308,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3316,6 +3319,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3980,6 +3988,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4036,6 +4047,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9014,46 +9028,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9168,7 +9185,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9282,9 +9305,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9295,8 +9315,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9458,16 +9481,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9597,12 +9610,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9762,6 +9785,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11178,15 +11231,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11235,6 +11279,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12410,6 +12457,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13552,6 +13602,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13750,9 +13803,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14456,6 +14506,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14467,6 +14525,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14479,6 +14549,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14834,6 +14928,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14936,6 +15038,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14987,10 +15092,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15023,6 +15128,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15075,6 +15255,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15221,6 +15407,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15260,6 +15452,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15284,6 +15484,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15328,34 +15531,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15496,6 +15708,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15524,7 +15744,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15673,6 +15893,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15748,6 +15976,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15853,33 +16084,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15889,12 +16163,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16213,8 +16500,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16355,9 +16642,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18262,24 +18546,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19452,6 +19743,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21267,10 +21561,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22671,6 +22961,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24212,6 +24517,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25708,15 +26028,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25958,6 +26269,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25993,6 +26341,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26002,6 +26353,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26011,15 +26365,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26052,7 +26424,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26069,9 +26447,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26764,6 +27139,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27602,6 +27980,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27622,46 +28006,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27694,6 +28086,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28069,9 +28467,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28556,9 +28951,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28677,42 +29069,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28725,15 +29108,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30826,9 +31200,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/ca.po b/i18n/po/ca.po
index e8b61ca..fc25463 100644
--- a/i18n/po/ca.po
+++ b/i18n/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2017-03-14 22:52+0000\n"
"Last-Translator: Don-vip <Unknown>\n"
"Language-Team: el_libre - - www.catmidia.cat\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:41+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:40+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: ca\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3623,6 +3623,9 @@ msgstr "Projecció"
msgid "Matrix set identifier"
msgstr "Identificador del conjunt de matrius"
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "No hi ha capes definides al document getCapabilities: {0}"
@@ -3631,6 +3634,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4358,6 +4366,9 @@ msgstr "Aquest test verifica si els multipolígons són vàlids"
msgid "Area style way is not closed"
msgstr "La via que delimita l''àrea no està tancada"
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "No hi ha via exterior al multipolígon"
@@ -4420,6 +4431,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr "Rol no adequat per a un membre del multipolígon"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "No hi ha vies al multipolígon"
@@ -9925,47 +9939,50 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} objecte a suprimir:"
msgstr[1] "{0} objectes a suprimir:"
-msgid "Show tile info"
-msgstr "Mostra la informació de la tessel·la"
+msgid "Native projections"
+msgstr ""
-msgid "Tile Info"
-msgstr "Informació de la tessel·la"
+msgid "Offset"
+msgstr "Decalatge"
-msgid "Metadata "
-msgstr "Metadades "
+msgid "Tile download projection"
+msgstr ""
-msgid "Load tile"
-msgstr "Carrega la tessel·la"
+msgid "Tile display projection"
+msgstr ""
-msgid "Auto zoom"
-msgstr "Zoom automàtic"
+msgid "Current zoom"
+msgstr ""
-msgid "Auto load tiles"
-msgstr "Carrega automàticament les tessel·les"
+msgid "Show tile info"
+msgstr "Mostra la informació de la tessel·la"
-msgid "Show errors"
-msgstr "Mostra els errors"
+msgid "Tile Info"
+msgstr "Informació de la tessel·la"
-msgid "Load all tiles"
-msgstr "Carrega totes les tessel·les"
+msgid "Tile name"
+msgstr ""
-msgid "Load all error tiles"
-msgstr "Carrega totes les tessel·les errònies"
+msgid "Tile URL"
+msgstr ""
-msgid "Zoom to native resolution"
-msgstr "Amplia a la resolució nativa"
+msgid "Tile size"
+msgstr ""
-msgid "Change resolution"
-msgstr "Canviar resolució"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Ampliar"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Fer més petit"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
-msgstr "Allibera la memòria cau de tessel·les"
+msgid "Metadata "
+msgstr "Metadades "
+
+msgid "Load tile"
+msgstr "Carrega la tessel·la"
msgid "Failed to create tile source"
msgstr "Ha fallat la creació d''una font de tessel·les"
@@ -10081,8 +10098,14 @@ msgstr[1] "{0} tracks, "
msgid "Save GPX file"
msgstr "Desa-ho en format GPX"
-msgid "Imagery fade"
-msgstr "Degradació de la imatgeria"
+msgid "Id"
+msgstr "Id"
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
+msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr "Tipus d''imatgeria no suportat: {0}"
@@ -10197,9 +10220,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Desa el fitxer OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "EPSG: les projeccions 4326 i Mercator són suportades"
-
msgid "Validation errors"
msgstr "Errors de validació"
@@ -10210,11 +10230,12 @@ msgid "Set WMS Bookmark"
msgstr "Establir un favorit WMS"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
-"JOSM utilitzarà EPSG:4326 per fer la consulta al servidor però la resposta "
-"pot variar en funció del servidor WMS"
msgid "Correlate to GPX"
msgstr "Correlacionar a GPX"
@@ -10390,20 +10411,6 @@ msgstr "Heu de seleccionar un tack GPX"
msgid "No selected GPX track"
msgstr "Cap track GPX seleccionat"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Error en analitzar la zona horària.\n"
-"Format esperat: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Error en analitzar el decalatge.\n"
-"Format esperat: {0}"
-
msgid "Geotagged Images"
msgstr "Imatges geolocalitzades"
@@ -10545,12 +10552,26 @@ msgstr ""
"\n"
"hora GPS: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Error en analitzar el decalatge.\n"
+"Format esperat: {0}"
+
msgid "Show thumbnails"
msgstr "Mostra les miniatures"
msgid "Show image thumbnails instead of icons."
msgstr "Mostra miniatures de les imatges en comptes d''icones"
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Error en analitzar la zona horària.\n"
+"Format esperat: {0}"
+
msgid "Choose visible tracks"
msgstr "Escollir tracks visibles"
@@ -10727,6 +10748,36 @@ msgstr "Marcadors a partir de punts amb nom"
msgid "Named Trackpoints from {0}"
msgstr "Punts del track anomenats a partir de {0}"
+msgid "Auto load tiles"
+msgstr "Carrega automàticament les tessel·les"
+
+msgid "Auto zoom"
+msgstr "Zoom automàtic"
+
+msgid "Decrease zoom"
+msgstr "Fer més petit"
+
+msgid "Flush tile cache"
+msgstr "Allibera la memòria cau de tessel·les"
+
+msgid "Increase zoom"
+msgstr "Ampliar"
+
+msgid "Load all tiles"
+msgstr "Carrega totes les tessel·les"
+
+msgid "Load all error tiles"
+msgstr "Carrega totes les tessel·les errònies"
+
+msgid "Show errors"
+msgstr "Mostra els errors"
+
+msgid "Change resolution"
+msgstr "Canviar resolució"
+
+msgid "Zoom to native resolution"
+msgstr "Amplia a la resolució nativa"
+
msgid "gps marker"
msgstr "marcador gps"
@@ -12349,15 +12400,6 @@ msgstr "Nom de la memòria cau"
msgid "Object Count"
msgstr "Nombre d''objectes"
-msgid "imagery fade"
-msgstr "degrada la imatgeria"
-
-msgid "Fade Color: "
-msgstr "Degrada color: "
-
-msgid "Fade amount: "
-msgstr "Nivell de degradació: "
-
msgid "Soft"
msgstr "Tou"
@@ -12407,6 +12449,9 @@ msgstr "Imatgeria de fons: predeterminat"
msgid "Available default entries:"
msgstr "Entrades predeterminades disponibles:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "Entrades seleccionades:"
@@ -13703,6 +13748,9 @@ msgstr "Atributs Opcionals:"
msgid "Unknown requisite: {0}"
msgstr "Requisit desconegut: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "Expressió de membre incorrecta: {0}"
@@ -14996,6 +15044,9 @@ msgstr "reemplaçat pel nou connector {0}"
msgid "no longer required"
msgstr "ha deixat de ser requerit"
+msgid "Plugin information"
+msgstr "Informació del connector"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -15238,9 +15289,6 @@ msgstr ""
"El connector ha estat suprimit de la configuració. Reinicieu JOSM per tal de "
"carregar el connector."
-msgid "Plugin information"
-msgstr "Informació del connector"
-
msgid "no description available"
msgstr "descripció no disponible"
@@ -16134,6 +16182,14 @@ msgid "farmland"
msgstr "granja"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "residencial"
@@ -16145,6 +16201,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr "matolls"
@@ -16157,6 +16225,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "industrial"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "carrer associat"
@@ -16513,6 +16605,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -16615,6 +16715,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -16666,10 +16769,10 @@ msgstr "SPW (Valònia) 2012-2013 imatgeria aèria"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW (Valònia) 2009-2010 imatgeria aèria"
-msgid "TEC bus lines (2014)"
-msgstr "TEC línies d''autobús (2014)"
+msgid "TEC bus lines"
+msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -16702,6 +16805,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Geobase Hidrografia"
@@ -16754,6 +16932,12 @@ msgstr "Tèquia RUIAN parcel·les"
msgid "Czech pLPIS"
msgstr "Tèquia pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Dinamarca)"
@@ -16902,6 +17086,12 @@ msgstr "Berlin fotografia aèria 2015"
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16942,6 +17132,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -16966,6 +17164,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -17010,34 +17211,43 @@ msgstr "Imatgeria de vehicel aeri no tripulat Canaan (Haiti) Novembre 2015"
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
-msgstr "FÖMI ortofoto 2000"
+msgid "FÖMI orthophoto 2000"
+msgstr ""
-msgid "FÖMI ortophoto 2005"
-msgstr "FÖMI ortofoto 2005"
+msgid "FÖMI orthophoto 2005"
+msgstr ""
-msgid "Szeged ortophoto 2011"
-msgstr "Szeged ortofto 2011"
+msgid "Szeged orthophoto 2011"
+msgstr ""
msgid "Inner part of Szeged"
msgstr "Zona interior de Szeged"
-msgid "Törökbálint ortophoto 2013"
-msgstr "Törökbálint ortofoto 2013"
+msgid "Törökbálint orthophoto 2013"
+msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
-msgstr "Törökbálint ortofoto 2015"
+msgid "Törökbálint orthophoto 2015"
+msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -17178,6 +17388,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Ortofoto Svalbard 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -17206,8 +17424,8 @@ 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ó)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: Ortofotomapa (imatgeria aèria)"
@@ -17355,6 +17573,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Cotxe"
@@ -17430,6 +17656,9 @@ msgstr "Kanton Aargau 25cm (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Cantó d''Aargau 25cm (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -17535,33 +17764,76 @@ msgstr "Carreteres TIGER 2012"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr "Noves carreteres de TIGER desalineades (2015)"
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
msgid "NC Latest Orthoimagery"
msgstr "NC darrera Ortoimatgeria"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr "Carreteres Servei Forestal USA"
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -17571,12 +17843,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -17907,8 +18192,8 @@ msgstr ""
"Optimitzat per basemap."
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -18084,9 +18369,6 @@ msgstr ""
"Base de dades de decalatges d''imatgeria: comparteix i adquireix decalatges "
"amb un botó."
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "Mode de mapa d''ajustament de la imatgeria en estil WMSPlugin"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -20103,26 +20385,33 @@ msgstr "Carril bici/Pista"
msgid "Cycleway"
msgstr "Via ciclista"
+msgctxt "cycleway"
msgid "lane"
-msgstr "carril"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "pista"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "carril_oposat"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "carril_oposat"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
-msgstr "oposat"
+msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "compartit_amb_bus"
+msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "carril_compartit"
+msgstr ""
msgid "Cycleway left"
msgstr "Via ciclista a l''esquerra"
@@ -21303,6 +21592,9 @@ msgstr ""
msgid "Wash"
msgstr "Rentat"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Concessionari de cotxes"
@@ -23122,10 +23414,6 @@ msgid "garages"
msgstr "aparcaments"
msgctxt "building"
-msgid "industrial"
-msgstr "industrial"
-
-msgctxt "building"
msgid "school"
msgstr "escola"
@@ -24528,6 +24816,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Jaciment arqueològic"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Camp de batalla"
@@ -26090,6 +26393,21 @@ msgstr "Centre Administratiu"
msgid "Label point"
msgstr "Punt de l''etiqueta"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "Lloc"
@@ -27645,15 +27963,6 @@ msgstr "Importa imatges locals"
msgid "Import pictures into Mapillary layer"
msgstr "Importa imatges a la capa de Mapillary"
-msgid "Select pictures"
-msgstr "Seleccioneu imatges"
-
-msgid "Import pictures into sequence"
-msgstr "Importa imatges a la seqüència"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importa fotografies a la capa de Mapillary en una seqüència"
-
msgid "Join mode"
msgstr "Afegeix mode"
@@ -27897,6 +28206,43 @@ msgstr "Segueix la imatge seleccionada"
msgid "Go forward"
msgstr "Vés endavant"
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Importa"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -27932,6 +28278,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -27941,6 +28290,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -27950,15 +28302,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -27991,7 +28361,13 @@ msgstr[1] "{0} imatges girades"
msgid "2 images unjoined"
msgstr "2 imatges tretes"
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -28008,9 +28384,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr "Descarregant"
@@ -28832,6 +29205,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -29744,6 +30120,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -29764,46 +30146,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
-msgstr ""
+msgid "Replace Geometry"
+msgstr "Reemplaçar geometria"
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
-msgstr "Configura els paràmetres de configuració"
+msgid "List of tags to merge"
+msgstr ""
-msgid "Generate matches"
-msgstr "Genera conincidències"
+msgid "except"
+msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Reemplaçar geometria"
+msgid "Advanced Example"
+msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
+msgstr "Configura els paràmetres de configuració"
+
+msgid "Generate matches"
+msgstr "Genera conincidències"
+
+msgid "Merging"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -29836,6 +30226,12 @@ msgstr "Selecció buida"
msgid "Freeze reference selection"
msgstr "Boqueja la selecció de referència"
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -30239,9 +30635,6 @@ msgstr "Importa Globalsat"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Importa dades de Globalsat Datalogger DG100 a una capa GPX"
-msgid "Import"
-msgstr "Importa"
-
msgid "GPS Blams"
msgstr "GPS Blams"
@@ -30765,9 +31158,6 @@ msgstr "Carregant decalatges d''imatgeria..."
msgid "Error processing XML response: {0}"
msgstr "Error en processar la resposta XML:{0}"
-msgid "Offset"
-msgstr "Decalatge"
-
msgid "Imagery Offset Database"
msgstr "Base de dades dels decalatges d''imatgeria"
@@ -30909,25 +31299,6 @@ msgstr "Pujant un nou decalatge ..."
msgid "This string should be 3 to 200 letters long."
msgstr "El text ha de ser d''una longitud d''entre 3 i 200 lletres."
-msgid "Adjust imagery"
-msgstr "Ajusta la imatgeria"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Ajusta la posició de la capa d''imatgeria seleccionada"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Si us plau seleccioneu la capa d''imatgeria a ajustar."
-
-msgid "Start adjusting"
-msgstr "Inicia l''ajustament"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr ""
-"En aquest moment no hi ha cap capa d''imatgeria que pugui ser ajustada"
-
-msgid "No layers to adjust"
-msgstr "No hi ha capes que puguin ser ajustades"
-
msgid "Normal"
msgstr "Normal"
@@ -30940,12 +31311,21 @@ msgstr "Girar 180"
msgid "Rotate 270"
msgstr "Girar 270"
-msgid "Previous image"
-msgstr "Imatge prèvia"
+msgid "WayPoint Image"
+msgstr "WayPoint Image"
+
+msgid "Display non-geotagged photos"
+msgstr "Mostra les fotografies no georeferenciades"
+
+msgid "Imported Images"
+msgstr "Imatges importades"
msgid "Next image"
msgstr "Imatge següent"
+msgid "Previous image"
+msgstr "Imatge prèvia"
+
msgid "Rotate left"
msgstr "Gira a l''esquerra"
@@ -30958,15 +31338,6 @@ msgstr "Gira a la dreta"
msgid "Rotate image right"
msgstr "Gira la imatge ver la dreta"
-msgid "WayPoint Image"
-msgstr "WayPoint Image"
-
-msgid "Display non-geotagged photos"
-msgstr "Mostra les fotografies no georeferenciades"
-
-msgid "Imported Images"
-msgstr "Imatges importades"
-
msgid "Import vector graphics"
msgstr "Importa gràfics vectorials"
@@ -33203,9 +33574,6 @@ msgstr "Entra"
msgid "Public Transport: Join GTFS stops"
msgstr "Transport públic: afegeix parades GTFS"
-msgid "Id"
-msgstr "Id"
-
msgid "State"
msgstr "Comunitat autònoma/Estat federal"
diff --git a/i18n/po/ca at valencia.po b/i18n/po/ca at valencia.po
index 04f579b..c3039fa 100644
--- a/i18n/po/ca at valencia.po
+++ b/i18n/po/ca at valencia.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2015-04-25 18:52+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: el_libre - - www.catmidia.cat\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:22+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:19+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: ca at valencia\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3579,6 +3579,9 @@ msgstr "Projecció"
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3587,6 +3590,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4296,6 +4304,9 @@ msgstr "Este test verifica si els multipolígons són vàlids"
msgid "Area style way is not closed"
msgstr "La via que delimita l''àrea no està tancada"
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "No hi ha via exterior al multipolígon"
@@ -4352,6 +4363,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr "Rol no adequat per a un membre del multipolígon"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "No hi ha vies al multipolígon"
@@ -9761,46 +9775,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} objecte a suprimir:"
msgstr[1] "{0} objectes a suprimir:"
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
+msgstr "Decalatge"
+
+msgid "Tile download projection"
msgstr ""
-msgid "Metadata "
+msgid "Tile display projection"
msgstr ""
-msgid "Load tile"
+msgid "Current zoom"
msgstr ""
-msgid "Auto zoom"
+msgid "Show tile info"
msgstr ""
-msgid "Auto load tiles"
-msgstr "Carrega automàticament les tessel·les"
+msgid "Tile Info"
+msgstr ""
-msgid "Show errors"
+msgid "Tile name"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile size"
msgstr ""
-msgid "Zoom to native resolution"
-msgstr "Amplia a la resolució nativa"
+msgid "Tile display size"
+msgstr ""
-msgid "Change resolution"
-msgstr "Canviar resolució"
+msgid "Reprojection"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Ampliar"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Fer més petit"
+msgid "Metadata "
+msgstr ""
-msgid "Flush tile cache"
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9915,8 +9932,14 @@ msgstr[1] "{0} tracks, "
msgid "Save GPX file"
msgstr "Guarda-ho en format GPX"
-msgid "Imagery fade"
-msgstr "Degradació de la imatgeria"
+msgid "Id"
+msgstr "Id"
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
+msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
@@ -10031,9 +10054,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Guarda el fitxer OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "EPSG: les projeccions 4326 i Mercator són suportades"
-
msgid "Validation errors"
msgstr "Errors de validació"
@@ -10044,8 +10064,11 @@ msgid "Set WMS Bookmark"
msgstr "Establir un favorit WMS"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -10222,20 +10245,6 @@ msgstr "Heu de seleccionar un tack GPX"
msgid "No selected GPX track"
msgstr "Cap track GPX seleccionat"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Error en analitzar la zona horària.\n"
-"Format esperat: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Error en analitzar el decalatge.\n"
-"Format esperat: {0}"
-
msgid "Geotagged Images"
msgstr "Imatges geolocalitzades"
@@ -10375,12 +10384,26 @@ msgstr ""
"\n"
"hora GPS: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Error en analitzar el decalatge.\n"
+"Format esperat: {0}"
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Error en analitzar la zona horària.\n"
+"Format esperat: {0}"
+
msgid "Choose visible tracks"
msgstr "Escollir tracks visibles"
@@ -10557,6 +10580,36 @@ msgstr "Marcadors a partir de punts amb nom"
msgid "Named Trackpoints from {0}"
msgstr "Punts del track anomenats a partir de {0}"
+msgid "Auto load tiles"
+msgstr "Carrega automàticament les tessel·les"
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr "Fer més petit"
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr "Ampliar"
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr "Canviar resolució"
+
+msgid "Zoom to native resolution"
+msgstr "Amplia a la resolució nativa"
+
msgid "gps marker"
msgstr "marcador gps"
@@ -12176,15 +12229,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr "degrada la imatgeria"
-
-msgid "Fade Color: "
-msgstr "Degrada color: "
-
-msgid "Fade amount: "
-msgstr "Nivell de degradació: "
-
msgid "Soft"
msgstr "Tou"
@@ -12234,6 +12278,9 @@ msgstr "Imatgeria de fons: predeterminat"
msgid "Available default entries:"
msgstr "Entrades predeterminades disponibles:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "Entrades seleccionades:"
@@ -13516,6 +13563,9 @@ msgstr "Atributs Opcionals:"
msgid "Unknown requisite: {0}"
msgstr "Requisit desconegut: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "Expressió de membre incorrecta: {0}"
@@ -14800,6 +14850,9 @@ msgstr "reemplaçat pel nou connector {0}"
msgid "no longer required"
msgstr "ha deixat de ser requerit"
+msgid "Plugin information"
+msgstr "Informació del connector"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -15040,9 +15093,6 @@ msgstr ""
"El connector ha estat suprimit de la configuració. Per favor, reinicieu JOSM "
"per tal de carregar el connector."
-msgid "Plugin information"
-msgstr "Informació del connector"
-
msgid "no description available"
msgstr "descripció no disponible"
@@ -15924,6 +15974,14 @@ msgid "farmland"
msgstr "granja"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "residencial"
@@ -15935,6 +15993,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr "matolls"
@@ -15947,6 +16017,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "industrial"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "carrer associat"
@@ -16303,6 +16397,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -16405,6 +16507,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -16456,10 +16561,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -16492,6 +16597,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -16544,6 +16724,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -16690,6 +16876,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16729,6 +16921,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -16753,6 +16953,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -16797,34 +17000,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -16965,6 +17177,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -16993,7 +17213,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -17142,6 +17362,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -17217,6 +17445,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -17322,33 +17553,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -17358,12 +17632,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -17687,8 +17974,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -17855,9 +18142,6 @@ msgstr ""
"Base de dades de decalatges d''imatgeria: comparteix i adquireix decalatges "
"amb un botó."
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "Mode de mapa d''ajustament de la imatgeria en estil WMSPlugin"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -19839,26 +20123,33 @@ msgstr "Carril bici/Pista"
msgid "Cycleway"
msgstr "Via ciclista"
+msgctxt "cycleway"
msgid "lane"
-msgstr "carril"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "pista"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "carril_oposat"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "carril_oposat"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
-msgstr "oposat"
+msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "compartit_amb_bus"
+msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "carril_compartit"
+msgstr ""
msgid "Cycleway left"
msgstr "Via ciclista a l''esquerra"
@@ -21030,6 +21321,9 @@ msgstr ""
msgid "Wash"
msgstr "Rentat"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Concessionari de cotxes"
@@ -22847,10 +23141,6 @@ msgid "garages"
msgstr "aparcaments"
msgctxt "building"
-msgid "industrial"
-msgstr "industrial"
-
-msgctxt "building"
msgid "school"
msgstr "escola"
@@ -24251,6 +24541,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Jaciment arqueològic"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Camp de batalla"
@@ -25792,6 +26097,21 @@ msgstr "Centre Administratiu"
msgid "Label point"
msgstr "Punt de l''etiqueta"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "Lloc"
@@ -27315,15 +27635,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -27565,6 +27876,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Importa"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -27600,6 +27948,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -27609,6 +27960,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -27618,15 +27972,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -27659,7 +28031,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -27676,9 +28054,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -28484,6 +28859,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -29396,6 +29774,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -29416,46 +29800,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
+msgstr "Reemplaçar geometria"
+
+msgid "Merge Tags"
msgstr ""
-msgid "<Please select data>"
+msgid "List of tags to merge"
msgstr ""
-msgid "Configure conflation settings"
+msgid "except"
msgstr ""
-msgid "Generate matches"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Reference:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Subject:"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Programming"
+msgid "Simple Example"
msgstr ""
-msgid "Merging"
+msgid "Advanced Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Reemplaçar geometria"
+msgid "<Please select data>"
+msgstr ""
-msgid "Merge Tags"
+msgid "Configure conflation settings"
msgstr ""
-msgid "List of tags to merge"
+msgid "Generate matches"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Merging"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -29488,6 +29880,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -29876,9 +30274,6 @@ msgstr "Importa Globalsat"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Importa dades de Globalsat Datalogger DG100 a una capa GPX"
-msgid "Import"
-msgstr "Importa"
-
msgid "GPS Blams"
msgstr "GPS Blams"
@@ -30401,9 +30796,6 @@ msgstr "Carregant decalatges d''imatgeria..."
msgid "Error processing XML response: {0}"
msgstr "Error en processar la resposta XML:{0}"
-msgid "Offset"
-msgstr "Decalatge"
-
msgid "Imagery Offset Database"
msgstr "Base de dades dels decalatges d''imatgeria"
@@ -30545,24 +30937,6 @@ msgstr "Descarregant un nou decalatge ..."
msgid "This string should be 3 to 200 letters long."
msgstr "El text ha de ser d''una longitud d''entre 3 i 200 lletres."
-msgid "Adjust imagery"
-msgstr "Ajusta la imatgeria"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Ajusta la posició de la capa d''imatgeria seleccionada"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Per favor seleccioneu la capa d''imatgeria a ajustar."
-
-msgid "Start adjusting"
-msgstr "Inicia l''ajustament"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "En este moment no hi ha cap capa d''imatgeria que puga ser ajustada"
-
-msgid "No layers to adjust"
-msgstr "No hi ha capes que puguen ser ajustades"
-
msgid "Normal"
msgstr "Normal"
@@ -30575,12 +30949,21 @@ msgstr "Girar 180"
msgid "Rotate 270"
msgstr "Girar 270"
-msgid "Previous image"
-msgstr "Imatge prèvia"
+msgid "WayPoint Image"
+msgstr "WayPoint Image"
+
+msgid "Display non-geotagged photos"
+msgstr "Mostra les fotografies no georeferenciades"
+
+msgid "Imported Images"
+msgstr "Imatges importades"
msgid "Next image"
msgstr "Imatge següent"
+msgid "Previous image"
+msgstr "Imatge prèvia"
+
msgid "Rotate left"
msgstr "Gira a l''esquerra"
@@ -30593,15 +30976,6 @@ msgstr "Gira a la dreta"
msgid "Rotate image right"
msgstr "Gira la imatge ver la dreta"
-msgid "WayPoint Image"
-msgstr "WayPoint Image"
-
-msgid "Display non-geotagged photos"
-msgstr "Mostra les fotografies no georeferenciades"
-
-msgid "Imported Images"
-msgstr "Imatges importades"
-
msgid "Import vector graphics"
msgstr "Importa gràfics vectorials"
@@ -32835,9 +33209,6 @@ msgstr "Entra"
msgid "Public Transport: Join GTFS stops"
msgstr "Transport públic: afig parades GTFS"
-msgid "Id"
-msgstr "Id"
-
msgid "State"
msgstr "Comunitat autònoma/Estat federal"
diff --git a/i18n/po/cs.po b/i18n/po/cs.po
index 2e1502c..99206c7 100644
--- a/i18n/po/cs.po
+++ b/i18n/po/cs.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
-"PO-Revision-Date: 2017-03-24 03:22+0000\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"PO-Revision-Date: 2017-04-28 03:15+0000\n"
"Last-Translator: Dalibor Jelínek <launchpad.net at dalibor.cz>\n"
"Language-Team: Czech <kde-i18n-doc at kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:42+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:41+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: cs\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3626,6 +3626,9 @@ msgstr "Projekce"
msgid "Matrix set identifier"
msgstr "Identifikátor množiny matic"
+msgid "No default layer selected, choosing first layer."
+msgstr "Není zvolena výchozí vrstva, vybírám první vrstvu."
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Dokument getCapabilities nedefinuje žádné vrstvy: {0}"
@@ -3636,6 +3639,13 @@ msgstr ""
"{2}"
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+"Nemohu použít vrstvu {0}, protože jsem nenašel žádný podporovaný formát. "
+"Vrstva je dostupná v těchto formátech: {1}"
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4336,6 +4346,9 @@ msgstr "Tento test kontroluje správnost multipolygonů."
msgid "Area style way is not closed"
msgstr "Cesta typu plochy není uzavřená"
+msgid "No outer way for boundary"
+msgstr "Hranice nemá vnější cestu"
+
msgid "No outer way for multipolygon"
msgstr "Multipolygon nemá vnější cestu"
@@ -4402,6 +4415,9 @@ 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"
+msgid "Non-Way in boundary"
+msgstr "Ne-cesta v hranici"
+
msgid "Non-Way in multipolygon"
msgstr "Ne-cesta v multipolygonu"
@@ -5663,7 +5679,7 @@ msgid "Item {0} not found in list."
msgstr "Položka {0} nenalezena v seznamu."
msgid "lock scrolling"
-msgstr "posouvat synchronně (uzamknout)"
+msgstr "posouvat synchronně (s ostatními verzemi)"
msgid "Compare "
msgstr "Porovnat "
@@ -5801,7 +5817,7 @@ msgid ""
"<html>Click <strong>{0}</strong> to finish merging my and their "
"entries.</html>"
msgstr ""
-"Klikněte na <strong>{0}</strong> pro dokončení slučování mých a cizích "
+"<html>Kliknutí na <strong>{0}</strong> ukončí slučování mých a cizích "
"položek.</html>"
msgid "My version ({0} entry)"
@@ -6897,7 +6913,7 @@ msgid "On/Off"
msgstr "Zap/Vyp"
msgid "Turn selected styles on or off"
-msgstr "Vypnout nebo zapnout zvolené styly"
+msgstr "Přepnout vybrané styly"
msgid "Move the selected entry one row down."
msgstr "Přesunout zvolenou položku o řádek níže."
@@ -7961,7 +7977,7 @@ msgid "Use English language for tag by default"
msgstr "Používat jako výchozí jazyk pro značky angličtinu"
msgid "Add value?"
-msgstr "Přidat hodnotu?"
+msgstr "Přidat značku?"
msgid "This will change up to {0} object."
msgid_plural "This will change up to {0} objects."
@@ -7982,13 +7998,13 @@ msgid "Remember last used tags after a restart"
msgstr "Pamatovat si naposledy použité značky po restartu"
msgid "Recent tags with existing key"
-msgstr "Dřívější značky se současným klíčem"
+msgstr "Značky s již použitým klíčem"
msgid "Enable"
msgstr "Povolit"
msgid "Hide"
-msgstr "Úkryt"
+msgstr "Skrýt"
msgid "Refresh recent tags list after applying tag"
msgstr "Občerstvit seznam dřívějších značek po aplikaci značky"
@@ -8019,7 +8035,7 @@ msgid "Please enter integer number between 0 and {0}"
msgstr "Vložte prosím celé číslo mezi 0 a {0}"
msgid "Recently added tags"
-msgstr "Naposledy přidané značky"
+msgstr "Nedávno přidané značky"
msgid "Choose recent tag {0}"
msgstr "Vybrat nedávnou značku {0}"
@@ -9028,13 +9044,13 @@ msgstr ""
"Zaškrtněte \"Uložit\", aby se vrstva uložila do souboru určeného vlevo."
msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "Napište stručný komentář ke změnám, které nahráváte na server:"
+msgstr "Stručný komentář ke změnám"
msgid "Enter an upload comment"
msgstr "Zadejte komentář k nahrávaným datům"
msgid "Specify the data source for the changes"
-msgstr "Zadejte zdroj dat vašich změn"
+msgstr "Zdroj vašich změn"
msgid "obtain from current layers"
msgstr "získat z aktuální vrstvy"
@@ -9394,7 +9410,7 @@ msgid "Delete now!"
msgstr "Smazat teď!"
msgid "Delete layers without saving. Unsaved changes are lost."
-msgstr "Smazat vrstvy bez ukládání. Neuložené změny budou ztraceny."
+msgstr "Smazat vrstvy bez jejich uložení. Neuložené změny budou ztraceny."
msgid "Perform actions before exiting"
msgstr "Před ukončením provést akce"
@@ -9430,13 +9446,13 @@ msgid_plural ""
"<html>Upload and/or save operations of {0} layers with modifications<br>were "
"canceled or have failed.</html>"
msgstr[0] ""
-"<html>Nahrávání a/nebo ukládání vrstvy s modifikacemi<br>bylo přerušeno nebo "
-"selhalo.</html>"
+"<html>Nahrávání a/nebo ukládání vrstvy s modifikacemi<br>bylo přerušeno, "
+"nebo selhalo.</html>"
msgstr[1] ""
-"<html>Nahrávání a/nebo ukládání {0} vrstev s modifikacemi<br>bylo přerušeno "
+"<html>Nahrávání a/nebo ukládání {0} vrstev s modifikacemi<br>bylo přerušeno, "
"nebo selhalo.</html>"
msgstr[2] ""
-"<html>Nahrávání a/nebo ukládání {0} vrstev s modifikacemi<br>bylo přerušeno "
+"<html>Nahrávání a/nebo ukládání {0} vrstev s modifikacemi<br>bylo přerušeno, "
"nebo selhalo.</html>"
msgid "Incomplete upload and/or save"
@@ -9446,7 +9462,7 @@ msgid "should be uploaded"
msgstr "mělo by být nahráno na server"
msgid "should be saved"
-msgstr "mělo by být uloženo"
+msgstr "mělo by být uloženo na disk"
msgid ""
"Layer ''{0}'' has modifications which should be uploaded to the server."
@@ -9456,7 +9472,7 @@ msgid "Layer ''{0}'' has modifications which are discouraged to be uploaded."
msgstr "Vrstva ''{0}'' obsahuje změny, které se nedoporučuje nahrát."
msgid "Layer ''{0}'' has no modifications to be uploaded."
-msgstr "Vrstva ''{0}'' nemá žádné změny k nahrání na server."
+msgstr "Vrstva ''{0}'' neobsahuje žádné změny k nahrání na server."
msgid ""
"Layer ''{0}'' has modifications which should be saved to its associated file "
@@ -9466,7 +9482,7 @@ msgstr ""
"souboru ''{1}''."
msgid "Layer ''{0}'' has no modifications to be saved."
-msgstr "Vrstva ''{0}'' nemá žádné změny k uložení."
+msgstr "Vrstva ''{0}'' neobsahuje žádné změny k uložení."
msgid "Layer Name and File Path"
msgstr "Název vrstvy a cesta k souboru"
@@ -9517,7 +9533,7 @@ msgid "Upload the changed primitives"
msgstr "Nahrát na server změněné prvky"
msgid "Please revise upload comment"
-msgstr "Prosím opravte komentář změny"
+msgstr "Prosím upravte komentář"
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
@@ -9657,7 +9673,7 @@ msgstr ""
"použití <strong>{1} požadavků</strong>"
msgid "advanced configuration"
-msgstr "rozšířená konfigurace"
+msgstr "změnit"
msgid ""
"{0} objects exceed the max. allowed {1} objects in a changeset on the server "
@@ -9799,7 +9815,7 @@ msgstr ""
"nahrálo {0} objektů. Jakou strategii chcete zvolit?</html>"
msgid "Upload in one request not possible (too many objects to upload)"
-msgstr "Nahrání v jednom požadavku není možné (příliš mnoho objektů)"
+msgstr "Nelze nahrát v jednom požadavku (příliš mnoho objektů)"
msgid ""
"<html>Cannot upload {0} objects in one request because the<br>max. changeset "
@@ -9861,47 +9877,50 @@ msgstr[0] "{0} smazaný objekt:"
msgstr[1] "{0} smazané objekty:"
msgstr[2] "{0} smazaných objektů:"
-msgid "Show tile info"
-msgstr "Zobrazit informace o dlaždici"
+msgid "Native projections"
+msgstr "Nativní projekce"
-msgid "Tile Info"
-msgstr "Informace o dlaždici"
+msgid "Offset"
+msgstr "Posuv"
-msgid "Metadata "
-msgstr "Metadata "
+msgid "Tile download projection"
+msgstr "Projekce stahování dlaždic"
-msgid "Load tile"
-msgstr "Načíst dlaždici"
+msgid "Tile display projection"
+msgstr "Projekce zobrazování dlaždic"
-msgid "Auto zoom"
-msgstr "Automatické zvětšení"
+msgid "Current zoom"
+msgstr "Aktuální přiblížení"
-msgid "Auto load tiles"
-msgstr "Automaticky načítat dlaždice"
+msgid "Show tile info"
+msgstr "Zobrazit informace o dlaždici"
-msgid "Show errors"
-msgstr "Zobrazovat chyby"
+msgid "Tile Info"
+msgstr "Informace o dlaždici"
-msgid "Load all tiles"
-msgstr "Načíst všechny dlaždice"
+msgid "Tile name"
+msgstr "Název dlaždice"
-msgid "Load all error tiles"
-msgstr "Načíst všechny chybné dlaždice"
+msgid "Tile URL"
+msgstr "URL dlaždice"
-msgid "Zoom to native resolution"
-msgstr "Zvětšit do nativního rozlišení"
+msgid "Tile size"
+msgstr "Velikost dlaždice"
-msgid "Change resolution"
-msgstr "Změnit rozlišení"
+msgid "Tile display size"
+msgstr "Velikost zobrazení dlaždice"
-msgid "Increase zoom"
-msgstr "Zvětšit přiblížení"
+msgid "Reprojection"
+msgstr "Reprojekce"
-msgid "Decrease zoom"
-msgstr "Zmenšit přiblížení"
+msgid "Reprojected tile size"
+msgstr "Velikost reprojektované dlaždice"
-msgid "Flush tile cache"
-msgstr "Vymazat keš dlaždic"
+msgid "Metadata "
+msgstr "Metadata "
+
+msgid "Load tile"
+msgstr "Načíst dlaždici"
msgid "Failed to create tile source"
msgstr "Selhalo vytvoření zdroje dlaždice"
@@ -10023,8 +10042,14 @@ msgstr[2] "{0} cesty, "
msgid "Save GPX file"
msgstr "Uložit GPX soubor"
-msgid "Imagery fade"
-msgstr "Zeslabení mapového podkladu"
+msgid "Id"
+msgstr "Id"
+
+msgid "Min. zoom"
+msgstr "Min. přiblížení"
+
+msgid "Max. zoom"
+msgstr "Max. přiblížení"
msgid "Unsupported imagery type: {0}"
msgstr "Nepodporovaný typ mapového podkladu: {0}"
@@ -10141,9 +10166,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Uložit data OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "Projekce EPSG:4326 a Mercator jsou podporované"
-
msgid "Validation errors"
msgstr "Nalezené problémy"
@@ -10154,11 +10176,14 @@ msgid "Set WMS Bookmark"
msgstr "Nastavit záložku WMS"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
msgstr ""
-"JOSM použije EPSG:4326 pro dotaz na server, ale výsledek může být jiný v "
-"závislosti na WMS serveru"
+"Reprojektuji vrstvu {0} z {1} do {2}. Pro dosažení nejlepší kvality obrazu a "
+"vyšší výkon přepněte na jednu z podporovaných projekcí: {3}"
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
+msgstr "Nemohu najít podporovanou projekci pro vrstvu {0}. Používám {1}."
msgid "Correlate to GPX"
msgstr "Korelovat vůči GPX"
@@ -10330,20 +10355,6 @@ msgstr "Měli byste vybrat GPX trasu"
msgid "No selected GPX track"
msgstr "Není vybrána GPX trasa"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Chyba při čtení časového pásma.\n"
-"Očekávaný formát: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Chyba při čtení posunutí.\n"
-"Očekávaný formát: {0}"
-
msgid "Geotagged Images"
msgstr "Obrázky s GPS souřadnicemi"
@@ -10488,12 +10499,26 @@ msgstr ""
"\n"
"GPS čas: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Chyba při čtení posunutí.\n"
+"Očekávaný formát: {0}"
+
msgid "Show thumbnails"
msgstr "Zobrazit náhledy"
msgid "Show image thumbnails instead of icons."
msgstr "Zobrazit náhledy obrázků namísto ikon."
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Chyba při čtení časového pásma.\n"
+"Očekávaný formát: {0}"
+
msgid "Choose visible tracks"
msgstr "Vyberte viditelné stopy"
@@ -10667,6 +10692,36 @@ msgstr "Značky z pojmenovaných bodů"
msgid "Named Trackpoints from {0}"
msgstr "Pojmenované body z {0}"
+msgid "Auto load tiles"
+msgstr "Automaticky načítat dlaždice"
+
+msgid "Auto zoom"
+msgstr "Automatické zvětšení"
+
+msgid "Decrease zoom"
+msgstr "Zmenšit přiblížení"
+
+msgid "Flush tile cache"
+msgstr "Vymazat keš dlaždic"
+
+msgid "Increase zoom"
+msgstr "Zvětšit přiblížení"
+
+msgid "Load all tiles"
+msgstr "Načíst všechny dlaždice"
+
+msgid "Load all error tiles"
+msgstr "Načíst všechny chybné dlaždice"
+
+msgid "Show errors"
+msgstr "Zobrazovat chyby"
+
+msgid "Change resolution"
+msgstr "Změnit rozlišení"
+
+msgid "Zoom to native resolution"
+msgstr "Zvětšit do nativního rozlišení"
+
msgid "gps marker"
msgstr "GPS značka"
@@ -12248,15 +12303,6 @@ msgstr "Název keše"
msgid "Object Count"
msgstr "Počet objektů"
-msgid "imagery fade"
-msgstr "zeslabení mapového podkladu"
-
-msgid "Fade Color: "
-msgstr "Barva zatmívání: "
-
-msgid "Fade amount: "
-msgstr "Intenzita zatmívání: "
-
msgid "Soft"
msgstr "Jemně"
@@ -12307,6 +12353,9 @@ msgstr "Pozadí mapových podkladů: Výchozí"
msgid "Available default entries:"
msgstr "Dostupné výchozí položky:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr "Nové výchozí položky lze přidat na <a href=\"{0}\">Wiki</a>."
+
msgid "Selected entries:"
msgstr "Vybrané položky:"
@@ -13581,6 +13630,9 @@ msgstr "Volitelné atributy:"
msgid "Unknown requisite: {0}"
msgstr "Neznámý vyžadovaný: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr "Neznámá hodnota regulárního výrazu: {0}"
+
msgid "Illegal member expression: {0}"
msgstr "Nepovolený členský výraz: {0}"
@@ -14827,6 +14879,9 @@ msgstr "nahrazen novým doplňkem {0}"
msgid "no longer required"
msgstr "již není potřeba"
+msgid "Plugin information"
+msgstr "Informace o doplňku"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -15070,9 +15125,6 @@ msgstr ""
"Doplněk byl odstraněn z nastavení. Prosím, restartujte JOSM, aby došlo k "
"jeho odstranění z editoru."
-msgid "Plugin information"
-msgstr "Informace o doplňku"
-
msgid "no description available"
msgstr "popis není dostupný"
@@ -15998,6 +16050,14 @@ msgid "farmland"
msgstr "pole"
msgctxt "landuse"
+msgid "farmyard"
+msgstr "dvůr statku"
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr "hřbitov"
+
+msgctxt "landuse"
msgid "residential"
msgstr "obytná oblast"
@@ -16009,6 +16069,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr "zeleň na návsi"
+msgctxt "landuse"
+msgid "quarry"
+msgstr "lom"
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr "zahrádkářská kolonie"
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr "vinice"
+
msgctxt "natural"
msgid "scrub"
msgstr "křoví"
@@ -16021,6 +16093,30 @@ msgctxt "natural"
msgid "grassland"
msgstr "neudržovaná louka"
+msgctxt "natural"
+msgid "wetland"
+msgstr "mokřad"
+
+msgctxt "natural"
+msgid "heath"
+msgstr "vřesoviště"
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr "hasičská stanice"
+
+msgctxt "leisure"
+msgid "park"
+msgstr "park"
+
+msgctxt "leisure"
+msgid "track"
+msgstr "dráha"
+
+msgctxt "building"
+msgid "industrial"
+msgstr "průmyslová"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "Přiřazená ulice (associatedStreet)"
@@ -16376,6 +16472,16 @@ 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 "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+
msgid "IGN Argentina (TMS)"
msgstr "IGN Argentina (TMS)"
@@ -16478,6 +16584,9 @@ msgstr "OpenStreetMap (belgický styl - holandsky)"
msgid "OpenStreetMap (Belgian Style - German)"
msgstr "OpenStreetMap (belgický styl - německy)"
+msgid "Orthophoto IGN-NGI"
+msgstr "Orthophoto IGN-NGI"
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr "AGIV Flanders most recent aerial imagery"
@@ -16529,11 +16638,11 @@ msgstr "SPW(allonie) 2012-2013 aerial imagery"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 aerial imagery"
-msgid "TEC bus lines (2014)"
-msgstr "TEC bus lines (2014)"
+msgid "TEC bus lines"
+msgstr "TEC bus lines"
-msgid "TEC bus stops (2014)"
-msgstr "TEC bus stops (2014)"
+msgid "TEC bus stops"
+msgstr "TEC bus stops"
msgid "Benin: Cotonou Pleiade 2016"
msgstr "Benin: Cotonou Pleiade 2016"
@@ -16565,6 +16674,81 @@ msgstr "Londrina Ortofoto 2011"
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr "SIG Santa Catarina OrtoRGB 2012"
+msgid "Arapiraca AL"
+msgstr "Arapiraca AL"
+
+msgid "Branquinha AL"
+msgstr "Branquinha AL"
+
+msgid "Cajueiro AL"
+msgstr "Cajueiro AL"
+
+msgid "Campo Alegre AL"
+msgstr "Campo Alegre AL"
+
+msgid "Capela AL"
+msgstr "Capela AL"
+
+msgid "Delmiro Gouveia AL"
+msgstr "Delmiro Gouveia AL"
+
+msgid "Estrela de Alagoas"
+msgstr "Estrela de Alagoas"
+
+msgid "Girau do Ponciano"
+msgstr "Girau do Ponciano"
+
+msgid "Major Isidoro AL"
+msgstr "Major Isidoro AL"
+
+msgid "Mar Vermelho AL"
+msgstr "Mar Vermelho AL"
+
+msgid "Minador do Negrão"
+msgstr "Minador do Negrão"
+
+msgid "Olho d’Agua do Casado AL"
+msgstr "Olho d’Agua do Casado AL"
+
+msgid "Palestina AL"
+msgstr "Palestina AL"
+
+msgid "Palmeira dos Indios AL"
+msgstr "Palmeira dos Indios AL"
+
+msgid "Pão de Açucar AL"
+msgstr "Pão de Açucar AL"
+
+msgid "Piranhas AL"
+msgstr "Piranhas AL"
+
+msgid "Poço das Trincheiras AL"
+msgstr "Poço das Trincheiras AL"
+
+msgid "Santana do Ipanema AL"
+msgstr "Santana do Ipanema AL"
+
+msgid "São Miguel dos Campos AL"
+msgstr "São Miguel dos Campos AL"
+
+msgid "Teotonio Vilela AL"
+msgstr "Teotonio Vilela AL"
+
+msgid "União dos Palmares AL"
+msgstr "União dos Palmares AL"
+
+msgid "Viçosa AL"
+msgstr "Viçosa AL"
+
+msgid "Alagoas Litoral 2006"
+msgstr "Alagoas Litoral 2006"
+
+msgid "DER-ES"
+msgstr "DER-ES"
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr "IBGE-BC250-Trecho Rodoviario"
+
msgid "Geobase Hydrography"
msgstr "Geobase Hydrography"
@@ -16618,6 +16802,12 @@ msgstr "Český RÚIAN parcely"
msgid "Czech pLPIS"
msgstr "Český pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr "Praha IPR nejnovější orotofoto"
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr "Praha IPR mimovegetační orotofoto"
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Dánsko)"
@@ -16767,6 +16957,12 @@ msgstr "Berlin aerial photograph 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Berlin aerial photograph 2016"
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr "Deutsche Bahn VzG lines Nov 2013"
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr "Deutsche Bahn VzG lines Nov 2015"
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Erlangen aerial imagery (2016 5.0 cm)"
@@ -16809,6 +17005,16 @@ msgstr ""
"imagico.de OSM images for mapping: Northern German west coast tidalflats "
"(infrared)"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr "imagico.de OSM images for mapping: North Sea Coast 2016"
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+
msgid "Saxony latest aerial imagery"
msgstr "Saxony latest aerial imagery"
@@ -16833,6 +17039,9 @@ msgstr "Mainz all aerial imageries"
msgid "Mainz latest aerial imagery"
msgstr "Mainz latest aerial imagery"
+msgid "Munich latest aerial imagery 60cm"
+msgstr "Munich latest aerial imagery 60cm"
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr "imagico.de OSM images for mapping: Qasigiannguit"
@@ -16882,35 +17091,44 @@ msgstr "Drone Imagery Canaan(Haiti) November 2015"
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr "Drone Imagery Matthew(Haiti) October 2016"
-msgid "FÖMI ortophoto 2000"
-msgstr "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
+msgstr "FÖMI orthophoto 2000"
-msgid "FÖMI ortophoto 2005"
-msgstr "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
+msgstr "FÖMI orthophoto 2005"
-msgid "Szeged ortophoto 2011"
-msgstr "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
+msgstr "Szeged orthophoto 2011"
msgid "Inner part of Szeged"
msgstr "Inner part of Szeged"
-msgid "Törökbálint ortophoto 2013"
-msgstr "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
+msgstr "Törökbálint orthophoto 2013"
msgid "5 cm resolution bald image"
msgstr "5 cm resolution bald image"
-msgid "Törökbálint ortophoto 2015"
-msgstr "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
+msgstr "Törökbálint orthophoto 2015"
-msgid "Danube flood ortophoto 2013"
-msgstr "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
+msgstr "Danube flood orthophoto 2013"
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
-msgid "Budapest district XI ortophoto 2015"
-msgstr "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr "Budapest district XI orthophoto 2015"
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr "Budapest district XI orthophoto 2017"
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+
+msgid "5 cm resolution bald image of 4 settlement"
+msgstr "5 cm resolution bald image of 4 settlement"
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Hungary (hiking routes)"
@@ -17050,6 +17268,16 @@ msgstr "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard -Orthophoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr "imagico.de OSM images for mapping: Svalbard mosaic"
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr "imagico.de OSM images for mapping: Western Karakoram"
@@ -17079,8 +17307,8 @@ msgid ""
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)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr "Pangasinán/Bulacan (Philippines HiRes)"
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: Ortofotomapa (letecké snímky)"
@@ -17230,6 +17458,16 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr "imagico.de OSM images for mapping: Pechora Sea Coast"
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Auto"
@@ -17305,6 +17543,9 @@ msgstr "Kanton Aargau 25cm (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Kanton Aargau 25cm (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr "Kanton Aargau 25cm (AGIS 2016)"
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr "Kanton Zürich Orthophotos 2014/2015 10cm"
@@ -17411,33 +17652,92 @@ msgstr "TIGER 2012 Roads Overlay"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr "New & Misaligned TIGER Roads (2015)"
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
msgid "NC Latest Orthoimagery"
msgstr "NC Latest Orthoimagery"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+
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 ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr "NJ 2015 Aerial Imagery (Infrared)"
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr "NJ 2015 Aerial Imagery (Natural Color)"
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+
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 ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr "WA 2016 aerial imagery for San Juan County"
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+
msgid "WA Vector Streetmap for San Juan County"
msgstr "WA Vector Streetmap for San Juan County"
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+
msgid "Texas Orthophoto"
msgstr "Texas Orthophoto"
@@ -17447,12 +17747,29 @@ msgstr "Philadelphia 2015 Imagery"
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr "MD Latest 6 Inch Aerial Imagery"
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr "Six Inch resolution aerial imagery for the State of Maryland"
+
msgid "MD Three Inch Aerial Imagery"
msgstr "MD Three Inch Aerial Imagery"
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+
msgid "MD Transportation Basemap"
msgstr "MD Transportation Basemap"
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+
msgid "Delaware 2012 Orthophotography"
msgstr "Delaware 2012 Orthophotography"
@@ -17782,11 +18099,11 @@ msgstr ""
"basemap.at."
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
-"Automaticky přiřazuje adresy vybraným objektům v Rakousku. Data (c) "
-"Österreichisches Adressregister."
+"Automaticky přiřazuje adresy vybraných objektům v Rakousku. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgid ""
"Allows the user to correct angle of buildings to 90 degrees, and aligns all "
@@ -17959,11 +18276,6 @@ msgstr ""
"Databáze posuvů mapových podkladů. Sdílejte vámi vytvořené posuvy a načtěte "
"si posuvy od jiných uživatelů jedním kliknutím myši."
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-"Umožňuje posunovat mapové podklady během editace mapy pomocí klávesové "
-"zkratky nebo ikonou z editační nástrojové lišty"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -19117,7 +19429,7 @@ msgid "needleleaved"
msgstr "jehličnaté"
msgid "mixed"
-msgstr "smíšený"
+msgstr "smíšené"
msgid "leafless"
msgstr "bezlisté"
@@ -19126,7 +19438,7 @@ msgid "Cycle"
msgstr "Cyklus"
msgid "deciduous"
-msgstr "opadavý"
+msgstr "opadavé"
msgid "Plants that are leafless for a certain period during the year."
msgstr "Rostliny, které určitou část roku nemají listy."
@@ -19760,7 +20072,7 @@ msgid "Heavy Goods Vehicles (hgv)"
msgstr "Nákladní vozidla"
msgid "Vehicles per use"
-msgstr "Vozidla podle druhu použití"
+msgstr "Vozidla podle využití"
msgid "Agricultural"
msgstr "Zemědělská technika"
@@ -19975,24 +20287,31 @@ msgstr "Cyklostezka/cyklopruh"
msgid "Cycleway"
msgstr "Cyklostezka"
+msgctxt "cycleway"
msgid "lane"
-msgstr "pruh"
+msgstr "jízdní pruh"
+msgctxt "cycleway"
msgid "track"
msgstr "oddělená cyklostezka"
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr "pruh proti směru jednosměrky"
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "oddělený pruh proti směru jednosměrky"
+msgstr "oddělená cyklostezka proti směru jednosměrky"
+msgctxt "cycleway"
msgid "opposite"
msgstr "jízda v protisměru jednosměrky"
+msgctxt "cycleway"
msgid "share_busway"
msgstr "sdílená s autobusem"
+msgctxt "cycleway"
msgid "shared_lane"
msgstr "sdílený jízdní pruh"
@@ -21171,6 +21490,9 @@ msgstr "Členská karta"
msgid "Wash"
msgstr "Myčka"
+msgid "Self Service"
+msgstr "Samoobsluha"
+
msgid "Car Dealer"
msgstr "Prodejce automobilů"
@@ -21388,7 +21710,7 @@ msgid "Bench"
msgstr "Lavička"
msgid "Shelter"
-msgstr "Přístřešek"
+msgstr "poskytuje přístřeší"
msgid "Waste Basket/Trash Can"
msgstr "Odpadkový koš"
@@ -22555,7 +22877,7 @@ msgstr "Posed"
msgctxt "hunting stand"
msgid "Hide"
-msgstr "Kazatelna"
+msgstr "uzvařený (kazatelna)"
msgid "Lockable"
msgstr "Uzamykatelný"
@@ -22986,10 +23308,6 @@ msgid "garages"
msgstr "garáže"
msgctxt "building"
-msgid "industrial"
-msgstr "průmyslová"
-
-msgctxt "building"
msgid "school"
msgstr "škola"
@@ -24392,6 +24710,21 @@ msgstr "palác"
msgid "Archaeological Site"
msgstr "Archeologické naleziště"
+msgid "tumulus"
+msgstr "mohyla"
+
+msgid "megalith"
+msgstr "megalit"
+
+msgid "fortification"
+msgstr "opevnění"
+
+msgid "settlement"
+msgstr "sídliště"
+
+msgid "necropolis"
+msgstr "nekropole"
+
msgid "Battlefield"
msgstr "Bojiště"
@@ -25951,6 +26284,21 @@ msgstr "Administrativní centrum"
msgid "Label point"
msgstr "Místo pro jmenovku"
+msgid "Outline of building"
+msgstr "Půdorys budovy"
+
+msgid "Inner segment"
+msgstr "Vnitřní část"
+
+msgid "Roof ridge"
+msgstr "Hřeben střechy"
+
+msgid "Roof edge"
+msgstr "Kraj střechy"
+
+msgid "Building level"
+msgstr "Podlaží budovy"
+
msgid "Site"
msgstr "Areál"
@@ -26376,7 +26724,7 @@ msgid "{0} without {1}"
msgstr "{0} bez {1}"
msgid "missing tag"
-msgstr "chybějící značka"
+msgstr "Chybějící značka"
msgid "{0} without {1} or {2}"
msgstr "{0} bez {1} nebo {2}"
@@ -27524,15 +27872,6 @@ msgstr "Import lokálních obrázků"
msgid "Import pictures into Mapillary layer"
msgstr "Importovat obrázky do vrstvy Mapillary"
-msgid "Select pictures"
-msgstr "Výběr obrázků"
-
-msgid "Import pictures into sequence"
-msgstr "Importovat obrázky do sekvence"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importovat obrázky do vrstvy Mapillary v sekvenci"
-
msgid "Join mode"
msgstr "Režim slučování"
@@ -27778,6 +28117,43 @@ msgstr "Následovat vybraný obrázek"
msgid "Go forward"
msgstr "Vpřed"
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Import"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr "Značka s klíčem <i>{0}</i> je již na vybraném objektu OSM přítomna."
@@ -27820,6 +28196,9 @@ msgstr "Informace o obrázku"
msgid "Displays detail information on the currently selected Mapillary image"
msgstr "Zobrazí podrobné informace o aktuálně zvoleném obrázku Mapillary."
+msgid "Show detections on top of image"
+msgstr "Zobrazit detekce na vrcholu snímku"
+
msgid "View in browser"
msgstr "Zobrazit v prohlížeči"
@@ -27829,6 +28208,9 @@ msgstr "Kopírovat klíč"
msgid "Add Mapillary tag"
msgstr "Přidat značku Mapillary"
+msgid "Image detections"
+msgstr "Detekce obrázků"
+
msgid "Image actions"
msgstr "Akce s obrázkem"
@@ -27838,15 +28220,34 @@ msgstr "Klíč obrázku"
msgid "Sequence key"
msgstr "Klíč sekvence"
+msgid "{0} detections"
+msgstr "{0} detekcí"
+
msgid "image has no key"
msgstr "obrázek nemá žádný klíč"
+msgid "unknown user"
+msgstr "neznámý uživatel"
+
msgid "sequence has no key"
msgstr "sekvence nemá žádný klíč"
msgid "Could not open the URL {0} in a browser"
msgstr "Nemohu otevřít URL {0} v prohlížeči"
+msgid "Downloading map objects…"
+msgstr "Stahuji objekty mapy..."
+
+msgid "All map objects loaded."
+msgstr "Všechny objekty mapy načteny."
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+"Příliš mnoho mapových objektů, zvětšte přiblížení, abyste viděli všechny."
+
+msgid "Downloading map objects failed!"
+msgstr "Stažení objektů mapy selhalo!"
+
msgid "Mapillary objects"
msgstr "Objekty Mapillary"
@@ -27883,8 +28284,17 @@ msgstr[2] "Otočeno {0} obrázků"
msgid "2 images unjoined"
msgstr "2 obrázky rozděleny"
-msgid "Could not read map objects from URL {0}!"
-msgstr "Nelza načít objekty mapy z URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr "Nelze číst z URL {0}!"
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
+msgstr ""
+"{0}\n"
+"Nelze načíst objekty mapy z URL\n"
+"{1}!"
msgid "everything in the visible area"
msgstr "vše ve viditelné oblasti"
@@ -27902,9 +28312,6 @@ msgstr ""
"Stažená plocha OSM je příliš velká. Režim stahování byl změněn na plochu OSM "
"do doby, než bude vrstva restartována."
-msgid "Could not read sequences from URL {0}!"
-msgstr "Nemohu načíst sekvence z URL {0}!"
-
msgid "Downloading"
msgstr "Stahuji"
@@ -28718,6 +29125,9 @@ msgstr "Pomocník s rakouskými adresami"
msgid "Successfully added address to selected object:"
msgstr "Úspěšně přidána adresa k vybranému objektu:"
+msgid "Distance between building center and address coordinates:"
+msgstr "Vzdálenost mezi středem budovy a souřadnicemi adresy:"
+
msgid "No address was found for this object."
msgstr "Pro tento objekt nebyla nalezena žádná adresa."
@@ -29623,6 +30033,12 @@ msgstr "Značky (Levenštejnova vzdálenost): "
msgid "List of tags to match"
msgstr "Seznam značek k párování"
+msgid "Identical Elements Filter"
+msgstr "Filtr identických prvků"
+
+msgid "Avoid matching an element with itself"
+msgstr "Nepárovat prvek se sebou samým"
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -29648,6 +30064,34 @@ msgstr "Filtrování"
msgid "Unioning"
msgstr "Spojování"
+msgid "Programming"
+msgstr "Programování"
+
+msgid "Replace Geometry"
+msgstr "Nahradit geometrii"
+
+msgid "Merge Tags"
+msgstr "Sloučit značky"
+
+msgid "List of tags to merge"
+msgstr "Seznam značek ke sloučení"
+
+msgid "except"
+msgstr "kromě"
+
+msgid "List of tags to NOT merge (they will be ignored)"
+msgstr "Seznam značek, které se NEMAJÍ slučovat (budou ignrovány)"
+
+msgid "Overwrite tags without confirmation"
+msgstr "Přepsat značky bez potvrzení"
+
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
+msgstr ""
+"Seznam značek, které se mají bez potvrzení přepsat při konfliktu referenční "
+"vrstvou."
+
msgid "Simple Example"
msgstr "Jednoduchý příklad"
@@ -29663,33 +30107,15 @@ msgstr "Nastavení slučování"
msgid "Generate matches"
msgstr "Vytvořit shody"
+msgid "Merging"
+msgstr "Slučuje se"
+
msgid "Reference:"
msgstr "Referenční:"
msgid "Subject:"
msgstr "Subjekt:"
-msgid "Programming"
-msgstr "Programování"
-
-msgid "Merging"
-msgstr "Slučuje se"
-
-msgid "Replace Geometry"
-msgstr "Nahradit geometrii"
-
-msgid "Merge Tags"
-msgstr "Sloučit značky"
-
-msgid "List of tags to merge"
-msgstr "Seznam značek ke sloučení"
-
-msgid "Overwrite tags without confirmation"
-msgstr "Přepsat značky bez potvrzení"
-
-msgid "List of tags to overwrite without confirmation"
-msgstr "Seznam značek, které se mají přepsat bez potvrzení"
-
msgid "Selections must be made for both reference and subject."
msgstr "Musíte vybrat obojí cíl i referenci."
@@ -29720,6 +30146,12 @@ msgstr "Prázdný výběr"
msgid "Freeze reference selection"
msgstr "Zmrazit referenční výběr"
+msgid "Reference and subject sets should better be different."
+msgstr "Referenční a cílová sada by radši měly být odlišné."
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr "Relace zatím nejsou podporovány, nevybírejte je, prosím."
+
msgid "Disambiguating"
msgstr "Rozlišování"
@@ -30117,9 +30549,6 @@ msgstr "Globalsat Import"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Importovat data z Globalsat Datalogger DG100 do GPX vrstvy."
-msgid "Import"
-msgstr "Import"
-
msgid "GPS Blams"
msgstr "GPS Blam"
@@ -30641,9 +31070,6 @@ msgstr "Načítám posuvy mapových podkladů..."
msgid "Error processing XML response: {0}"
msgstr "Došlo k chybě při zpracování XML odpovědi: {0}"
-msgid "Offset"
-msgstr "Posuv"
-
msgid "Imagery Offset Database"
msgstr "Databáze posuvů mapových podkladů"
@@ -30783,26 +31209,6 @@ msgstr "Ukládání nového posuvu na serve..."
msgid "This string should be 3 to 200 letters long."
msgstr "Tento text by měl mít od 3 do 200 znaků."
-msgid "Adjust imagery"
-msgstr "Posouvat mapový podklad"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Nastavit polohu zvoleného mapového pokladu"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Zvolte, prosím, mapový podklad, který chcete posunovat."
-
-msgid "Start adjusting"
-msgstr "Začněte posouvat"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr ""
-"Momentálně nejsou vybrané žádné vrstvy mapových podkladů, které by šlo "
-"posunout."
-
-msgid "No layers to adjust"
-msgstr "Žádné vrstvy k posunutí"
-
msgid "Normal"
msgstr "Normální"
@@ -30815,12 +31221,21 @@ msgstr "Otočit o 180°"
msgid "Rotate 270"
msgstr "Otočit o 270°"
-msgid "Previous image"
-msgstr "Předchozí obrázek"
+msgid "WayPoint Image"
+msgstr "WayPoint Image"
+
+msgid "Display non-geotagged photos"
+msgstr "Zobrazit fotografie bez GPS souřadnic"
+
+msgid "Imported Images"
+msgstr "Importované obrázky"
msgid "Next image"
msgstr "Další obrázek"
+msgid "Previous image"
+msgstr "Předchozí obrázek"
+
msgid "Rotate left"
msgstr "Otočit vlevo"
@@ -30833,15 +31248,6 @@ msgstr "Otočit vpravo"
msgid "Rotate image right"
msgstr "Otočit obrázek vpravo"
-msgid "WayPoint Image"
-msgstr "WayPoint Image"
-
-msgid "Display non-geotagged photos"
-msgstr "Zobrazit fotografie bez GPS souřadnic"
-
-msgid "Imported Images"
-msgstr "Importované obrázky"
-
msgid "Import vector graphics"
msgstr "Import vektorové kresby"
@@ -33058,9 +33464,6 @@ msgstr "Spojit"
msgid "Public Transport: Join GTFS stops"
msgstr "Hromadná doprava: Propojit GTFS zastávky"
-msgid "Id"
-msgstr "Id"
-
msgid "State"
msgstr "Stav"
diff --git a/i18n/po/cy.po b/i18n/po/cy.po
index e701239..c4681b1 100644
--- a/i18n/po/cy.po
+++ b/i18n/po/cy.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2009-07-17 21:45+0000\n"
"Last-Translator: iggy23 <Unknown>\n"
"Language-Team: Welsh <cy at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "
"2 : 3;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:16+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:13+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: cy\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3306,6 +3306,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3314,6 +3317,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3978,6 +3986,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4034,6 +4045,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9012,46 +9026,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9166,7 +9183,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9280,9 +9303,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9293,8 +9313,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9456,16 +9479,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9595,12 +9608,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9760,6 +9783,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11176,15 +11229,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11233,6 +11277,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12408,6 +12455,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13550,6 +13600,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13748,9 +13801,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14454,6 +14504,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14465,6 +14523,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14477,6 +14547,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14832,6 +14926,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14934,6 +15036,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14985,10 +15090,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15021,6 +15126,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15073,6 +15253,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15219,6 +15405,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15258,6 +15450,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15282,6 +15482,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15326,34 +15529,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15494,6 +15706,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15522,7 +15742,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15671,6 +15891,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15746,6 +15974,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15851,33 +16082,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15887,12 +16161,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16211,8 +16498,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16353,9 +16640,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18260,24 +18544,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19450,6 +19741,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21265,10 +21559,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22669,6 +22959,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24210,6 +24515,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25706,15 +26026,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25956,6 +26267,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25991,6 +26339,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26000,6 +26351,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26009,15 +26363,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26050,7 +26422,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26067,9 +26445,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26762,6 +27137,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27600,6 +27978,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27620,46 +28004,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27692,6 +28084,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28067,9 +28465,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28554,9 +28949,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28675,42 +29067,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28723,15 +29106,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30824,9 +31198,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/da.po b/i18n/po/da.po
index ef4f86c..70732f7 100644
--- a/i18n/po/da.po
+++ b/i18n/po/da.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
-"PO-Revision-Date: 2017-01-21 11:14+0000\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"PO-Revision-Date: 2017-04-22 09:28+0000\n"
"Last-Translator: Jørn <joern.map at gmail.com>\n"
"Language-Team: Dansk <kde-i18n-doc at kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:43+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:42+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: da_DK\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -1491,7 +1491,7 @@ msgid "Toggles the global setting ''{0}''."
msgstr "Slår den globale indstilling \"{0}\" til/fra."
msgid "Discourage upload"
-msgstr ""
+msgstr "Fraråd upload"
msgid "UnGlue Ways"
msgstr "Adskil veje"
@@ -3516,25 +3516,26 @@ msgid "E"
msgstr "Ø"
msgid "Date of imagery: {0}"
-msgstr ""
+msgstr "Dato for billedlag: {0}"
msgid "This imagery is marked as best in this region in other editors."
msgstr ""
+"Dette billedlag er markeret som bedst i denne region i andre editorer."
msgid "{0} mirror server {1}"
-msgstr ""
+msgstr "{0} spejlet server {1}"
msgid "{0} mirror server"
-msgstr ""
+msgstr "{0} spejlet server"
msgid "Update default entries"
msgstr "Opdater standard emne"
msgid "Update imagery ''{0}''"
-msgstr ""
+msgstr "Opdater billedlag ''{0}''"
msgid "Drop old imagery ''{0}''"
-msgstr ""
+msgstr "Drop gammelt billedlag ''{0}''"
msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable"
msgstr ""
@@ -3568,6 +3569,9 @@ msgstr "Projektion"
msgid "Matrix set identifier"
msgstr "Matrix sæt identifikator"
+msgid "No default layer selected, choosing first layer."
+msgstr "Intet standardlag valgt, vælger første lag."
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Ingen lag defineret af getCapabilities dokument: {0}"
@@ -3577,6 +3581,13 @@ msgstr ""
"WMTS fortolker fejl - start element {0} har andet navn end slut element {2}"
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+"Kan ikke bruge lag {0}, fordi ingen understøttede formater er fundet. Lag er "
+"tilgængelig i formater: {1}"
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4281,6 +4292,9 @@ msgstr "Denne test undersøger om multipolygoner er korrekte."
msgid "Area style way is not closed"
msgstr "Område-stil vej er ikke lukket"
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "Ingen ydre vej for multipolygon"
@@ -4343,6 +4357,9 @@ msgstr "Multipolygon ydre vej deler segment(er) med anden ring"
msgid "No useful role for multipolygon member"
msgstr "Ingen brugbar rolle for multipolygon medlem"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "Ikke-vej i multipolygon"
@@ -8504,10 +8521,10 @@ msgstr ""
"kan åbne den manuelt fra menuen Filer eller værktøjslinjen.</html>"
msgid "Zoom to downloaded data"
-msgstr ""
+msgstr "Zoom til downloadede data"
msgid "Select to zoom to entire newly downloaded data."
-msgstr ""
+msgstr "Vælg for at zoome til alle nye downloadede data."
msgid ""
"Use left click&drag to select area, arrows or right mouse button to scroll "
@@ -9746,47 +9763,50 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} objekt at slette:"
msgstr[1] "{0} objekter at slette:"
-msgid "Show tile info"
-msgstr "Vis info om tern"
+msgid "Native projections"
+msgstr ""
-msgid "Tile Info"
-msgstr "Tern info"
+msgid "Offset"
+msgstr "Forskydning"
-msgid "Metadata "
-msgstr "Metadata "
+msgid "Tile download projection"
+msgstr ""
-msgid "Load tile"
-msgstr "Hent tern"
+msgid "Tile display projection"
+msgstr ""
-msgid "Auto zoom"
-msgstr "Autozoom"
+msgid "Current zoom"
+msgstr ""
-msgid "Auto load tiles"
-msgstr "Hent tern automatisk"
+msgid "Show tile info"
+msgstr "Vis info om tern"
-msgid "Show errors"
-msgstr "Vis fejl"
+msgid "Tile Info"
+msgstr "Tern info"
-msgid "Load all tiles"
-msgstr "Hent alle tern"
+msgid "Tile name"
+msgstr ""
-msgid "Load all error tiles"
-msgstr "Hent alle tern med fejl"
+msgid "Tile URL"
+msgstr ""
-msgid "Zoom to native resolution"
-msgstr "Zoom til oprindelige opløsning"
+msgid "Tile size"
+msgstr ""
-msgid "Change resolution"
-msgstr "Skift opløsning"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Øg zoom"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Formindsk zoom"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
-msgstr "Tøm tern cache"
+msgid "Metadata "
+msgstr "Metadata "
+
+msgid "Load tile"
+msgstr "Hent tern"
msgid "Failed to create tile source"
msgstr "Kunne ikke oprette tern kilde"
@@ -9903,8 +9923,14 @@ msgstr[1] "{0} spor, "
msgid "Save GPX file"
msgstr "Gem GPX-fil"
-msgid "Imagery fade"
-msgstr "Billed-toning"
+msgid "Id"
+msgstr "Id"
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
+msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr "Billedelagstype ikke understøttet: {0}"
@@ -10019,9 +10045,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Gem OSM-fil"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "EPSG:4326 og Mercator projektion er understøttet"
-
msgid "Validation errors"
msgstr "Valideringsfejl"
@@ -10032,11 +10055,12 @@ msgid "Set WMS Bookmark"
msgstr "Sæt WMS-bogmærke"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
-"JOSM vil bruge EPSG:4326 til at forespørge serveren, men resultaterne kan "
-"variere afhængigt af WMS-serveren"
msgid "Correlate to GPX"
msgstr "Sammenhold med GPX"
@@ -10206,20 +10230,6 @@ msgstr "Du bør vælge et GPX-spor"
msgid "No selected GPX track"
msgstr "Intet valgt GPX-spor"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Fejl ved fortolkning af tidszone.\n"
-"Forventet format: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Fejl ved fortolkning af forskydning.\n"
-"Forventet format: {0}"
-
msgid "Geotagged Images"
msgstr "Geotaggede billeder"
@@ -10361,12 +10371,26 @@ msgstr ""
"\n"
"GPS tid: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Fejl ved fortolkning af forskydning.\n"
+"Forventet format: {0}"
+
msgid "Show thumbnails"
msgstr "Vis miniaturer"
msgid "Show image thumbnails instead of icons."
msgstr "Vis miniaturebilleder i stedet for ikoner."
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Fejl ved fortolkning af tidszone.\n"
+"Forventet format: {0}"
+
msgid "Choose visible tracks"
msgstr "Vælg synlige spor"
@@ -10543,6 +10567,36 @@ msgstr "Markører fra navngivne punkter"
msgid "Named Trackpoints from {0}"
msgstr "Navngivne punkter fra {0}"
+msgid "Auto load tiles"
+msgstr "Hent tern automatisk"
+
+msgid "Auto zoom"
+msgstr "Autozoom"
+
+msgid "Decrease zoom"
+msgstr "Formindsk zoom"
+
+msgid "Flush tile cache"
+msgstr "Tøm tern cache"
+
+msgid "Increase zoom"
+msgstr "Øg zoom"
+
+msgid "Load all tiles"
+msgstr "Hent alle tern"
+
+msgid "Load all error tiles"
+msgstr "Hent alle tern med fejl"
+
+msgid "Show errors"
+msgstr "Vis fejl"
+
+msgid "Change resolution"
+msgstr "Skift opløsning"
+
+msgid "Zoom to native resolution"
+msgstr "Zoom til oprindelige opløsning"
+
msgid "gps marker"
msgstr "GPS-markør"
@@ -12116,15 +12170,6 @@ msgstr "Cache navn"
msgid "Object Count"
msgstr "Objekt tæller"
-msgid "imagery fade"
-msgstr "billed-toning"
-
-msgid "Fade Color: "
-msgstr "Farve for toning: "
-
-msgid "Fade amount: "
-msgstr "Toning-niveau: "
-
msgid "Soft"
msgstr "Blød"
@@ -12173,6 +12218,9 @@ msgstr "Baggrundsbillede: Standard"
msgid "Available default entries:"
msgstr "Tilgængelige standardemner:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "Valgte elementer:"
@@ -12216,7 +12264,7 @@ msgid "Northing"
msgstr "Nordlig afstand"
msgid "Auto zoom by default: "
-msgstr "Auto-zoom som standard: "
+msgstr "Autozoom som standard: "
msgid "Autoload tiles by default: "
msgstr "Autoindlæs tern som standard: "
@@ -13441,6 +13489,9 @@ msgstr "Valgfri attributter:"
msgid "Unknown requisite: {0}"
msgstr "Ukendt krav: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "Ugyldig medlemsudtryk: {0}"
@@ -14688,6 +14739,9 @@ msgstr "erstattet af den nye {0} udvidelse"
msgid "no longer required"
msgstr "ikke længere krævet"
+msgid "Plugin information"
+msgstr "Udvidelsesinformation"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -14925,9 +14979,6 @@ msgstr ""
"Udvidelsen er fjernet fra konfigurationen. Genstart JOSM for at afinstallere "
"udvidelsen."
-msgid "Plugin information"
-msgstr "Udvidelsesinformation"
-
msgid "no description available"
msgstr "Ingen beskrivelse er tilgængelig"
@@ -15819,15 +15870,35 @@ msgid "farmland"
msgstr "landbrugsjord"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "beboelse"
msgctxt "landuse"
msgid "greenfield"
-msgstr ""
+msgstr "ny byggegrund"
msgctxt "landuse"
msgid "village_green"
+msgstr "område midt i by"
+
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
msgstr ""
msgctxt "natural"
@@ -15840,8 +15911,32 @@ msgstr "skov"
msgctxt "natural"
msgid "grassland"
+msgstr "græsland"
+
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
msgstr ""
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "industri"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "associatedStreet"
@@ -16197,6 +16292,16 @@ 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 "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+
msgid "IGN Argentina (TMS)"
msgstr "IGN Argentina (TMS)"
@@ -16288,16 +16393,19 @@ msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
msgstr "imagico.de OSM images for mapping: Rila and Pirin Mountains"
msgid "OpenStreetMap (Belgian Style)"
-msgstr ""
+msgstr "OpenStreetMap (Belgian Style)"
msgid "OpenStreetMap (Belgian Style - French)"
-msgstr ""
+msgstr "OpenStreetMap (Belgian Style - French)"
msgid "OpenStreetMap (Belgian Style - Dutch)"
-msgstr ""
+msgstr "OpenStreetMap (Belgian Style - Dutch)"
msgid "OpenStreetMap (Belgian Style - German)"
-msgstr ""
+msgstr "OpenStreetMap (Belgian Style - German)"
+
+msgid "Orthophoto IGN-NGI"
+msgstr "Orthophoto IGN-NGI"
msgid "AGIV Flanders most recent aerial imagery"
msgstr "AGIV Flanders most recent aerial imagery"
@@ -16312,13 +16420,13 @@ msgid "URBISfr numerical imagery (2013)"
msgstr "URBISfr numerical imagery (2013)"
msgid "URBISfr numerical imagery"
-msgstr ""
+msgstr "URBISfr numerical imagery"
msgid "URBISnl numerical imagery (2013)"
msgstr "URBISnl numerical imagery (2013)"
msgid "URBISnl numerical imagery"
-msgstr ""
+msgstr "URBISnl numerical imagery"
msgid "URBIS 2009 aerial imagery"
msgstr "URBIS 2009 aerial imagery"
@@ -16333,13 +16441,13 @@ msgid "URBIS 2015 aerial imagery"
msgstr "URBIS 2015 aerial imagery"
msgid "URBIS 2016 aerial imagery"
-msgstr ""
+msgstr "URBIS 2016 aerial imagery"
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW(allonie) PICC numerical imagery"
msgid "SPW(allonie) most recent aerial imagery"
-msgstr ""
+msgstr "SPW(allonie) most recent aerial imagery"
msgid "SPW(allonie) 2015 aerial imagery"
msgstr "SPW(allonie) 2015 aerial imagery"
@@ -16350,11 +16458,11 @@ msgstr "SPW(allonie) 2012-2013 aerial imagery"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 aerial imagery"
-msgid "TEC bus lines (2014)"
-msgstr "TEC bus lines (2014)"
+msgid "TEC bus lines"
+msgstr ""
-msgid "TEC bus stops (2014)"
-msgstr "TEC bus stops (2014)"
+msgid "TEC bus stops"
+msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
msgstr "Benin: Cotonou Pleiade 2016"
@@ -16386,6 +16494,81 @@ msgstr "Londrina Ortofoto 2011"
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr "SIG Santa Catarina OrtoRGB 2012"
+msgid "Arapiraca AL"
+msgstr "Arapiraca AL"
+
+msgid "Branquinha AL"
+msgstr "Branquinha AL"
+
+msgid "Cajueiro AL"
+msgstr "Cajueiro AL"
+
+msgid "Campo Alegre AL"
+msgstr "Campo Alegre AL"
+
+msgid "Capela AL"
+msgstr "Capela AL"
+
+msgid "Delmiro Gouveia AL"
+msgstr "Delmiro Gouveia AL"
+
+msgid "Estrela de Alagoas"
+msgstr "Estrela de Alagoas"
+
+msgid "Girau do Ponciano"
+msgstr "Girau do Ponciano"
+
+msgid "Major Isidoro AL"
+msgstr "Major Isidoro AL"
+
+msgid "Mar Vermelho AL"
+msgstr "Mar Vermelho AL"
+
+msgid "Minador do Negrão"
+msgstr "Minador do Negrão"
+
+msgid "Olho d’Agua do Casado AL"
+msgstr "Olho d’Agua do Casado AL"
+
+msgid "Palestina AL"
+msgstr "Palestina AL"
+
+msgid "Palmeira dos Indios AL"
+msgstr "Palmeira dos Indios AL"
+
+msgid "Pão de Açucar AL"
+msgstr "Pão de Açucar AL"
+
+msgid "Piranhas AL"
+msgstr "Piranhas AL"
+
+msgid "Poço das Trincheiras AL"
+msgstr "Poço das Trincheiras AL"
+
+msgid "Santana do Ipanema AL"
+msgstr "Santana do Ipanema AL"
+
+msgid "São Miguel dos Campos AL"
+msgstr "São Miguel dos Campos AL"
+
+msgid "Teotonio Vilela AL"
+msgstr "Teotonio Vilela AL"
+
+msgid "União dos Palmares AL"
+msgstr "União dos Palmares AL"
+
+msgid "Viçosa AL"
+msgstr "Viçosa AL"
+
+msgid "Alagoas Litoral 2006"
+msgstr "Alagoas Litoral 2006"
+
+msgid "DER-ES"
+msgstr "DER-ES"
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr "IBGE-BC250-Trecho Rodoviario"
+
msgid "Geobase Hydrography"
msgstr "Geobase Hydrography"
@@ -16439,6 +16622,12 @@ msgstr "Czech RUIAN parcely"
msgid "Czech pLPIS"
msgstr "Czech pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr "Praha IPR latest orthophoto"
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr "Praha IPR low-vegetation orthophoto"
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Danmark)"
@@ -16588,6 +16777,12 @@ msgstr "Berlin aerial photograph 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Berlin aerial photograph 2016"
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr "Deutsche Bahn VzG lines Nov 2013"
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr "Deutsche Bahn VzG lines Nov 2015"
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Erlangen aerial imagery (2016 5.0 cm)"
@@ -16630,29 +16825,42 @@ msgstr ""
"imagico.de OSM images for mapping: Northern German west coast tidalflats "
"(infrared)"
-msgid "Saxony latest aerial imagery"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr "imagico.de OSM images for mapping: North Sea Coast 2016"
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
msgstr ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+
+msgid "Saxony latest aerial imagery"
+msgstr "Saxony latest aerial imagery"
msgid "Saxony latest aerial imagery infrared"
-msgstr ""
+msgstr "Saxony latest aerial imagery infrared"
msgid "Saxony aerial imagery 2005"
-msgstr ""
+msgstr "Saxony aerial imagery 2005"
msgid "Saxony WebAtlasSN"
-msgstr ""
+msgstr "Saxony WebAtlasSN"
msgid "Saxony topographic map"
-msgstr ""
+msgstr "Saxony topographic map"
msgid "Saxony digital terrain model"
-msgstr ""
+msgstr "Saxony digital terrain model"
msgid "Mainz all aerial imageries"
-msgstr ""
+msgstr "Mainz all aerial imageries"
msgid "Mainz latest aerial imagery"
-msgstr ""
+msgstr "Mainz latest aerial imagery"
+
+msgid "Munich latest aerial imagery 60cm"
+msgstr "Munich latest aerial imagery 60cm"
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr "imagico.de OSM images for mapping: Qasigiannguit"
@@ -16703,35 +16911,44 @@ msgstr "Drone Imagery Canaan(Haiti) November 2015"
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr "Drone Imagery Matthew(Haiti) October 2016"
-msgid "FÖMI ortophoto 2000"
-msgstr "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
+msgstr "FÖMI orthophoto 2000"
-msgid "FÖMI ortophoto 2005"
-msgstr "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
+msgstr "FÖMI orthophoto 2005"
-msgid "Szeged ortophoto 2011"
-msgstr "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
+msgstr "Szeged orthophoto 2011"
msgid "Inner part of Szeged"
msgstr "Inner part of Szeged"
-msgid "Törökbálint ortophoto 2013"
-msgstr "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
+msgstr "Törökbálint orthophoto 2013"
msgid "5 cm resolution bald image"
msgstr "5 cm resolution bald image"
-msgid "Törökbálint ortophoto 2015"
-msgstr "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
+msgstr "Törökbálint orthophoto 2015"
-msgid "Danube flood ortophoto 2013"
-msgstr "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
+msgstr "Danube flood orthophoto 2013"
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
-msgid "Budapest district XI ortophoto 2015"
-msgstr "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr "Budapest district XI orthophoto 2015"
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr "Budapest district XI orthophoto 2017"
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+
+msgid "5 cm resolution bald image of 4 settlement"
+msgstr "5 cm resolution bald image of 4 settlement"
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Hungary (hiking routes)"
@@ -16845,10 +17062,10 @@ msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Lithuania)"
msgid "geoportail.lu all layers"
-msgstr ""
+msgstr "geoportail.lu all layers"
msgid "geoportail.lu ortho 2016"
-msgstr ""
+msgstr "geoportail.lu ortho 2016"
msgid "Luxembourg Inspire Railway"
msgstr "Luxembourg Inspire Railway"
@@ -16863,14 +17080,24 @@ msgid "Niger Delta Oct 2012 Landsat"
msgstr "Niger Delta Oct 2012 Landsat"
msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
-msgstr ""
+msgstr "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
-msgstr ""
+msgstr "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard -Orthophoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr "imagico.de OSM images for mapping: Svalbard mosaic"
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr "imagico.de OSM images for mapping: Western Karakoram"
@@ -16900,8 +17127,8 @@ msgid ""
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)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: Ortofotomapa (aerial image)"
@@ -17051,6 +17278,16 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr "imagico.de OSM images for mapping: Vostochny Cosmodrome"
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr "imagico.de OSM images for mapping: Pechora Sea Coast"
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Car"
@@ -17126,6 +17363,9 @@ msgstr "Kanton Aargau 25cm (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Kanton Aargau 25cm (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr "Kanton Aargau 25cm (AGIS 2016)"
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr "Kanton Zürich Orthophotos 2014/2015 10cm"
@@ -17142,10 +17382,10 @@ msgid "Stadt Zürich Luftbild 2011"
msgstr "Stadt Zürich Luftbild 2011"
msgid "Canton Solothurn latest aerial imagery SOGIS RGB"
-msgstr ""
+msgstr "Canton Solothurn latest aerial imagery SOGIS RGB"
msgid "Canton Solothurn latest aerial imagery SOGIS Infrared"
-msgstr ""
+msgstr "Canton Solothurn latest aerial imagery SOGIS Infrared"
msgid "Canton de Génève 5cm (SITG 2011)"
msgstr "Canton de Génève 5cm (SITG 2011)"
@@ -17232,33 +17472,78 @@ msgstr "TIGER 2012 Roads Overlay"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr "New & Misaligned TIGER Roads (2015)"
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
msgid "NC Latest Orthoimagery"
msgstr "NC Latest Orthoimagery"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
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 ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr "NJ 2015 Aerial Imagery (Infrared)"
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr "NJ 2015 Aerial Imagery (Natural Color)"
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
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 ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr "WA 2016 aerial imagery for San Juan County"
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+
msgid "WA Vector Streetmap for San Juan County"
msgstr "WA Vector Streetmap for San Juan County"
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr "Texas Orthophoto"
@@ -17266,14 +17551,27 @@ msgid "Philadelphia 2015 Imagery"
msgstr "Philadelphia 2015 Imagery"
msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr "MD Latest 6 Inch Aerial Imagery"
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
msgstr ""
msgid "MD Three Inch Aerial Imagery"
msgstr "MD Three Inch Aerial Imagery"
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr "MD Transportation Basemap"
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr "Delaware 2012 Orthophotography"
@@ -17407,7 +17705,7 @@ msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
msgstr "OS Town Plans, Edinburgh 1893-1894 (NLS)"
msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
-msgstr ""
+msgstr "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
msgid "OS Town Plans, Elgin 1868 (NLS)"
msgstr "OS Town Plans, Elgin 1868 (NLS)"
@@ -17605,8 +17903,8 @@ msgstr ""
"Optimeret til basemap.at."
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -17784,9 +18082,6 @@ msgstr ""
"Database over billedlags forskydninger: del- og modtag billedlags "
"forskydninger med en knap."
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "WMS-udvidelses kortfunktion til billedlagsjustering"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -19801,26 +20096,33 @@ msgstr "Cykel-bane/spor"
msgid "Cycleway"
msgstr "Cykelsti"
+msgctxt "cycleway"
msgid "lane"
-msgstr "bane"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "spor"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "modsat bane"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "modsat spor"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
-msgstr "modsat"
+msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "delt busvej"
+msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "delt bane"
+msgstr ""
msgid "Cycleway left"
msgstr "Cykelsti venstre"
@@ -20999,6 +21301,9 @@ msgstr "Medlemskort"
msgid "Wash"
msgstr "Vask"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Bilforhandler"
@@ -22228,7 +22533,7 @@ msgid "Telephone cards"
msgstr "Telefonkort"
msgid "Internet Cafe"
-msgstr ""
+msgstr "Internet cafe"
msgid "Internet Access"
msgstr "Internet adgang"
@@ -22816,10 +23121,6 @@ msgid "garages"
msgstr "garageanlæg"
msgctxt "building"
-msgid "industrial"
-msgstr "industri"
-
-msgctxt "building"
msgid "school"
msgstr "skole"
@@ -24222,6 +24523,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Arkæologisk sted"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Slagmark"
@@ -24575,7 +24891,7 @@ msgid "cigarettes"
msgstr "cigaretter"
msgid "coffee"
-msgstr ""
+msgstr "kaffe"
msgid "condoms"
msgstr "kondomer"
@@ -25784,6 +26100,21 @@ msgstr "Administrationscenter"
msgid "Label point"
msgstr "Etiketpunkt"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "Sted"
@@ -27340,15 +27671,6 @@ msgstr "Importer lokale billeder"
msgid "Import pictures into Mapillary layer"
msgstr "Importer billeder til Mapillary lag"
-msgid "Select pictures"
-msgstr "Vælg billeder"
-
-msgid "Import pictures into sequence"
-msgstr "Importer billeder i rækkefølge"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importer billeder til Mapillary lag i en rækkefølge"
-
msgid "Join mode"
msgstr "Sammenlæg tilstand"
@@ -27594,6 +27916,43 @@ msgstr "Følg valgt billede"
msgid "Go forward"
msgstr "Gå frem"
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Importer"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -27629,6 +27988,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -27638,6 +28000,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -27647,15 +28012,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -27688,7 +28071,13 @@ msgstr[1] "Drejede {0} billeder"
msgid "2 images unjoined"
msgstr "2 billeder adskilt"
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -27707,9 +28096,6 @@ msgstr ""
"Det downloadede OSM-område er for stort. Download tilstand er blevet ændret "
"til OSM område indtil laget genstartes."
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr "Downloader"
@@ -28389,8 +28775,8 @@ msgstr "Oprettet område"
msgid "Add address"
msgid_plural "Add addresses"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Tilføj adresse"
+msgstr[1] "Tilføj adresser"
msgid "Unable to detect a polygon where you clicked."
msgstr "Kan ikke finde en polygon hvor du klikkede."
@@ -28519,6 +28905,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -29423,6 +29812,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -29443,46 +29838,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
-msgstr ""
+msgid "Replace Geometry"
+msgstr "Erstat geometri"
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
-msgstr "Konfigurer sammensmeltnings indstillinger"
+msgid "List of tags to merge"
+msgstr ""
-msgid "Generate matches"
-msgstr "Generere træffere"
+msgid "except"
+msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Erstat geometri"
+msgid "Advanced Example"
+msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
+msgstr "Konfigurer sammensmeltnings indstillinger"
+
+msgid "Generate matches"
+msgstr "Generere træffere"
+
+msgid "Merging"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -29515,6 +29918,12 @@ msgstr "Tom markering"
msgid "Freeze reference selection"
msgstr "Frys valgt reference"
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -29912,9 +30321,6 @@ msgstr "Globalsat-import"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Importer data fra Globalsat Datalogger DG100 til GPX lag."
-msgid "Import"
-msgstr "Importer"
-
msgid "GPS Blams"
msgstr "GPS støj"
@@ -30423,9 +30829,6 @@ msgstr "Loader billedlag forskydning..."
msgid "Error processing XML response: {0}"
msgstr "Fejl ved behandling af XML svar: {0}"
-msgid "Offset"
-msgstr "Forskydning"
-
msgid "Imagery Offset Database"
msgstr "Database med billedlag forskydning"
@@ -30564,24 +30967,6 @@ msgstr "Uploader en ny forskydning..."
msgid "This string should be 3 to 200 letters long."
msgstr "Denne streng skal være 3 til 200 bogstaver lang."
-msgid "Adjust imagery"
-msgstr "Justerer billedlag"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Justerer det valgte billedlags position"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Marker det billedlag der skal justeres."
-
-msgid "Start adjusting"
-msgstr "Start justering"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "Der er i øjeblikket ikke noget billedlag at justere."
-
-msgid "No layers to adjust"
-msgstr "Intet lag at justere"
-
msgid "Normal"
msgstr "Normal"
@@ -30594,12 +30979,21 @@ msgstr "Roter 180"
msgid "Rotate 270"
msgstr "Roter 270"
-msgid "Previous image"
-msgstr "Forrige billede"
+msgid "WayPoint Image"
+msgstr "WayPoint billede"
+
+msgid "Display non-geotagged photos"
+msgstr "Vis ikke-geotaggede billeder"
+
+msgid "Imported Images"
+msgstr "Importerede billeder"
msgid "Next image"
msgstr "Næste billede"
+msgid "Previous image"
+msgstr "Forrige billede"
+
msgid "Rotate left"
msgstr "Roter mod uret"
@@ -30612,15 +31006,6 @@ msgstr "Roter med uret"
msgid "Rotate image right"
msgstr "Roter billedet med uret"
-msgid "WayPoint Image"
-msgstr "WayPoint billede"
-
-msgid "Display non-geotagged photos"
-msgstr "Vis ikke-geotaggede billeder"
-
-msgid "Imported Images"
-msgstr "Importerede billeder"
-
msgid "Import vector graphics"
msgstr "Importer vektor grafik"
@@ -32816,9 +33201,6 @@ msgstr "Sammenlæg"
msgid "Public Transport: Join GTFS stops"
msgstr "Offentlig transport: Sammenlæg GTFS stop"
-msgid "Id"
-msgstr "Id"
-
msgid "State"
msgstr "Stat"
@@ -33240,10 +33622,10 @@ msgstr ""
"position ({1},{2}). Springer over."
msgid "Create Roundabout"
-msgstr ""
+msgstr "Opret rundkørsel"
msgid "Roundabout Expander"
-msgstr ""
+msgstr "Rundkørsel udvidelse"
msgid "Road Sign Plugin"
msgstr "Vejskilt-udvidelse"
diff --git a/i18n/po/de.po b/i18n/po/de.po
index 987f2b9..fb35573 100644
--- a/i18n/po/de.po
+++ b/i18n/po/de.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
-"PO-Revision-Date: 2017-03-22 17:41+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"PO-Revision-Date: 2017-04-28 14:56+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: 2017-03-24 04:48+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:46+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: de\n"
"X-Poedit-SearchPath-0: .\n"
"X-Poedit-Basepath: /home/simon/src/josm.all/i18n\n"
@@ -3670,6 +3670,9 @@ msgstr "Projektion"
msgid "Matrix set identifier"
msgstr "Matrixsatzbezeichner"
+msgid "No default layer selected, choosing first layer."
+msgstr "Keine Standardebene ausgewählt, erste Ebene wird verwendet."
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Im getCapabilities-Dokument sind keine Ebenen bestimmt: {0}"
@@ -3679,6 +3682,13 @@ msgstr ""
"WMTS-Parserfehler - Startelement {0} hat anderen Namen als Endelement {2}"
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+"Ebene {0} kann nicht genutzt werden, da keine unterstützten Formate gefunden "
+"wurden. Verfügbare Formate für Ebene: {1}"
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4407,6 +4417,9 @@ msgstr "Dieser Test prüft, ob Multipolygone gültig sind."
msgid "Area style way is not closed"
msgstr "Linie mit Flächenzeichenstil nicht geschlossen"
+msgid "No outer way for boundary"
+msgstr "Keine äußere Linie für Grenze"
+
msgid "No outer way for multipolygon"
msgstr "Keine äußere Linie für Multipolygon"
@@ -4471,6 +4484,9 @@ 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"
+msgid "Non-Way in boundary"
+msgstr "Nicht-Linie in Grenze"
+
msgid "Non-Way in multipolygon"
msgstr "Nicht-Linie im Multipolygon"
@@ -10031,47 +10047,50 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} zu löschendes Objekt:"
msgstr[1] "{0} zu löschende Objekte:"
-msgid "Show tile info"
-msgstr "Kachelinformationen anzeigen"
+msgid "Native projections"
+msgstr "Standardprojektionen"
-msgid "Tile Info"
-msgstr "Kachelinformationen"
+msgid "Offset"
+msgstr "Versatz"
-msgid "Metadata "
-msgstr "Metadaten "
+msgid "Tile download projection"
+msgstr "Kachelprojektion beim Herunterladen"
-msgid "Load tile"
-msgstr "Kachel laden"
+msgid "Tile display projection"
+msgstr "Kachelanzeigeprojektion"
-msgid "Auto zoom"
-msgstr "Automatischer Zoom"
+msgid "Current zoom"
+msgstr "Aktuelle Zoomstufe"
-msgid "Auto load tiles"
-msgstr "Kacheln automatisch laden"
+msgid "Show tile info"
+msgstr "Kachelinformationen anzeigen"
-msgid "Show errors"
-msgstr "Fehler anzeigen"
+msgid "Tile Info"
+msgstr "Kachelinformationen"
-msgid "Load all tiles"
-msgstr "Alle Kacheln laden"
+msgid "Tile name"
+msgstr "Kachelname"
-msgid "Load all error tiles"
-msgstr "Alle Fehlerkacheln laden"
+msgid "Tile URL"
+msgstr "Kachel-URL"
-msgid "Zoom to native resolution"
-msgstr "Auf Vorgabeauflösung zoomen"
+msgid "Tile size"
+msgstr "Kachelgröße"
-msgid "Change resolution"
-msgstr "Auflösung ändern"
+msgid "Tile display size"
+msgstr "Kachelanzeigegröße"
-msgid "Increase zoom"
-msgstr "Zoom erhöhen"
+msgid "Reprojection"
+msgstr "Projektionsumrechnung"
-msgid "Decrease zoom"
-msgstr "Zoom reduzieren"
+msgid "Reprojected tile size"
+msgstr "Kachelgröße nach Projektionsumrechnung"
-msgid "Flush tile cache"
-msgstr "Kachel-Cache leeren"
+msgid "Metadata "
+msgstr "Metadaten "
+
+msgid "Load tile"
+msgstr "Kachel laden"
msgid "Failed to create tile source"
msgstr "Fehler beim Erstellen der Kachelquelle"
@@ -10187,8 +10206,14 @@ msgstr[1] "{0} GPS-Spuren, "
msgid "Save GPX file"
msgstr "GPX-Datei speichern"
-msgid "Imagery fade"
-msgstr "Hintergrundbild überblenden"
+msgid "Id"
+msgstr "Id"
+
+msgid "Min. zoom"
+msgstr "Min. Zoom"
+
+msgid "Max. zoom"
+msgstr "Max. Zoom"
msgid "Unsupported imagery type: {0}"
msgstr "Nicht unterstützer Bildtyp: {0}"
@@ -10303,9 +10328,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "OSM-Datei speichern"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "EPSG:4326 und Mercator-Projektion werden unterstützt"
-
msgid "Validation errors"
msgstr "Prüffehler"
@@ -10316,11 +10338,17 @@ msgid "Set WMS Bookmark"
msgstr "WMS-Lesezeichen erstellen"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+"Rechne Projektion für Ebene {0} von {1} nach {2} um. Optimale Bildqualität "
+"und Leistung kann durch Wechsel zu einer der unterstützten Projektionen "
+"erreicht werden: {3}"
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
-"JOSM wird EPSG:4326 für Anfragen an den Server verwenden, aber die "
-"Ergebnisse können je nach WMS-Server variieren"
+"Es konnte keine unterstützte Projektion für Ebene {0} gefunden werden. "
+"Verwende {1}."
msgid "Correlate to GPX"
msgstr "Mit GPX korrelieren"
@@ -10494,20 +10522,6 @@ msgstr "Sie sollten eine GPS-Spur auswählen"
msgid "No selected GPX track"
msgstr "Keine ausgewählte GPS-Spur"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Fehler beim Lesen der Zeitzone.\n"
-"Erwartetes Format: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Fehler beim Einlesen des Versatzes.\n"
-"Erwartetes Format: {0}"
-
msgid "Geotagged Images"
msgstr "Georeferenzierte Bilder"
@@ -10649,12 +10663,26 @@ msgstr ""
"\n"
"GPS-Zeit: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Fehler beim Einlesen des Versatzes.\n"
+"Erwartetes Format: {0}"
+
msgid "Show thumbnails"
msgstr "Vorschaubilder anzeigen"
msgid "Show image thumbnails instead of icons."
msgstr "Vorschaubilder an Stelle von Symbolen anzeigen."
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Fehler beim Lesen der Zeitzone.\n"
+"Erwartetes Format: {0}"
+
msgid "Choose visible tracks"
msgstr "Sichtbare Spuren auswählen"
@@ -10833,6 +10861,36 @@ msgstr "Marken von benannten Punkten"
msgid "Named Trackpoints from {0}"
msgstr "Benannte Spurpunkte von {0}"
+msgid "Auto load tiles"
+msgstr "Kacheln automatisch laden"
+
+msgid "Auto zoom"
+msgstr "Automatischer Zoom"
+
+msgid "Decrease zoom"
+msgstr "Zoom reduzieren"
+
+msgid "Flush tile cache"
+msgstr "Kachel-Cache leeren"
+
+msgid "Increase zoom"
+msgstr "Zoom erhöhen"
+
+msgid "Load all tiles"
+msgstr "Alle Kacheln laden"
+
+msgid "Load all error tiles"
+msgstr "Alle Fehlerkacheln laden"
+
+msgid "Show errors"
+msgstr "Fehler anzeigen"
+
+msgid "Change resolution"
+msgstr "Auflösung ändern"
+
+msgid "Zoom to native resolution"
+msgstr "Auf Vorgabeauflösung zoomen"
+
msgid "gps marker"
msgstr "GPS-Markierung"
@@ -12464,15 +12522,6 @@ msgstr "Cachename"
msgid "Object Count"
msgstr "Objektanzahl"
-msgid "imagery fade"
-msgstr "Hintergrundbild verblassen"
-
-msgid "Fade Color: "
-msgstr "Verblassungsfarbe: "
-
-msgid "Fade amount: "
-msgstr "Verblassungsstärke: "
-
msgid "Soft"
msgstr "Schwach"
@@ -12524,6 +12573,10 @@ msgstr "Bildquellen-Hintergrund: Standard"
msgid "Available default entries:"
msgstr "Verfügbare Standardeinträge:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+"Neue Standardeinträge können im <a href=\"{0}\">Wiki</a> ergänzt werden."
+
msgid "Selected entries:"
msgstr "Gewählte Einträge:"
@@ -13835,6 +13888,9 @@ msgstr "Optionale Attribute:"
msgid "Unknown requisite: {0}"
msgstr "Unbekannte Vorraussetzung: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr "Unbekannter Wert für regulären Ausdruck: {0}"
+
msgid "Illegal member expression: {0}"
msgstr "Ungültiger Elementausdruck: {0}"
@@ -15157,6 +15213,9 @@ msgstr "ersetzt durch die neue Erweiterung {0}"
msgid "no longer required"
msgstr "nicht länger benötigt"
+msgid "Plugin information"
+msgstr "Erweiterungsinformationen"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -15406,9 +15465,6 @@ msgstr ""
"Die Erweiterung wurde aus der Konfiguration entfernt. Bitte starten Sie JOSM "
"neu, um die Erweiterung zu entfernen."
-msgid "Plugin information"
-msgstr "Erweiterungsinformationen"
-
msgid "no description available"
msgstr "keine Beschreibung verfügbar"
@@ -16327,6 +16383,14 @@ msgid "farmland"
msgstr "Ackerland"
msgctxt "landuse"
+msgid "farmyard"
+msgstr "landwirtschaftlicher Betrieb"
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr "Friedhof"
+
+msgctxt "landuse"
msgid "residential"
msgstr "Wohngebiet"
@@ -16338,6 +16402,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr "Dorfanger"
+msgctxt "landuse"
+msgid "quarry"
+msgstr "Steinbruch"
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr "Kleingarten"
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr "Weinberg"
+
msgctxt "natural"
msgid "scrub"
msgstr "Buschland"
@@ -16350,6 +16426,30 @@ msgctxt "natural"
msgid "grassland"
msgstr "Grünland"
+msgctxt "natural"
+msgid "wetland"
+msgstr "Feuchtgebiet"
+
+msgctxt "natural"
+msgid "heath"
+msgstr "Heide"
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr "Feuerwehrhaus"
+
+msgctxt "leisure"
+msgid "park"
+msgstr "Park"
+
+msgctxt "leisure"
+msgid "track"
+msgstr "Rennbahn"
+
+msgctxt "building"
+msgid "industrial"
+msgstr "Industrie"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "Zugeordnete Straße"
@@ -16709,6 +16809,14 @@ 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 "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr "IGN (Nationales Institut für Geografie) Argentinien (TMS)"
@@ -16812,6 +16920,9 @@ msgstr "OpenStreetMap (Belgischer Stil - Niederländisch)"
msgid "OpenStreetMap (Belgian Style - German)"
msgstr "OpenStreetMap (Belgischer Stil - Deutsch)"
+msgid "Orthophoto IGN-NGI"
+msgstr "Orthofoto IGN-NGI"
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr "AGIV Flandern neueste Luftbilder"
@@ -16865,11 +16976,11 @@ msgstr "SPW (Wallonie) 2012-2013 Luftbilder"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW (Wallonie) 2009-2010 Luftbilder"
-msgid "TEC bus lines (2014)"
-msgstr "TEC-Buslinien (2014)"
+msgid "TEC bus lines"
+msgstr "TEC-Buslinien"
-msgid "TEC bus stops (2014)"
-msgstr "TEC Bus-Haltestellen (2014)"
+msgid "TEC bus stops"
+msgstr "TEC-Bushaltestellen"
msgid "Benin: Cotonou Pleiade 2016"
msgstr "Benin: Großraum Cotonou 2016"
@@ -16902,6 +17013,81 @@ msgstr "Londrina Orthofoto 2011"
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr "SIG Santa Catarina OrthoRGB 2012"
+msgid "Arapiraca AL"
+msgstr "Arapiraca (Alagoas)"
+
+msgid "Branquinha AL"
+msgstr "Branquinha (Alagoas)"
+
+msgid "Cajueiro AL"
+msgstr "Cajueiro (Alagoas)"
+
+msgid "Campo Alegre AL"
+msgstr "Campo Alegre (Alagoas)"
+
+msgid "Capela AL"
+msgstr "Capela (Alagoas)"
+
+msgid "Delmiro Gouveia AL"
+msgstr "Delmiro Gouveia (Alagoas)"
+
+msgid "Estrela de Alagoas"
+msgstr "Estrela de Alagoas"
+
+msgid "Girau do Ponciano"
+msgstr "Girau do Ponciano"
+
+msgid "Major Isidoro AL"
+msgstr "Major Isidoro (Alagoas)"
+
+msgid "Mar Vermelho AL"
+msgstr "Mar Vermelho (Alagoas)"
+
+msgid "Minador do Negrão"
+msgstr "Minador do Negrão"
+
+msgid "Olho d’Agua do Casado AL"
+msgstr "Olho d’Agua do Casado AL"
+
+msgid "Palestina AL"
+msgstr "Palestina (Alagoas)"
+
+msgid "Palmeira dos Indios AL"
+msgstr "Palmeira dos Indios (Alagoas)"
+
+msgid "Pão de Açucar AL"
+msgstr "Pão de Açucar (Alagoas)"
+
+msgid "Piranhas AL"
+msgstr "Piranhas (Alagoas)"
+
+msgid "Poço das Trincheiras AL"
+msgstr "Poço das Trincheiras (Alagoas)"
+
+msgid "Santana do Ipanema AL"
+msgstr "Santana do Ipanema (Alagoas)"
+
+msgid "São Miguel dos Campos AL"
+msgstr "São Miguel dos Campos (Alagoas)"
+
+msgid "Teotonio Vilela AL"
+msgstr "Teotonio Vilela (Alagoas)"
+
+msgid "União dos Palmares AL"
+msgstr "União dos Palmares (Alagoas)"
+
+msgid "Viçosa AL"
+msgstr "Viçosa (Alagoas)"
+
+msgid "Alagoas Litoral 2006"
+msgstr "Küste Alagoas 2006"
+
+msgid "DER-ES"
+msgstr "DER-ES"
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr "IBGE-BC250-Trecho Rodoviario"
+
msgid "Geobase Hydrography"
msgstr "Geobasis Hydrografie"
@@ -16956,6 +17142,12 @@ msgstr "Tschechische RUIAN Grundstücke"
msgid "Czech pLPIS"
msgstr "Tschechisches pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr "Prag IPR neuestes Orthofoto"
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr "Prag IPR niedrige Vegetation Orthofoto"
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatenbehörde (Dänemark)"
@@ -17104,6 +17296,12 @@ msgstr "Berlin Luftbild 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Berlin Luftaufnahme 2016"
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr "Deutsche Bahn VzG Linien Nov 2013"
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr "Deutsche Bahn VzG-Linien Nov. 2015"
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Erlangen Luftbild (2016 5,0 cm)"
@@ -17148,6 +17346,14 @@ msgstr ""
"imagico.de OSM Bilder für die Kartierung: Nördliches deutsches Westküsten-"
"Watt (Infrarot)"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr "imagico.de OSM-Bilder zum Kartieren: Nordseeküste 2016"
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr "Sachsen neuestes Luftbild"
@@ -17172,6 +17378,9 @@ msgstr "Mainz alle Luftbilder"
msgid "Mainz latest aerial imagery"
msgstr "Mainz neuestes Luftbild"
+msgid "Munich latest aerial imagery 60cm"
+msgstr "München neuestes Luftbild 60cm"
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr "imagico.de OSM Bilder für die Kartierung: Qasigiannguit"
@@ -17226,36 +17435,45 @@ msgstr "Drohnenbild Canaan (Haiti) November 2015"
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr "Drohnenbilder Matthew (Haiti) Oktober 2016"
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr "FÖMI Orthofoto 2000"
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr "FÖMI Orthofoto 2005"
-msgid "Szeged ortophoto 2011"
-msgstr "Szegedin Orthofoto 2011"
+msgid "Szeged orthophoto 2011"
+msgstr "Szeged Orthofoto 2011"
msgid "Inner part of Szeged"
msgstr "Innerer Teil von Szegedin"
-msgid "Törökbálint ortophoto 2013"
-msgstr "Großturwall Orthofoto 2013"
+msgid "Törökbálint orthophoto 2013"
+msgstr "Törökbálint Orthofoto 2013"
msgid "5 cm resolution bald image"
msgstr "Unbelaubtes Bild in 5 cm-Auflösung"
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr "Törökbálint Orthofoto 2015"
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
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 XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
msgstr "Budapest Bezirk XI Orthofoto 2015"
+msgid "Budapest district XI orthophoto 2017"
+msgstr "XI. Budapester Bezirk Orthofoto 2017"
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr "Sóskút, Pusztazámor, Tárnok, Diósd Luftbild 2017"
+
+msgid "5 cm resolution bald image of 4 settlement"
+msgstr ""
+
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Hungary (Wanderwege)"
@@ -17394,6 +17612,14 @@ msgstr "PDOK Luftbild 25cm (WMTS)"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Spitzbergen - Orthofoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr "imagico.de OSM-Bilder zum Kartieren: Spitzbergen-Mosaik"
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
"imagico.de OSM Bilder für die Kartierung: Westliches Karakorum-Gebirge"
@@ -17426,8 +17652,8 @@ 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)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr "Pangasinán/Bulacan (Philippinen hochaufgelöst)"
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: Luftbild"
@@ -17577,6 +17803,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr "imagico.de OSM Bilder für die Kartierung: Kosmodrom Wostotschny"
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr "imagico.de OSM-Bilder zum Kartieren: Petschoraseeküste"
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Auto"
@@ -17652,6 +17886,9 @@ msgstr "Kanton Aargau 25cm (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Kanton Aargau 25cm (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr "Kanton Aargau 25cm (AGIS 2016)"
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr "Kanton Zürich Orthofotos 2014/2015 10cm"
@@ -17759,33 +17996,78 @@ msgstr "TIGER 2012-Straßeneinblendung"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr "Neue & falsch ausgerichtete TIGER-Straßen (2015)"
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parzellen"
msgid "NC Latest Orthoimagery"
msgstr "NC Neueste Luftbilder"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
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 ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr "NJ 2015 Luftbilder (Infrarot)"
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr "NJ 2015 Luftbilder (natürliche Farbe)"
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
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 ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr "WA 2016 Luftbilder für San Juan County"
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+"Gemeinfreie Luftbilder des San Juan County, Bundesstaat Washington, "
+"aufgenommen in Mai, Juni und Juli. Auflösung 15cm."
+
msgid "WA Vector Streetmap for San Juan County"
msgstr "WA Vektor-Straßenkarte für San Juan County"
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr "Texas Orthofoto"
@@ -17795,12 +18077,25 @@ msgstr "Philadelphia 2015 Bilder"
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr "MD Neueste 6-Zoll-Luftbilder"
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr "Maryland 3 Zoll Luftbild"
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr "Maryland Transport-Basiskarte"
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr "Delaware 2012 Orthofoto"
@@ -18134,11 +18429,11 @@ msgstr ""
"von Gebäuden. Optimiert für basemap.at."
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
-"Ordnet Adressen automatisch gewählten Objekten in Österreich zu. Daten (c) "
-"Österreichisches Adressregister."
+"Automatische Zuordnung der Adresse zu einem markieren Objekt in Österreich. "
+"Daten © Österreichisches Adressregister 2017, N 23806/2017."
msgid ""
"Allows the user to correct angle of buildings to 90 degrees, and aligns all "
@@ -18321,9 +18616,6 @@ msgstr ""
"Datenbank der Bildversätze: Teilen und übernehmen Sie Bildversätze mit nur "
"einer Schaltfläche."
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "WMSPlugin-ähnlicher Modus zum Kartenverschieben"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -19247,7 +19539,7 @@ msgstr "Basketball"
msgctxt "sport"
msgid "beachvolleyball"
-msgstr "Strandvolleyball"
+msgstr "Beachvolleyball"
msgctxt "sport"
msgid "billiards"
@@ -20366,26 +20658,33 @@ msgstr "Fahrradspur/-fahrbahn"
msgid "Cycleway"
msgstr "Radweg"
+msgctxt "cycleway"
msgid "lane"
-msgstr "Fahrspur"
+msgstr "Radfahrstreifen"
+msgctxt "cycleway"
msgid "track"
-msgstr "Radweg"
+msgstr "separater Radweg"
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "Fahrspur (Gegenrichtung)"
+msgstr "Radfahrstreifen in Gegenrichtung"
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "Separater Weg (Gegenrichtung)"
+msgstr "separater Radweg in Gegenrichtung"
+msgctxt "cycleway"
msgid "opposite"
-msgstr "Gegenrichtung"
+msgstr "für Radfahrer in Gegenrichtung geöffnete Einbahnstraße"
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "Gemeinsame Busspur"
+msgstr "gemeinsame Busspur"
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "Abgetrennter Fahrspurbereich"
+msgstr "gemeinsamer Fahrstreifen"
msgid "Cycleway left"
msgstr "Fahrradweg links"
@@ -21566,6 +21865,9 @@ msgstr "Mitgliedskarte"
msgid "Wash"
msgstr "Autowäsche"
+msgid "Self Service"
+msgstr "Selbstbedienung"
+
msgid "Car Dealer"
msgstr "Autohändler"
@@ -23063,7 +23365,7 @@ msgstr "Grün"
msgctxt "golf"
msgid "Fairway"
-msgstr "Fläche"
+msgstr "Fairway"
msgctxt "golf"
msgid "Rough"
@@ -23383,10 +23685,6 @@ msgid "garages"
msgstr "Garagen"
msgctxt "building"
-msgid "industrial"
-msgstr "Industrie"
-
-msgctxt "building"
msgid "school"
msgstr "Schule"
@@ -24789,6 +25087,21 @@ msgstr "Palast"
msgid "Archaeological Site"
msgstr "Ausgrabungsstelle"
+msgid "tumulus"
+msgstr "Hügelgrab"
+
+msgid "megalith"
+msgstr "Megalith (Steinblock)"
+
+msgid "fortification"
+msgstr "Befestigung"
+
+msgid "settlement"
+msgstr "Siedlung"
+
+msgid "necropolis"
+msgstr "Totenstadt"
+
msgid "Battlefield"
msgstr "Schlachtfeld"
@@ -26358,6 +26671,21 @@ msgstr "Administrationszentrum"
msgid "Label point"
msgstr "Beschriftungspunkt"
+msgid "Outline of building"
+msgstr "Außenlinie eines Gebäudes"
+
+msgid "Inner segment"
+msgstr "Inneres Segment"
+
+msgid "Roof ridge"
+msgstr "Dachfirst"
+
+msgid "Roof edge"
+msgstr "Dachkante"
+
+msgid "Building level"
+msgstr "Stockwerk"
+
msgid "Site"
msgstr "Platz"
@@ -27945,15 +28273,6 @@ msgstr "Lokale Bilder importieren"
msgid "Import pictures into Mapillary layer"
msgstr "Bilder in Mapillary-Ebene importieren"
-msgid "Select pictures"
-msgstr "Bilder auswählen"
-
-msgid "Import pictures into sequence"
-msgstr "Bilder als Sequenz importieren"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Bilder als eine Sequenz in die Mapillary-Ebene importieren"
-
msgid "Join mode"
msgstr "Verbindungsmodus"
@@ -28167,7 +28486,7 @@ msgid "Preview images when hovering its icon"
msgstr "Beim Überfahren des Symbols Vorschaubilder anzeigen"
msgid "Cut off sequences at download bounds"
-msgstr "Begrenzungssequenz der Herunterladegrenzen"
+msgstr "Schneide Sequenzen an den Herunterladegrenzen ab"
msgid "Download mode"
msgstr "Herunterlademodus"
@@ -28204,6 +28523,43 @@ msgstr "Ausgewähltem Bild folgen"
msgid "Go forward"
msgstr "Vorwärts gehen"
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Importieren"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -28252,6 +28608,9 @@ msgstr ""
"Angeige von detaillierten Informationen über das momentan ausgewählte "
"Mapillary-Bild"
+msgid "Show detections on top of image"
+msgstr "Zeige Erkennungen über dem Bild"
+
msgid "View in browser"
msgstr "Im Webbrowser ansehen"
@@ -28261,6 +28620,9 @@ msgstr "Schlüssel kopieren"
msgid "Add Mapillary tag"
msgstr "Mapillary-Tag hinzufügen"
+msgid "Image detections"
+msgstr "Bilderkennungen"
+
msgid "Image actions"
msgstr "Bildaktionen"
@@ -28270,15 +28632,33 @@ msgstr "Bildschlüssel"
msgid "Sequence key"
msgstr "Sequenzschlüssel"
+msgid "{0} detections"
+msgstr "{0} Erkennungen"
+
msgid "image has no key"
msgstr "Bild hat keinen Schlüssel"
+msgid "unknown user"
+msgstr "unbekannter Nutzer"
+
msgid "sequence has no key"
msgstr "Sequenz hat keinen Schlüssel"
msgid "Could not open the URL {0} in a browser"
msgstr "Konnte die URL {0} nicht in einem Browser öffnen"
+msgid "Downloading map objects…"
+msgstr "Kartenobjekte werden heruntergeladen..."
+
+msgid "All map objects loaded."
+msgstr "Alle Kartenobjekte geladen."
+
+msgid "Too many map objects, zoom in to see all."
+msgstr "Zu viele Kartenobjekte, vergrößern um alle zu sehen."
+
+msgid "Downloading map objects failed!"
+msgstr "Herunterladen von Kartenobjekten fehlgeschlagen!"
+
msgid "Mapillary objects"
msgstr "Mapillary-Objekte"
@@ -28311,8 +28691,18 @@ msgstr[1] "{0} Bilder gedreht"
msgid "2 images unjoined"
msgstr "2 Bilder getrennt"
-msgid "Could not read map objects from URL {0}!"
-msgstr "Kartenobjekte der URL {0} nicht lesbar!"
+msgid "Could not read from URL {0}!"
+msgstr "Konnte nicht von URL {0} lesen!"
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
+msgstr ""
+"{0}\n"
+"Kartenobjekte konnten nicht von URL\n"
+"{1}\n"
+"gelesen werden!"
msgid "everything in the visible area"
msgstr "alles im sichtbaren Bereich"
@@ -28330,9 +28720,6 @@ msgstr ""
"Der heruntergeladene OSM-Bereich ist zu groß. Herunterlademodus wurde auf "
"OSM-Bereich geändert, bis die Ebene neu gestartet wird."
-msgid "Could not read sequences from URL {0}!"
-msgstr "Konnte Sequenz von URL {0} nicht lesen!"
-
msgid "Downloading"
msgstr "Wird heruntergeladen"
@@ -29156,6 +29543,9 @@ msgstr "Österreich-Adresshelfer"
msgid "Successfully added address to selected object:"
msgstr "Adresse erfolgreich zum ausgewählten Objekt hinzugefügt:"
+msgid "Distance between building center and address coordinates:"
+msgstr "Entfernung zwischen Gebäudemitte und Adress-Koordinaten:"
+
msgid "No address was found for this object."
msgstr "Für dieses Objekt wurde keine Adresse gefunden."
@@ -30073,6 +30463,12 @@ msgstr "Merkmale (Levenshtein-Distanz): "
msgid "List of tags to match"
msgstr "Liste der in Übereinstimmung zu bringenden Merkmale"
+msgid "Identical Elements Filter"
+msgstr "Filter identischer Elemente"
+
+msgid "Avoid matching an element with itself"
+msgstr "Übereinstimmung eines Elements mit sich selbst vermeiden"
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -30099,6 +30495,35 @@ msgstr "Filterung"
msgid "Unioning"
msgstr "Vereinigungsbildung"
+msgid "Programming"
+msgstr "Programmierung"
+
+msgid "Replace Geometry"
+msgstr "Geometrie ersetzen"
+
+msgid "Merge Tags"
+msgstr "Merkmale zusammenführen"
+
+msgid "List of tags to merge"
+msgstr "Liste der zu zusammenführenden Merkmale"
+
+msgid "except"
+msgstr "außer"
+
+msgid "List of tags to NOT merge (they will be ignored)"
+msgstr ""
+"Liste von Merkmalen, die NICHT zusammengeführt werden (sie werden ignoriert)"
+
+msgid "Overwrite tags without confirmation"
+msgstr "Merkmale ohne Bestätigung überschreiben"
+
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
+msgstr ""
+"Liste von Merkmalen, die bei einem Konflikt unter Verwendung der "
+"Referenzebene ohne Nachfrage überschrieben werden"
+
msgid "Simple Example"
msgstr "Einfaches Beispiel"
@@ -30114,33 +30539,15 @@ msgstr "Zusammenführungseinstellungen konfigurieren"
msgid "Generate matches"
msgstr "Übereinstimmungen erzeugen"
+msgid "Merging"
+msgstr "Wird zusammengeführt"
+
msgid "Reference:"
msgstr "Referenz:"
msgid "Subject:"
msgstr "Betreff:"
-msgid "Programming"
-msgstr "Programmierung"
-
-msgid "Merging"
-msgstr "Wird zusammengeführt"
-
-msgid "Replace Geometry"
-msgstr "Geometrie ersetzen"
-
-msgid "Merge Tags"
-msgstr "Merkmale zusammenführen"
-
-msgid "List of tags to merge"
-msgstr "Liste der zu zusammenführenden Merkmale"
-
-msgid "Overwrite tags without confirmation"
-msgstr "Merkmale ohne Bestätigung überschreiben"
-
-msgid "List of tags to overwrite without confirmation"
-msgstr "Liste von Merkmalen, die ohne Nachfrage überschrieben werden"
-
msgid "Selections must be made for both reference and subject."
msgstr "Sowohl Referenz- als auch Ziel-Objekte müssen ausgewählt werden."
@@ -30171,6 +30578,13 @@ msgstr "Leere Auswahl"
msgid "Freeze reference selection"
msgstr "Referenzauswahl fixieren"
+msgid "Reference and subject sets should better be different."
+msgstr "Referenz- und Zielmenge sollten sich unterscheiden."
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+"Relationen werden gegenwärtig nicht unterstützt, bitte keine auswählen."
+
msgid "Disambiguating"
msgstr "Wird eindeutig gemacht"
@@ -30578,9 +30992,6 @@ msgstr "Globalsat-Import"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Daten vom Globalsat-Datenlogger DG100 in eine GPS-Ebene importieren."
-msgid "Import"
-msgstr "Importieren"
-
msgid "GPS Blams"
msgstr "GPS Blams"
@@ -31103,9 +31514,6 @@ msgstr "Bildversätze werden geladen …"
msgid "Error processing XML response: {0}"
msgstr "Fehler beim Bearbeiten der XML-Antwort: {0}"
-msgid "Offset"
-msgstr "Versatz"
-
msgid "Imagery Offset Database"
msgstr "Bildversatz-Datenbank"
@@ -31244,24 +31652,6 @@ msgstr "Neuer Versatz wird hochgeladen …"
msgid "This string should be 3 to 200 letters long."
msgstr "Der Text sollte 3 bis 200 Zeichen lang sein."
-msgid "Adjust imagery"
-msgstr "Hintergrundbild justieren"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Position der gewählten Hintergrundebene anpassen"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Bitte die Hintergrundbildebene zum anpassen auswählen"
-
-msgid "Start adjusting"
-msgstr "Justierung beginnen"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "Es gibt momentan keine Hintergrundbildebenen zum anpassen."
-
-msgid "No layers to adjust"
-msgstr "Keine Ebenen zum anpassen"
-
msgid "Normal"
msgstr "Normal"
@@ -31274,12 +31664,21 @@ msgstr "180° drehen"
msgid "Rotate 270"
msgstr "270° drehen"
-msgid "Previous image"
-msgstr "Vorheriges Bild"
+msgid "WayPoint Image"
+msgstr "Wegpunktbild"
+
+msgid "Display non-geotagged photos"
+msgstr "Nicht georeferenzierte Bilder anzeigen"
+
+msgid "Imported Images"
+msgstr "Importierte Bilder"
msgid "Next image"
msgstr "Nächstes Bild"
+msgid "Previous image"
+msgstr "Vorheriges Bild"
+
msgid "Rotate left"
msgstr "Nach links drehen"
@@ -31292,15 +31691,6 @@ msgstr "Nach rechts drehen"
msgid "Rotate image right"
msgstr "Bild nach rechts drehen"
-msgid "WayPoint Image"
-msgstr "Wegpunktbild"
-
-msgid "Display non-geotagged photos"
-msgstr "Nicht georeferenzierte Bilder anzeigen"
-
-msgid "Imported Images"
-msgstr "Importierte Bilder"
-
msgid "Import vector graphics"
msgstr "Vektorgrafiken importieren"
@@ -33540,9 +33930,6 @@ msgstr "Verbinden"
msgid "Public Transport: Join GTFS stops"
msgstr "Öffentlicher Verkehr: GTFS-Haltestellen verbinden"
-msgid "Id"
-msgstr "Id"
-
msgid "State"
msgstr "Bundesland"
diff --git a/i18n/po/de_DE.po b/i18n/po/de_DE.po
index 0fb7685..58db5bb 100644
--- a/i18n/po/de_DE.po
+++ b/i18n/po/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2011-07-10 12:32+0000\n"
"Last-Translator: ralekuja <Unknown>\n"
"Language-Team: German (Germany) <de_DE at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:20+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:17+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3314,6 +3314,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3322,6 +3325,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3986,6 +3994,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4042,6 +4053,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9020,46 +9034,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9174,7 +9191,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9288,9 +9311,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9301,8 +9321,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9464,16 +9487,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9603,12 +9616,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9768,6 +9791,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11184,15 +11237,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11241,6 +11285,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12416,6 +12463,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13558,6 +13608,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13756,9 +13809,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14465,6 +14515,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14476,6 +14534,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14488,6 +14558,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14843,6 +14937,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14945,6 +15047,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14996,10 +15101,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15032,6 +15137,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15084,6 +15264,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15230,6 +15416,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15269,6 +15461,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15293,6 +15493,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15337,34 +15540,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15505,6 +15717,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15533,7 +15753,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15682,6 +15902,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15757,6 +15985,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15862,33 +16093,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15898,12 +16172,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16222,8 +16509,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16364,9 +16651,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18271,24 +18555,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19461,6 +19752,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21276,10 +21570,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22680,6 +22970,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24221,6 +24526,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25717,15 +26037,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25967,6 +26278,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26002,6 +26350,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26011,6 +26362,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26020,15 +26374,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26061,7 +26433,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26078,9 +26456,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26773,6 +27148,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27615,6 +27993,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27635,46 +28019,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27707,6 +28099,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28082,9 +28480,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28569,9 +28964,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28690,42 +29082,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28738,15 +29121,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30839,9 +31213,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/el.po b/i18n/po/el.po
index cd427ef..3b21de9 100644
--- a/i18n/po/el.po
+++ b/i18n/po/el.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2016-01-25 09:17+0000\n"
"Last-Translator: Aggelos Arnaoutis <angelosarn at hotmail.com>\n"
"Language-Team: Greek <el at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:50+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:48+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: el\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3485,6 +3485,9 @@ msgstr "Προβολή"
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3493,6 +3496,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4163,6 +4171,9 @@ msgstr "Αυτή η δοκιμή ελέγχει αν τα πολυ-πολύγω
msgid "Area style way is not closed"
msgstr "Διαδρομή τύπου περιοχής δεν είναι κλειστή"
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "Πολύ-πολύγωνο χωρίς εξωτερική διαδρομή"
@@ -4219,6 +4230,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr "Μη χρήσιμος ρόλος για μέλος πολύ-πολυγώνου"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "Μή διαδρομή στο πολύ-πολύγωνο"
@@ -9328,46 +9342,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} αντικείμενο προς διαγραφή:"
msgstr[1] "{0} αντικείμενα προς διαγραφή:"
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
-msgstr "Αυτόματη φόρτωση πλακιδίων"
+msgid "Show tile info"
+msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
-msgstr "Αλλαγή ανάλυσης"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Άυξηση ζουμ"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Μείωση ζουμ"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9482,8 +9499,14 @@ msgstr[1] "{0} τροχιές, "
msgid "Save GPX file"
msgstr "Αποθήκευση αρχείου GPX"
-msgid "Imagery fade"
-msgstr "Εξασθένιση υπόβαθρου εικόνων"
+msgid "Id"
+msgstr "Ταυτότητα"
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
+msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
@@ -9596,9 +9619,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Αποθήκευση αρχείου OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr "Σφάλματα επικύρωσης"
@@ -9609,8 +9629,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9772,16 +9795,6 @@ msgstr "Πρέπει να επιλέξετε ένα ίχνος GPX"
msgid "No selected GPX track"
msgstr "Δεν επιλέχθηκε ίχνος GPX"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9913,12 +9926,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -10079,6 +10102,36 @@ msgstr "Σημάδια από Ονομασμένα Σημεία"
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr "Αυτόματη φόρτωση πλακιδίων"
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr "Μείωση ζουμ"
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr "Άυξηση ζουμ"
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr "Αλλαγή ανάλυσης"
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr "σημάδι gps"
@@ -11511,15 +11564,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr "εξασθένιση υπόβαθρου εικόνων"
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr "Απαλό"
@@ -11570,6 +11614,9 @@ msgstr "Παρασκήνιο υπόβαθρου εικόνων:Προκαθορ
msgid "Available default entries:"
msgstr "Διαθέσιμες προεπιλεγμένες καταχωρήσεις:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "Επιλεγμένες καταχωρίσεις:"
@@ -12765,6 +12812,9 @@ msgstr "Προαιρετικά Χαρακτηριστικά:"
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13920,6 +13970,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -14129,9 +14182,6 @@ msgstr ""
"Το πρόσθετο αφαιρέθηκε από την διαμόρφωση. Παρακαλώ επανεκινήστε το JOSM για "
"να αποφορτωθεί το πρόσθετο."
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr "δεν υπάρχει περιγραφή"
@@ -14846,6 +14896,14 @@ msgid "farmland"
msgstr "χωράφι"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "Οικιστική"
@@ -14857,6 +14915,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr "θαμνότοπος"
@@ -14869,6 +14939,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -15224,6 +15318,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -15326,6 +15428,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15377,10 +15482,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15413,6 +15518,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15465,6 +15645,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15611,6 +15797,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15650,6 +15842,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15674,6 +15874,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15718,34 +15921,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15886,6 +16098,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15914,7 +16134,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -16063,6 +16283,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -16138,6 +16366,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -16243,33 +16474,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -16279,12 +16553,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16603,8 +16890,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16745,9 +17032,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18655,24 +18939,31 @@ msgstr ""
msgid "Cycleway"
msgstr "Ποδηλατόδρομος"
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19845,6 +20136,9 @@ msgstr ""
msgid "Wash"
msgstr "Πλυντήριο"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21660,10 +21954,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -23064,6 +23354,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Αρχαιολογικός Χώρος"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Πεδίο Μάχης"
@@ -24605,6 +24910,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -26103,15 +26423,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -26353,6 +26664,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Εισαγωγή"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26388,6 +26736,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26397,6 +26748,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26406,15 +26760,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26447,7 +26819,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26464,9 +26842,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -27161,6 +27536,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -28004,6 +28382,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -28024,46 +28408,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
+msgstr "Αντικατάσταση Γεωμετρίας"
+
+msgid "Merge Tags"
msgstr ""
-msgid "<Please select data>"
+msgid "List of tags to merge"
msgstr ""
-msgid "Configure conflation settings"
+msgid "except"
msgstr ""
-msgid "Generate matches"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Reference:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Subject:"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Programming"
+msgid "Simple Example"
msgstr ""
-msgid "Merging"
+msgid "Advanced Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Αντικατάσταση Γεωμετρίας"
+msgid "<Please select data>"
+msgstr ""
-msgid "Merge Tags"
+msgid "Configure conflation settings"
msgstr ""
-msgid "List of tags to merge"
+msgid "Generate matches"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Merging"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -28096,6 +28488,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28475,9 +28873,6 @@ msgstr "Εισαγωγή Globalsat"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Εισαγωγή δεδομένων από Globalsat Datalogger DG100 στο επίπεδο GPX."
-msgid "Import"
-msgstr "Εισαγωγή"
-
msgid "GPS Blams"
msgstr ""
@@ -28964,9 +29359,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -29085,24 +29477,6 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
-msgstr ""
-
-msgid "Start adjusting"
-msgstr ""
-
-msgid "There are currently no imagery layer to adjust."
-msgstr ""
-
-msgid "No layers to adjust"
-msgstr ""
-
msgid "Normal"
msgstr "Κανονική"
@@ -29115,12 +29489,21 @@ msgstr "Περιστροφή 180"
msgid "Rotate 270"
msgstr "Περιστροφή 270"
-msgid "Previous image"
-msgstr "Προηγούμενη εικόνα"
+msgid "WayPoint Image"
+msgstr ""
+
+msgid "Display non-geotagged photos"
+msgstr ""
+
+msgid "Imported Images"
+msgstr "Εισαγμένες Εικόνες"
msgid "Next image"
msgstr "Επόμενη εικόνα"
+msgid "Previous image"
+msgstr "Προηγούμενη εικόνα"
+
msgid "Rotate left"
msgstr "Περιστροφή αριστερά"
@@ -29133,15 +29516,6 @@ msgstr "Περιστροφή δεξιά"
msgid "Rotate image right"
msgstr "Περιστροφή εικόνας δεξιά"
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr "Εισαγμένες Εικόνες"
-
msgid "Import vector graphics"
msgstr ""
@@ -31252,9 +31626,6 @@ msgstr "Σύνδεση"
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr "Ταυτότητα"
-
msgid "State"
msgstr "Πολιτεία"
diff --git a/i18n/po/en_AU.po b/i18n/po/en_AU.po
index 0a54a33..f0345d5 100644
--- a/i18n/po/en_AU.po
+++ b/i18n/po/en_AU.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2015-06-08 12:52+0000\n"
"Last-Translator: Mark Pulley <mrpulley at lizzy.com.au>\n"
"Language-Team: English (Australia) <en_AU at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:18+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:15+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3538,6 +3538,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3546,6 +3549,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4240,6 +4248,9 @@ msgstr "This test checks if multipolygons are valid."
msgid "Area style way is not closed"
msgstr "Area style way is not closed"
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "No outer way for multipolygon"
@@ -4300,6 +4311,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr "No useful role for multipolygon member"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "Non-Way in multipolygon"
@@ -9634,46 +9648,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} object to delete:"
msgstr[1] "{0} objects to delete:"
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
-msgstr "Tile Info"
+msgid "Offset"
+msgstr ""
-msgid "Metadata "
-msgstr "Metadata "
+msgid "Tile download projection"
+msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
-msgstr "Auto load tiles"
+msgid "Show tile info"
+msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
+msgstr "Tile Info"
+
+msgid "Tile name"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile size"
msgstr ""
-msgid "Zoom to native resolution"
-msgstr "Zoom to native resolution"
+msgid "Tile display size"
+msgstr ""
-msgid "Change resolution"
-msgstr "Change resolution"
+msgid "Reprojection"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Increase zoom"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Decrease zoom"
+msgid "Metadata "
+msgstr "Metadata "
-msgid "Flush tile cache"
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9788,8 +9805,14 @@ msgstr[1] "{0} tracks, "
msgid "Save GPX file"
msgstr "Save GPX file"
-msgid "Imagery fade"
-msgstr "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
+msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
@@ -9904,9 +9927,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Save OSM file"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "EPSG:4326 and Mercator projection are supported"
-
msgid "Validation errors"
msgstr "Validation errors"
@@ -9917,8 +9937,11 @@ msgid "Set WMS Bookmark"
msgstr "Set WMS Bookmark"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -10091,20 +10114,6 @@ msgstr "You should select a GPX track"
msgid "No selected GPX track"
msgstr "No selected GPX track"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-
msgid "Geotagged Images"
msgstr "Geotagged Images"
@@ -10246,12 +10255,26 @@ msgstr ""
"\n"
"GPS time: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+
msgid "Show thumbnails"
msgstr "Show thumbnails"
msgid "Show image thumbnails instead of icons."
msgstr "Show image thumbnails instead of icons."
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+
msgid "Choose visible tracks"
msgstr "Choose visible tracks"
@@ -10426,6 +10449,36 @@ msgstr "Markers From Named Points"
msgid "Named Trackpoints from {0}"
msgstr "Named Trackpoints from {0}"
+msgid "Auto load tiles"
+msgstr "Auto load tiles"
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr "Decrease zoom"
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr "Increase zoom"
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr "Change resolution"
+
+msgid "Zoom to native resolution"
+msgstr "Zoom to native resolution"
+
msgid "gps marker"
msgstr "gps marker"
@@ -11958,15 +12011,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -12015,6 +12059,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -13225,6 +13272,9 @@ msgstr "Optional Attributes:"
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -14412,6 +14462,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr "Plug-in information"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -14639,9 +14692,6 @@ msgstr ""
"The plug-in has been removed from the configuration. Please restart JOSM to "
"unload the plug-in."
-msgid "Plugin information"
-msgstr "Plug-in information"
-
msgid "no description available"
msgstr "no description available"
@@ -15396,6 +15446,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -15407,6 +15465,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -15419,6 +15489,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -15774,6 +15868,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -15876,6 +15978,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15927,10 +16032,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15963,6 +16068,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -16015,6 +16195,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -16161,6 +16347,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16200,6 +16392,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -16224,6 +16424,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -16268,34 +16471,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -16436,6 +16648,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -16464,7 +16684,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -16613,6 +16833,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -16688,6 +16916,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -16793,33 +17024,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -16829,12 +17103,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -17155,8 +17442,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -17303,9 +17590,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -19232,24 +19516,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "track"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -20422,6 +20713,9 @@ msgstr ""
msgid "Wash"
msgstr "Wash"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Car Dealer"
@@ -22237,10 +22531,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -23641,6 +23931,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Archaeological Site"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Battlefield"
@@ -25182,6 +25487,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -26682,15 +27002,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -26932,6 +27243,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Import"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26967,6 +27315,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26976,6 +27327,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26985,15 +27339,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -27026,7 +27398,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -27043,9 +27421,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -27739,6 +28114,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -28621,6 +28999,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -28641,46 +29025,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
+msgstr ""
+
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -28713,6 +29105,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -29094,9 +29492,6 @@ msgstr "Globalsat Import"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Import Data from Globalsat Datalogger DG100 into GPX layer."
-msgid "Import"
-msgstr "Import"
-
msgid "GPS Blams"
msgstr ""
@@ -29581,9 +29976,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -29702,24 +30094,6 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
-msgstr ""
-
-msgid "Start adjusting"
-msgstr ""
-
-msgid "There are currently no imagery layer to adjust."
-msgstr ""
-
-msgid "No layers to adjust"
-msgstr ""
-
msgid "Normal"
msgstr "Normal"
@@ -29732,12 +30106,21 @@ msgstr "Rotate 180"
msgid "Rotate 270"
msgstr "Rotate 270"
-msgid "Previous image"
-msgstr "Previous image"
+msgid "WayPoint Image"
+msgstr "WayPoint Image"
+
+msgid "Display non-geotagged photos"
+msgstr "Display non-geotagged photos"
+
+msgid "Imported Images"
+msgstr "Imported Images"
msgid "Next image"
msgstr "Next image"
+msgid "Previous image"
+msgstr "Previous image"
+
msgid "Rotate left"
msgstr "Rotate left"
@@ -29750,15 +30133,6 @@ msgstr "Rotate right"
msgid "Rotate image right"
msgstr "Rotate image right"
-msgid "WayPoint Image"
-msgstr "WayPoint Image"
-
-msgid "Display non-geotagged photos"
-msgstr "Display non-geotagged photos"
-
-msgid "Imported Images"
-msgstr "Imported Images"
-
msgid "Import vector graphics"
msgstr ""
@@ -31867,9 +32241,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr "State"
diff --git a/i18n/po/en_CA.po b/i18n/po/en_CA.po
index a332412..54b9c0c 100644
--- a/i18n/po/en_CA.po
+++ b/i18n/po/en_CA.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2010-09-24 17:25+0000\n"
"Last-Translator: Johann Beda <Unknown>\n"
"Language-Team: English (Canada) <en_CA at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:21+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:17+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3311,6 +3311,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3319,6 +3322,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3983,6 +3991,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4039,6 +4050,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9017,46 +9031,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9171,7 +9188,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9285,9 +9308,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9298,8 +9318,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9461,16 +9484,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9600,12 +9613,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9765,6 +9788,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11181,15 +11234,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11238,6 +11282,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12413,6 +12460,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13555,6 +13605,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13753,9 +13806,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14459,6 +14509,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14470,6 +14528,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14482,6 +14552,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14837,6 +14931,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14939,6 +15041,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14990,10 +15095,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15026,6 +15131,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15078,6 +15258,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15224,6 +15410,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15263,6 +15455,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15287,6 +15487,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15331,34 +15534,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15499,6 +15711,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15527,7 +15747,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15676,6 +15896,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15751,6 +15979,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15856,33 +16087,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15892,12 +16166,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16216,8 +16503,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16358,9 +16645,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18265,24 +18549,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19455,6 +19746,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21270,10 +21564,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22674,6 +22964,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24215,6 +24520,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25711,15 +26031,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25961,6 +26272,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25996,6 +26344,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26005,6 +26356,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26014,15 +26368,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26055,7 +26427,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26072,9 +26450,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26767,6 +27142,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27605,6 +27983,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27625,46 +28009,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27697,6 +28089,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28072,9 +28470,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28559,9 +28954,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28680,42 +29072,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28728,15 +29111,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30829,9 +31203,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/en_GB.po b/i18n/po/en_GB.po
index 85f9670..610599c 100644
--- a/i18n/po/en_GB.po
+++ b/i18n/po/en_GB.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: JOSM\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2016-11-01 11:03+0000\n"
"Last-Translator: Andi Chandler <Unknown>\n"
"Language-Team: German <josm-dev at openstreetmap.org>\n"
@@ -18,8 +18,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:18+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:14+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: de\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3547,6 +3547,9 @@ msgstr "Projection"
msgid "Matrix set identifier"
msgstr "Matrix set identifier"
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "No layers defined by getCapabilities document: {0}"
@@ -3556,6 +3559,11 @@ msgstr ""
"WMTS Parser error - start element {0} has different name than end element {2}"
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4252,6 +4260,9 @@ msgstr "This test checks if multipolygons are valid."
msgid "Area style way is not closed"
msgstr "Area style way is not closed"
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "No outer way for multipolygon"
@@ -4314,6 +4325,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr "No useful role for multipolygon member"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "Non-Way in multipolygon"
@@ -9676,47 +9690,50 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} object to delete:"
msgstr[1] "{0} objects to delete:"
-msgid "Show tile info"
-msgstr "Show tile info"
+msgid "Native projections"
+msgstr ""
-msgid "Tile Info"
-msgstr "Tile Info"
+msgid "Offset"
+msgstr "Offset"
-msgid "Metadata "
-msgstr "Metadata "
+msgid "Tile download projection"
+msgstr ""
-msgid "Load tile"
-msgstr "Load tile"
+msgid "Tile display projection"
+msgstr ""
-msgid "Auto zoom"
-msgstr "Auto zoom"
+msgid "Current zoom"
+msgstr ""
-msgid "Auto load tiles"
-msgstr "Auto load tiles"
+msgid "Show tile info"
+msgstr "Show tile info"
-msgid "Show errors"
-msgstr "Show errors"
+msgid "Tile Info"
+msgstr "Tile Info"
-msgid "Load all tiles"
-msgstr "Load all tiles"
+msgid "Tile name"
+msgstr ""
-msgid "Load all error tiles"
-msgstr "Load all error tiles"
+msgid "Tile URL"
+msgstr ""
-msgid "Zoom to native resolution"
-msgstr "Zoom to native resolution"
+msgid "Tile size"
+msgstr ""
-msgid "Change resolution"
-msgstr "Change resolution"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Increase zoom"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Decrease zoom"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
-msgstr "Flush tile cache"
+msgid "Metadata "
+msgstr "Metadata "
+
+msgid "Load tile"
+msgstr "Load tile"
msgid "Failed to create tile source"
msgstr "Failed to create tile source"
@@ -9832,8 +9849,14 @@ msgstr[1] "{0} tracks, "
msgid "Save GPX file"
msgstr "Save GPX file"
-msgid "Imagery fade"
-msgstr "Imagery fade"
+msgid "Id"
+msgstr "Id"
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
+msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr "Unsupported imagery type: {0}"
@@ -9948,9 +9971,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Save OSM file"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "EPSG:4326 and Mercator projection are supported"
-
msgid "Validation errors"
msgstr "Validation errors"
@@ -9961,11 +9981,12 @@ msgid "Set WMS Bookmark"
msgstr "Set WMS Bookmark"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
msgid "Correlate to GPX"
msgstr "Correlate to GPX"
@@ -10137,20 +10158,6 @@ msgstr "You should select a GPX track"
msgid "No selected GPX track"
msgstr "No selected GPX track"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-
msgid "Geotagged Images"
msgstr "Geotagged Images"
@@ -10292,12 +10299,26 @@ msgstr ""
"\n"
"GPS time: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+
msgid "Show thumbnails"
msgstr "Show thumbnails"
msgid "Show image thumbnails instead of icons."
msgstr "Show image thumbnails instead of icons."
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+
msgid "Choose visible tracks"
msgstr "Choose visible tracks"
@@ -10472,6 +10493,36 @@ msgstr "Markers From Named Points"
msgid "Named Trackpoints from {0}"
msgstr "Named Trackpoints from {0}"
+msgid "Auto load tiles"
+msgstr "Auto load tiles"
+
+msgid "Auto zoom"
+msgstr "Auto zoom"
+
+msgid "Decrease zoom"
+msgstr "Decrease zoom"
+
+msgid "Flush tile cache"
+msgstr "Flush tile cache"
+
+msgid "Increase zoom"
+msgstr "Increase zoom"
+
+msgid "Load all tiles"
+msgstr "Load all tiles"
+
+msgid "Load all error tiles"
+msgstr "Load all error tiles"
+
+msgid "Show errors"
+msgstr "Show errors"
+
+msgid "Change resolution"
+msgstr "Change resolution"
+
+msgid "Zoom to native resolution"
+msgstr "Zoom to native resolution"
+
msgid "gps marker"
msgstr "gps marker"
@@ -12034,15 +12085,6 @@ msgstr "Cache name"
msgid "Object Count"
msgstr "Object Count"
-msgid "imagery fade"
-msgstr "imagery fade"
-
-msgid "Fade Color: "
-msgstr "Fade Colour: "
-
-msgid "Fade amount: "
-msgstr "Fade amount: "
-
msgid "Soft"
msgstr "Soft"
@@ -12091,6 +12133,9 @@ msgstr "Imagery background: Default"
msgid "Available default entries:"
msgstr "Available default entries:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "Selected entries:"
@@ -13351,6 +13396,9 @@ msgstr "Optional Attributes:"
msgid "Unknown requisite: {0}"
msgstr "Unknown requisite: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "Illegal member expression: {0}"
@@ -14593,6 +14641,9 @@ msgstr "replaced by new {0} plugin"
msgid "no longer required"
msgstr "no longer required"
+msgid "Plugin information"
+msgstr "Plug-in information"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -14827,9 +14878,6 @@ msgstr ""
"The plug-in has been removed from the configuration. Please restart JOSM to "
"unload the plug-in."
-msgid "Plugin information"
-msgstr "Plug-in information"
-
msgid "no description available"
msgstr "no description available"
@@ -15713,6 +15761,14 @@ msgid "farmland"
msgstr "farmland"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "residential"
@@ -15724,6 +15780,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr "scrub"
@@ -15736,6 +15804,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "industrial"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "associatedStreet"
@@ -16091,6 +16183,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -16193,6 +16293,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -16244,10 +16347,10 @@ msgstr "SPW(allonie) 2012-2013 aerial imagery"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 aerial imagery"
-msgid "TEC bus lines (2014)"
-msgstr "TEC bus lines (2014)"
+msgid "TEC bus lines"
+msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -16280,6 +16383,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Geobase Hydrography"
@@ -16332,6 +16510,12 @@ msgstr "Czech RUIAN parcely"
msgid "Czech pLPIS"
msgstr "Czech pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Denmark)"
@@ -16480,6 +16664,12 @@ msgstr "Berlin aerial photograph 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Berlin aerial photograph 2016"
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16519,6 +16709,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -16543,6 +16741,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -16587,34 +16788,43 @@ msgstr "Drone Imagery Canaan(Haiti) November 2015"
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
-msgstr "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
+msgstr ""
-msgid "FÖMI ortophoto 2005"
-msgstr "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
+msgstr ""
-msgid "Szeged ortophoto 2011"
-msgstr "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
+msgstr ""
msgid "Inner part of Szeged"
msgstr "Inner part of Szeged"
-msgid "Törökbálint ortophoto 2013"
-msgstr "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
+msgstr ""
msgid "5 cm resolution bald image"
msgstr "5 cm resolution bald image"
-msgid "Törökbálint ortophoto 2015"
-msgstr "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
+msgstr ""
-msgid "Danube flood ortophoto 2013"
-msgstr "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
+msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -16755,6 +16965,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard -Orthophoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -16783,8 +17001,8 @@ 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)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: Ortofotomapa (aerial image)"
@@ -16932,6 +17150,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Car"
@@ -17007,6 +17233,9 @@ msgstr "Kanton Aargau 25cm (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Kanton Aargau 25cm (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr "Kanton Zürich Orthophotos 2014/2015 10cm"
@@ -17112,33 +17341,76 @@ msgstr "TIGER 2012 Roads Overlay"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr "New & Misaligned TIGER Roads (2015)"
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
msgid "NC Latest Orthoimagery"
msgstr "NC Latest Orthoimagery"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr "U.S. Forest Service roads"
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -17148,12 +17420,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -17483,8 +17768,8 @@ msgstr ""
"for basemap.at."
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -17654,9 +17939,6 @@ msgstr ""
"Database of imagery offsets: share and aquire imagery offsets with one "
"button."
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "WMSPlugin-style imagery adjustment mapmode"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -19658,26 +19940,33 @@ msgstr "Cycle lane/track"
msgid "Cycleway"
msgstr "Cycleway"
+msgctxt "cycleway"
msgid "lane"
-msgstr "lane"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "track"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "opposite_lane"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "opposite_track"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
-msgstr "opposite"
+msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "share_busway"
+msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "shared_lane"
+msgstr ""
msgid "Cycleway left"
msgstr "Cycleway left"
@@ -20856,6 +21145,9 @@ msgstr "Membership card"
msgid "Wash"
msgstr "Wash"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Car Dealer"
@@ -22672,10 +22964,6 @@ msgid "garages"
msgstr "garages"
msgctxt "building"
-msgid "industrial"
-msgstr "industrial"
-
-msgctxt "building"
msgid "school"
msgstr "school"
@@ -24078,6 +24366,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Archaeological Site"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Battlefield"
@@ -25641,6 +25944,21 @@ msgstr "Administration centre"
msgid "Label point"
msgstr "Label point"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "Site"
@@ -27191,15 +27509,6 @@ msgstr "Import local pictures"
msgid "Import pictures into Mapillary layer"
msgstr "Import pictures into Mapillary layer"
-msgid "Select pictures"
-msgstr "Select pictures"
-
-msgid "Import pictures into sequence"
-msgstr "Import pictures into sequence"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Import pictures into Mapillary layer in a sequence"
-
msgid "Join mode"
msgstr "Join mode"
@@ -27441,6 +27750,43 @@ msgstr "Follow selected image"
msgid "Go forward"
msgstr "Go forward"
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Import"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -27476,6 +27822,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -27485,6 +27834,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -27494,15 +27846,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -27535,7 +27905,13 @@ msgstr[1] "Turned {0} images"
msgid "2 images unjoined"
msgstr "2 images unjoined"
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -27552,9 +27928,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr "Downloading"
@@ -28358,6 +28731,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -29250,6 +29626,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -29270,46 +29652,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
-msgstr ""
+msgid "Replace Geometry"
+msgstr "Replace Geometry"
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
-msgstr "Configure conflation settings"
+msgid "List of tags to merge"
+msgstr ""
-msgid "Generate matches"
-msgstr "Generate matches"
+msgid "except"
+msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Replace Geometry"
+msgid "Advanced Example"
+msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
+msgstr "Configure conflation settings"
+
+msgid "Generate matches"
+msgstr "Generate matches"
+
+msgid "Merging"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -29342,6 +29732,12 @@ msgstr "Empty selection"
msgid "Freeze reference selection"
msgstr "Freeze reference selection"
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -29739,9 +30135,6 @@ msgstr "Globalsat Import"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Import Data from Globalsat Datalogger DG100 into GPX layer."
-msgid "Import"
-msgstr "Import"
-
msgid "GPS Blams"
msgstr "GPS Blams"
@@ -30253,9 +30646,6 @@ msgstr "Loading imagery offsets..."
msgid "Error processing XML response: {0}"
msgstr "Error processing XML response: {0}"
-msgid "Offset"
-msgstr "Offset"
-
msgid "Imagery Offset Database"
msgstr "Imagery Offset Database"
@@ -30393,24 +30783,6 @@ msgstr "Uploading a new offset..."
msgid "This string should be 3 to 200 letters long."
msgstr "This string should be 3 to 200 letters long."
-msgid "Adjust imagery"
-msgstr "Adjust imagery"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Adjust the position of the selected imagery layer"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Please select the imagery layer to adjust."
-
-msgid "Start adjusting"
-msgstr "Start adjusting"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "There are currently no imagery layer to adjust."
-
-msgid "No layers to adjust"
-msgstr "No layers to adjust"
-
msgid "Normal"
msgstr "Normal"
@@ -30423,12 +30795,21 @@ msgstr "Rotate 180"
msgid "Rotate 270"
msgstr "Rotate 270"
-msgid "Previous image"
-msgstr "Previous image"
+msgid "WayPoint Image"
+msgstr "WayPoint Image"
+
+msgid "Display non-geotagged photos"
+msgstr "Display non-geotagged photos"
+
+msgid "Imported Images"
+msgstr "Imported Images"
msgid "Next image"
msgstr "Next image"
+msgid "Previous image"
+msgstr "Previous image"
+
msgid "Rotate left"
msgstr "Rotate left"
@@ -30441,15 +30822,6 @@ msgstr "Rotate right"
msgid "Rotate image right"
msgstr "Rotate image right"
-msgid "WayPoint Image"
-msgstr "WayPoint Image"
-
-msgid "Display non-geotagged photos"
-msgstr "Display non-geotagged photos"
-
-msgid "Imported Images"
-msgstr "Imported Images"
-
msgid "Import vector graphics"
msgstr "Import vector graphics"
@@ -32633,9 +33005,6 @@ msgstr "Join"
msgid "Public Transport: Join GTFS stops"
msgstr "Public Transport: Join GTFS stops"
-msgid "Id"
-msgstr "Id"
-
msgid "State"
msgstr "State"
diff --git a/i18n/po/eo.po b/i18n/po/eo.po
index b79ff99..ac1cc2a 100644
--- a/i18n/po/eo.po
+++ b/i18n/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2016-09-21 04:23+0000\n"
"Last-Translator: Yuri Tretyakov <Unknown>\n"
"Language-Team: Esperanto <eo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:44+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:43+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: eo\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3312,6 +3312,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3320,6 +3323,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3984,6 +3992,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4040,6 +4051,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9018,46 +9032,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9172,7 +9189,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9286,9 +9309,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9299,8 +9319,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9462,16 +9485,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9601,12 +9614,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9766,6 +9789,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11182,15 +11235,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11239,6 +11283,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12414,6 +12461,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13560,6 +13610,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13758,9 +13811,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14464,6 +14514,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14475,6 +14533,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14487,6 +14557,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14842,6 +14936,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14944,6 +15046,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14995,10 +15100,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15031,6 +15136,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15083,6 +15263,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15229,6 +15415,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15268,6 +15460,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15292,6 +15492,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15336,34 +15539,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15504,6 +15716,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15532,7 +15752,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15681,6 +15901,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15756,6 +15984,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15861,33 +16092,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15897,12 +16171,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16221,8 +16508,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16363,9 +16650,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18270,24 +18554,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19460,6 +19751,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21275,10 +21569,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22679,6 +22969,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24220,6 +24525,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25716,15 +26036,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25966,6 +26277,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26001,6 +26349,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26010,6 +26361,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26019,15 +26373,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26060,7 +26432,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26077,9 +26455,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26772,6 +27147,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27610,6 +27988,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27630,46 +28014,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27702,6 +28094,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28077,9 +28475,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28564,9 +28959,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28685,42 +29077,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28733,15 +29116,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30834,9 +31208,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/es.po b/i18n/po/es.po
index d75c8b6..e153f0d 100644
--- a/i18n/po/es.po
+++ b/i18n/po/es.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2017-03-06 00:25+0000\n"
"Last-Translator: mor <Unknown>\n"
"Language-Team: Spanish <es at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:11+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:08+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: es\n"
"X-Language: es_ES\n"
"X-Source-Language: C\n"
@@ -3638,6 +3638,9 @@ msgstr "Proyección"
msgid "Matrix set identifier"
msgstr "Identificador de conjunto matriz"
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Sin capas definidas en el documento getCapabilities: {0}"
@@ -3648,6 +3651,11 @@ msgstr ""
"diferente al del elemento final {2}"
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4375,6 +4383,9 @@ msgstr "Esta prueba verifica si los multipolígonos son válidos."
msgid "Area style way is not closed"
msgstr "La vía estilo área no ha sido cerrada"
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "Ninguna vía exterior para el multipolígono"
@@ -4439,6 +4450,9 @@ msgstr "Vía exterior del multipolígono comparte segmento(s) con otro anillo"
msgid "No useful role for multipolygon member"
msgstr "Miembro de multipolígono no tiene un rol útil"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "No-vía dentro de multipolígono"
@@ -10009,47 +10023,50 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} objeto para eliminar:"
msgstr[1] "{0} objetos para eliminar:"
-msgid "Show tile info"
-msgstr "Mostrar información del mosaico"
+msgid "Native projections"
+msgstr ""
-msgid "Tile Info"
-msgstr "Información sobre las teselas"
+msgid "Offset"
+msgstr "Desplazamiento"
-msgid "Metadata "
-msgstr "Metadatos "
+msgid "Tile download projection"
+msgstr ""
-msgid "Load tile"
-msgstr "Cargar mosaico"
+msgid "Tile display projection"
+msgstr ""
-msgid "Auto zoom"
-msgstr "Acercamiento automático"
+msgid "Current zoom"
+msgstr ""
-msgid "Auto load tiles"
-msgstr "Cargar teselas automáticamente"
+msgid "Show tile info"
+msgstr "Mostrar información del mosaico"
-msgid "Show errors"
-msgstr "Mostrar errores"
+msgid "Tile Info"
+msgstr "Información sobre las teselas"
-msgid "Load all tiles"
-msgstr "Cargar todos los mosaicos"
+msgid "Tile name"
+msgstr ""
-msgid "Load all error tiles"
-msgstr "Cargar todos los errores de mosaico"
+msgid "Tile URL"
+msgstr ""
-msgid "Zoom to native resolution"
-msgstr "Zoom a resolución nativa"
+msgid "Tile size"
+msgstr ""
-msgid "Change resolution"
-msgstr "Cambiar resolución"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Incrementar zoom"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Reducir zoom"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
-msgstr "Limpiar la caché de mosaico"
+msgid "Metadata "
+msgstr "Metadatos "
+
+msgid "Load tile"
+msgstr "Cargar mosaico"
msgid "Failed to create tile source"
msgstr "Error al crear la fuente de teselas"
@@ -10167,8 +10184,14 @@ msgstr[1] "{0} trazas, "
msgid "Save GPX file"
msgstr "Guardar el archivo GPX"
-msgid "Imagery fade"
-msgstr "Transparencia de imágenes"
+msgid "Id"
+msgstr "Id"
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
+msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr "Tipo de imagen no soportado: {0}"
@@ -10283,9 +10306,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Guardar el archivo OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "Compatble con EPSG:4326 y la proyección de Mercator"
-
msgid "Validation errors"
msgstr "Errores de validación"
@@ -10296,11 +10316,12 @@ msgid "Set WMS Bookmark"
msgstr "Fijar marcador WMS"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
-"JOSM usará EPSG:4326 para consultar el servidor, pero los resultados pueden "
-"variar dependiendo el servidor WMS."
msgid "Correlate to GPX"
msgstr "Correlacionar con GPX"
@@ -10477,20 +10498,6 @@ msgstr "Debe seleccionar una traza GPX"
msgid "No selected GPX track"
msgstr "No se ha seleccionado una traza GPX"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Error al analizar la zona horaria.\n"
-"Formato esperado: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Error mientras se realizaba el análisis sintáctico.\n"
-"Formato esperado: {0}"
-
msgid "Geotagged Images"
msgstr "Imagenes Geoetiquetadas"
@@ -10632,12 +10639,26 @@ msgstr ""
"\n"
"Tiempo de GPS : {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Error mientras se realizaba el análisis sintáctico.\n"
+"Formato esperado: {0}"
+
msgid "Show thumbnails"
msgstr "Mostrar miniaturas"
msgid "Show image thumbnails instead of icons."
msgstr "Show miniaturas de imágenes en lugar de íconos."
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Error al analizar la zona horaria.\n"
+"Formato esperado: {0}"
+
msgid "Choose visible tracks"
msgstr "Elegir trazas visibles"
@@ -10814,6 +10835,36 @@ msgstr "Marcadores desde puntos nombrados"
msgid "Named Trackpoints from {0}"
msgstr "Puntos de traza nombrados desde {0}"
+msgid "Auto load tiles"
+msgstr "Cargar teselas automáticamente"
+
+msgid "Auto zoom"
+msgstr "Acercamiento automático"
+
+msgid "Decrease zoom"
+msgstr "Reducir zoom"
+
+msgid "Flush tile cache"
+msgstr "Limpiar la caché de mosaico"
+
+msgid "Increase zoom"
+msgstr "Incrementar zoom"
+
+msgid "Load all tiles"
+msgstr "Cargar todos los mosaicos"
+
+msgid "Load all error tiles"
+msgstr "Cargar todos los errores de mosaico"
+
+msgid "Show errors"
+msgstr "Mostrar errores"
+
+msgid "Change resolution"
+msgstr "Cambiar resolución"
+
+msgid "Zoom to native resolution"
+msgstr "Zoom a resolución nativa"
+
msgid "gps marker"
msgstr "Marcador gps"
@@ -12455,15 +12506,6 @@ msgstr "Nombre de la caché"
msgid "Object Count"
msgstr "Cuenta de objetos"
-msgid "imagery fade"
-msgstr "opacidad de imágenes"
-
-msgid "Fade Color: "
-msgstr "Color de transparencia: "
-
-msgid "Fade amount: "
-msgstr "Nivel de trasparencia: "
-
msgid "Soft"
msgstr "Suave"
@@ -12513,6 +12555,9 @@ msgstr "Fondo de las capas de imágenes: por omisión"
msgid "Available default entries:"
msgstr "Entradas disponibles por omisión:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "Fuentes seleccionadas:"
@@ -13816,6 +13861,9 @@ msgstr "Atributos opcionales:"
msgid "Unknown requisite: {0}"
msgstr "Requisito desconocido: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "Expresión de miembro ielgal: {0}"
@@ -15120,6 +15168,9 @@ msgstr "reemplazado por el nuevo complemento {0}"
msgid "no longer required"
msgstr "ya no se requiere"
+msgid "Plugin information"
+msgstr "Información del complemento"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -15365,9 +15416,6 @@ msgstr ""
"El complemento ha sido eliminado de la configuración. Por favor, reinicie "
"JOSM para descargarlo."
-msgid "Plugin information"
-msgstr "Información del complemento"
-
msgid "no description available"
msgstr "no hay descripción disponible"
@@ -16277,6 +16325,14 @@ msgid "farmland"
msgstr "tierras de cultivo"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "residencial"
@@ -16288,6 +16344,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr "monte bajo (arbustos, matorral o maleza)"
@@ -16300,6 +16368,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "industrial"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "Calle Asociada"
@@ -16655,6 +16747,14 @@ msgstr "Imágenes de imagico.de: Montañas Pensacola"
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr "Imágenes de imagico.de: Isla Elefante/Isla Clarence"
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr "IGN Argentina (TMS)"
@@ -16757,6 +16857,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -16808,11 +16911,11 @@ msgstr "SPW(solitario) 2012-2013 imágenes aéreas"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(solitario) 2009-2010 imágenes aéreas"
-msgid "TEC bus lines (2014)"
-msgstr "Líneas de transporte urbano TEC (2014)"
+msgid "TEC bus lines"
+msgstr ""
-msgid "TEC bus stops (2014)"
-msgstr "TEC paradas de bus (2014)"
+msgid "TEC bus stops"
+msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
msgstr ""
@@ -16844,6 +16947,81 @@ msgstr "Londrina Ortofoto 2011"
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr "SIG Santa Catarina OrtoRGB 2012"
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Hidrografía Geobase"
@@ -16897,6 +17075,12 @@ msgstr "Chequia RUIAN parcely"
msgid "Czech pLPIS"
msgstr "Chequia pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Dinamarca)"
@@ -17044,6 +17228,12 @@ msgstr "Berlin fotografía aérea 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Berlín - Fotografías aéreas de 2016"
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Erlangen - Imágenes aéreas (2016 5.0 cm)"
@@ -17085,6 +17275,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr "Sajonia últimas imágenes aéreas"
@@ -17109,6 +17307,9 @@ msgstr "Mainz todas las imágenes aéreas"
msgid "Mainz latest aerial imagery"
msgstr "Mainz últimas imágenes aéreas"
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr "Imágenes de imagico.de: Qasigiannguit"
@@ -17153,35 +17354,44 @@ msgstr "Imágenes de drones de Canaán (Haití) de noviembre de 2015"
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr "Imágenes de Drones Matthew(Haiti) Octubre 2016"
-msgid "FÖMI ortophoto 2000"
-msgstr "FÖMI ortofoto 2000"
+msgid "FÖMI orthophoto 2000"
+msgstr ""
-msgid "FÖMI ortophoto 2005"
-msgstr "FÖMI ortofoto 2005"
+msgid "FÖMI orthophoto 2005"
+msgstr ""
-msgid "Szeged ortophoto 2011"
-msgstr "Szeged ortofoto 2011"
+msgid "Szeged orthophoto 2011"
+msgstr ""
msgid "Inner part of Szeged"
msgstr "La parte interior de Szeged"
-msgid "Törökbálint ortophoto 2013"
-msgstr "Törökbálint ortofoto 2013"
+msgid "Törökbálint orthophoto 2013"
+msgstr ""
msgid "5 cm resolution bald image"
msgstr "imagen cruda resolución de 5 cm"
-msgid "Törökbálint ortophoto 2015"
-msgstr "Törökbálint ortofotografía 2015"
+msgid "Törökbálint orthophoto 2015"
+msgstr ""
-msgid "Danube flood ortophoto 2013"
-msgstr "Inundación del Danubio ortofoto de 2013"
+msgid "Danube flood orthophoto 2013"
+msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Línea costera del Danubio en Budapestt, Szentendre y Szigetmonostor"
-msgid "Budapest district XI ortophoto 2015"
-msgstr "Budapest districto XI ortofotos 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
+msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Hungría (rutas de senderismo)"
@@ -17321,6 +17531,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard - Ortofoto de 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr "Imágenes de imagico.de: Karakoram occidental"
@@ -17349,8 +17567,8 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr "Imágenes de imagico.de: Cordillera de Vilcanota y glaciar Quelccaya"
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr "Pangasinán/Bulacan (Alta resolución Filipinas)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: Ortofotomapa (imagen aérea)"
@@ -17498,6 +17716,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr "Imágenes de imagico.de: Cosmódromo Vostochni"
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk vehículo"
@@ -17573,6 +17799,9 @@ msgstr "Cantón Aargau 25cm (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Cantón de Aargau 25cm (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr "Ortofotos del Cantón de Zúrich 2014/2015 10cm"
@@ -17679,33 +17908,76 @@ msgstr "TIGER 2012 Superposición de caminos"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr "Carreteras Nuevas y No alineadas de TIGER (2015)"
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcelas"
msgid "NC Latest Orthoimagery"
msgstr "NC Últimas Ortoimágenes"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr "Callejero del servicio de Bosques de EEUU"
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr "Imágenes de imagico.de: Cordillera de Alaska"
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr "Texas Ortofoto"
@@ -17715,12 +17987,25 @@ msgstr "Philadelphia 2015 Imágenes"
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr "Ortofotografía de Delaware 2012"
@@ -18053,8 +18338,8 @@ msgstr ""
"de fondo. Optimizado para basemap.at."
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -18241,10 +18526,6 @@ msgstr ""
"Base de datos de imágenes rectificadas: comparte y obtén mediante un botón "
"imágenes aéreas desplazadas ya compensadas."
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-"Modo de mapa con ajuste de imágenes aéreas mediante el WMSPlugin-style"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -20292,26 +20573,33 @@ msgstr "Pista o carril para bicicletas"
msgid "Cycleway"
msgstr "Carril bici"
+msgctxt "cycleway"
msgid "lane"
-msgstr "carril"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "pista"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "carril en sentido opuesto"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "ciclovía en sentido opuesto"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
-msgstr "en sentido opuesto (tramos pequeños de calles sin ciclocarril)"
+msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "carril bus compartido"
+msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "carril_compartido"
+msgstr ""
msgid "Cycleway left"
msgstr "Ciclovía a la izquierda"
@@ -21493,6 +21781,9 @@ msgstr "Tarjeta de membresía"
msgid "Wash"
msgstr "Limpieza"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Concesionario de automóviles"
@@ -23315,10 +23606,6 @@ msgid "garages"
msgstr "garajes (edificio con plazas de diferentes propietarios)"
msgctxt "building"
-msgid "industrial"
-msgstr "industrial"
-
-msgctxt "building"
msgid "school"
msgstr "escuela, colegio o instituto de educación secundaria"
@@ -24721,6 +25008,21 @@ msgstr "palacio"
msgid "Archaeological Site"
msgstr "Yacimiento arqueológico"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Campo de batalla"
@@ -26296,6 +26598,21 @@ msgstr "Centro administrativo"
msgid "Label point"
msgstr "Etiqueta del punto"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "Lugar"
@@ -27874,15 +28191,6 @@ msgstr "Importar imágenes locales"
msgid "Import pictures into Mapillary layer"
msgstr "Importar imágenes a la capa de Mapillary"
-msgid "Select pictures"
-msgstr "Seleccionar imágenes"
-
-msgid "Import pictures into sequence"
-msgstr "Importar imágenes dentro de una secuencia"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importar imágenes dentro de la capa de Mapillary en una secuencia"
-
msgid "Join mode"
msgstr "Modo unión"
@@ -28131,6 +28439,43 @@ msgstr "Seguir la imágen seleccionada"
msgid "Go forward"
msgstr "Avanzar"
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Importar"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -28177,6 +28522,9 @@ msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
"Muestra la información detallada sobre la imagen de Mapillary seleccionada"
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr "Ver en el navegador"
@@ -28186,6 +28534,9 @@ msgstr "Copiar clave"
msgid "Add Mapillary tag"
msgstr "Añadir etiqueta mapillary"
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr "acciones de imagen"
@@ -28195,15 +28546,33 @@ msgstr "clave de imagen"
msgid "Sequence key"
msgstr "clave de secuencia"
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr "la imagen no tiene clave"
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr "la secuencia no tiene clave"
msgid "Could not open the URL {0} in a browser"
msgstr "No se pudo abrir la URL {0} en un navegador"
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -28236,7 +28605,13 @@ msgstr[1] "{0} imágenes giradas"
msgid "2 images unjoined"
msgstr "2 imágenes separadas"
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -28255,9 +28630,6 @@ msgstr ""
"El área de OSM descargado es demasiado grande. El modo de descarga se ha "
"cambiado a la zona de OSM hasta que se reinicie la capa."
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr "Descargando"
@@ -29087,6 +29459,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -30003,6 +30378,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -30023,46 +30404,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
-msgstr ""
+msgid "Replace Geometry"
+msgstr "Reemplazar geometría"
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
-msgstr "Configurar los parámetros de combinación"
+msgid "List of tags to merge"
+msgstr ""
-msgid "Generate matches"
-msgstr "Generar emparejamientos"
+msgid "except"
+msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Reemplazar geometría"
+msgid "Advanced Example"
+msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
+msgstr "Configurar los parámetros de combinación"
+
+msgid "Generate matches"
+msgstr "Generar emparejamientos"
+
+msgid "Merging"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -30096,6 +30485,12 @@ msgstr "Selección vacía"
msgid "Freeze reference selection"
msgstr "Congelar la selección de referencia"
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -30497,9 +30892,6 @@ msgstr "Importar Globalsat"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Importar datos del Globalsat Datalogger DG100 en la capa gpx"
-msgid "Import"
-msgstr "Importar"
-
msgid "GPS Blams"
msgstr "GPS Blams"
@@ -31029,9 +31421,6 @@ msgstr "Cargando imágenes rectificadas..."
msgid "Error processing XML response: {0}"
msgstr "Error al procesar la respuesta XML: {0}"
-msgid "Offset"
-msgstr "Desplazamiento"
-
msgid "Imagery Offset Database"
msgstr "Bases de datos de imágenes rectificadas"
@@ -31175,24 +31564,6 @@ msgid "This string should be 3 to 200 letters long."
msgstr ""
"Esta cadena de caracteres debería tener entre 3 y 200 letras de longitud."
-msgid "Adjust imagery"
-msgstr "Ajustar imagen aérea"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Ajustar la posición de la capa de imagen aérea seleccionada"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Por favor seleccione la capa de imagen aérea a ajustar."
-
-msgid "Start adjusting"
-msgstr "Iniciar el ajuste."
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "Actualmente no hay ninguna capa de imagen aérea para ajustar."
-
-msgid "No layers to adjust"
-msgstr "No hay capas para ajustar"
-
msgid "Normal"
msgstr "Normal"
@@ -31205,12 +31576,21 @@ msgstr "Rotar 180"
msgid "Rotate 270"
msgstr "Rotar 270"
-msgid "Previous image"
-msgstr "Imagen anterior"
+msgid "WayPoint Image"
+msgstr "imagen del waypoint"
+
+msgid "Display non-geotagged photos"
+msgstr "Mostrar fotos sin geoetiquetar"
+
+msgid "Imported Images"
+msgstr "Imágenes importadas"
msgid "Next image"
msgstr "Imagen siguiente"
+msgid "Previous image"
+msgstr "Imagen anterior"
+
msgid "Rotate left"
msgstr "Rotar hacia la izquierda"
@@ -31223,15 +31603,6 @@ msgstr "Rotar hacia la derecha"
msgid "Rotate image right"
msgstr "Rotar imagen hacia la derecha"
-msgid "WayPoint Image"
-msgstr "imagen del waypoint"
-
-msgid "Display non-geotagged photos"
-msgstr "Mostrar fotos sin geoetiquetar"
-
-msgid "Imported Images"
-msgstr "Imágenes importadas"
-
msgid "Import vector graphics"
msgstr "Importar gráficos vectoriales"
@@ -33488,9 +33859,6 @@ msgstr "Unir"
msgid "Public Transport: Join GTFS stops"
msgstr "Transporte público: unir paradas GTFS"
-msgid "Id"
-msgstr "Id"
-
msgid "State"
msgstr "Estado/Provincia"
diff --git a/i18n/po/et.po b/i18n/po/et.po
index 9bc5020..ce7fc8a 100644
--- a/i18n/po/et.po
+++ b/i18n/po/et.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2017-02-23 08:40+0000\n"
"Last-Translator: Margus Värton <margus at dakar.ee>\n"
"Language-Team: Estonian <et at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:45+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:43+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: et\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3394,6 +3394,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3402,6 +3405,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4066,6 +4074,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "Liitalal pole välist teed"
@@ -4122,6 +4133,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9164,46 +9178,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} objekt kustutada:"
msgstr[1] "{0} objekti kustutada:"
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
-msgstr "Muuda resolutsiooni"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9318,7 +9335,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr "Salvesta GPX fail"
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9434,9 +9457,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Salvesta OSM fail."
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr "Järelkontrolli vead"
@@ -9447,8 +9467,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9614,20 +9637,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Viga ajavööndi parsimisel.\n"
-"Oodatud vorming: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Viga nihke parsimisel.\n"
-"Oodatud vorming: {0}"
-
msgid "Geotagged Images"
msgstr "Geosildistatud fotod"
@@ -9759,12 +9768,26 @@ msgstr ""
"\n"
"GPS aeg: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Viga nihke parsimisel.\n"
+"Oodatud vorming: {0}"
+
msgid "Show thumbnails"
msgstr "Pisipiltide näitamine"
msgid "Show image thumbnails instead of icons."
msgstr "Pildiikoonide asemel näidatakse pisipilte"
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Viga ajavööndi parsimisel.\n"
+"Oodatud vorming: {0}"
+
msgid "Choose visible tracks"
msgstr ""
@@ -9924,6 +9947,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr "Muuda resolutsiooni"
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr "gps marker"
@@ -11349,15 +11402,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11406,6 +11450,9 @@ msgstr "Taustakaart: Vaikimisi"
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12603,6 +12650,9 @@ msgstr "Valikulised tunnused:"
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13759,6 +13809,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr "Plugina info"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13965,9 +14018,6 @@ msgstr ""
"See plugin on konfiguratsioonist eemaldatud. Palun taaskäivita JOSM, et "
"eemaldada plugin."
-msgid "Plugin information"
-msgstr "Plugina info"
-
msgid "no description available"
msgstr "kirjeldust pole saadaval"
@@ -14696,6 +14746,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14707,6 +14765,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14719,6 +14789,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -15074,6 +15168,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -15176,6 +15278,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15227,10 +15332,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15263,6 +15368,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15315,6 +15495,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15461,6 +15647,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15500,6 +15692,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15524,6 +15724,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15568,34 +15771,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15736,6 +15948,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15764,7 +15984,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15913,6 +16133,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15988,6 +16216,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -16093,33 +16324,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -16129,12 +16403,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16453,8 +16740,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16597,9 +16884,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18511,24 +18795,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "rada"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19701,6 +19992,9 @@ msgstr ""
msgid "Wash"
msgstr "Autopesula"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Automüüja"
@@ -21516,10 +21810,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22920,6 +23210,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Arheoloogiamälestis"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Lahingupaik"
@@ -24461,6 +24766,21 @@ msgstr "Haldusüksuse keskus"
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25957,15 +26277,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -26207,6 +26518,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26242,6 +26590,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26251,6 +26602,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26260,15 +26614,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26301,7 +26673,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26318,9 +26696,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -27023,6 +27398,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27862,6 +28240,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27882,46 +28266,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
+msgstr ""
+
+msgid "Merging"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27954,6 +28346,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28329,9 +28727,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28818,9 +29213,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28939,42 +29331,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
-msgstr ""
+msgid "Display non-geotagged photos"
+msgstr "Kuva mitte-geosildistatud fotosid"
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28987,15 +29370,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr "Kuva mitte-geosildistatud fotosid"
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -31099,9 +31473,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr "Riik"
diff --git a/i18n/po/eu.po b/i18n/po/eu.po
index 764d0a1..b3f5c07 100644
--- a/i18n/po/eu.po
+++ b/i18n/po/eu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2015-03-09 16:55+0000\n"
"Last-Translator: Asier Sarasua Garmendia <Unknown>\n"
"Language-Team: Basque <eu at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:38+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:37+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: eu\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3429,6 +3429,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3437,6 +3440,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4115,6 +4123,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4171,6 +4182,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9201,46 +9215,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
-msgstr "Bereizmena aldatu"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9355,7 +9372,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr "GPX fitxategia gorde"
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9471,9 +9494,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "OSM fitxategia gorde"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9484,8 +9504,11 @@ msgid "Set WMS Bookmark"
msgstr "WMS laster-marka ezarri"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9647,16 +9670,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9786,12 +9799,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9951,6 +9974,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr "Bereizmena aldatu"
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11367,15 +11420,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11424,6 +11468,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12599,6 +12646,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13742,6 +13792,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13940,9 +13993,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14651,6 +14701,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14662,6 +14720,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14674,6 +14744,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -15029,6 +15123,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -15131,6 +15233,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15182,10 +15287,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15218,6 +15323,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15270,6 +15450,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15416,6 +15602,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15455,6 +15647,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15479,6 +15679,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15523,34 +15726,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15691,6 +15903,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15719,7 +15939,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15868,6 +16088,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15943,6 +16171,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -16048,33 +16279,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -16084,12 +16358,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16408,8 +16695,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16556,9 +16843,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18497,24 +18781,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "pista"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19687,6 +19978,9 @@ msgstr ""
msgid "Wash"
msgstr "Garbiketa"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Auto kontzesionarioa"
@@ -21502,10 +21796,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22906,6 +23196,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Gune-arkeologikoa"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Gudu-zelaia"
@@ -24447,6 +24752,21 @@ msgstr "Administrazio gunea"
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25943,15 +26263,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -26193,6 +26504,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26228,6 +26576,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26237,6 +26588,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26246,15 +26600,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26287,7 +26659,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26304,9 +26682,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26999,6 +27374,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27837,6 +28215,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27857,46 +28241,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27929,6 +28321,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28304,9 +28702,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28791,9 +29186,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28912,42 +29304,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28960,15 +29343,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -31066,9 +31440,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr "Estatua"
diff --git a/i18n/po/fa.po b/i18n/po/fa.po
index 060b777..0071455 100644
--- a/i18n/po/fa.po
+++ b/i18n/po/fa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2014-03-18 07:32+0000\n"
"Last-Translator: Saeed Ghazi Joolaee <Unknown>\n"
"Language-Team: Persian <fa at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:05+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:02+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: fa\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3370,6 +3370,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3378,6 +3381,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4040,6 +4048,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4096,6 +4107,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9084,46 +9098,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9238,7 +9255,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9352,9 +9375,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9365,8 +9385,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9528,16 +9551,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9667,12 +9680,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9832,6 +9855,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11248,15 +11301,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11305,6 +11349,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12480,6 +12527,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13622,6 +13672,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13820,9 +13873,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14526,6 +14576,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14537,6 +14595,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14549,6 +14619,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14904,6 +14998,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -15006,6 +15108,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15057,10 +15162,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15093,6 +15198,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15145,6 +15325,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15291,6 +15477,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15330,6 +15522,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15354,6 +15554,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15398,34 +15601,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15566,6 +15778,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15594,7 +15814,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15743,6 +15963,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15818,6 +16046,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15923,33 +16154,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15959,12 +16233,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16283,8 +16570,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16425,9 +16712,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18332,24 +18616,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19522,6 +19813,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21337,10 +21631,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22741,6 +23031,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24282,6 +24587,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25778,15 +26098,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -26028,6 +26339,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26063,6 +26411,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26072,6 +26423,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26081,15 +26435,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26122,7 +26494,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26139,9 +26517,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26834,6 +27209,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27672,6 +28050,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27692,46 +28076,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27764,6 +28156,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28139,9 +28537,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28626,9 +29021,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28747,42 +29139,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28795,15 +29178,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30896,9 +31270,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/fi.po b/i18n/po/fi.po
index 895b765..ba22ce7 100644
--- a/i18n/po/fi.po
+++ b/i18n/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2016-01-19 17:11+0000\n"
"Last-Translator: Lauri Kytömaa <Unknown>\n"
"Language-Team: Finnish <fi at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:46+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:44+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: fi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3544,6 +3544,9 @@ msgstr "Projektio"
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Saatu getCapabilities-tiedosto ei määrittele tasoja: {0}"
@@ -3552,6 +3555,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4248,6 +4256,9 @@ msgid "Area style way is not closed"
msgstr ""
"Polku ei ole suljettu, vaikka sen taginsa perusteella luulisi olevan."
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "Monimonikulmion ulompi polku puuttuu"
@@ -4308,6 +4319,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr "Monimonikulmion jäsenellä ei ole käyttökelpoista roolia"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "Muu kuin polku monimonikulmiossa"
@@ -9634,46 +9648,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} kohde poistetaan:"
msgstr[1] "{0} kohdetta poistetaan:"
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
+msgstr "Siirros"
+
+msgid "Tile download projection"
msgstr ""
-msgid "Metadata "
+msgid "Tile display projection"
msgstr ""
-msgid "Load tile"
+msgid "Current zoom"
msgstr ""
-msgid "Auto zoom"
+msgid "Show tile info"
msgstr ""
-msgid "Auto load tiles"
-msgstr "Lataa kuvapalat automaattisesti"
+msgid "Tile Info"
+msgstr ""
-msgid "Show errors"
+msgid "Tile name"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile size"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Change resolution"
-msgstr "Vaihda resoluutiota"
+msgid "Reprojection"
+msgstr ""
-msgid "Increase zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Decrease zoom"
+msgid "Metadata "
msgstr ""
-msgid "Flush tile cache"
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9788,8 +9805,14 @@ msgstr[1] "{0} jälkeä, "
msgid "Save GPX file"
msgstr "Tallenna GPX-tiedosto"
-msgid "Imagery fade"
-msgstr "Kuvatason häivytys"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
+msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
@@ -9904,9 +9927,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Tallenna OSM-tiedosto"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "Tuetut projektiot ovat EPSG:4326 ja Mercator."
-
msgid "Validation errors"
msgstr "Tarkistusvirheet"
@@ -9917,8 +9937,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -10087,16 +10110,6 @@ msgstr "Valitse GPX-jälki"
msgid "No selected GPX track"
msgstr "GPX-jälkeä ei valittuna"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr "Geo-merkityt kuvat"
@@ -10230,12 +10243,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr "Valitse näytettävät jäljet"
@@ -10397,6 +10420,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr "Lataa kuvapalat automaattisesti"
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr "Vaihda resoluutiota"
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11871,15 +11924,6 @@ msgstr "Nimi välimuistissa"
msgid "Object Count"
msgstr "Välimuistiin säilöttyjä kohteita"
-msgid "imagery fade"
-msgstr "kuvatason häivytys"
-
-msgid "Fade Color: "
-msgstr "Häivytyksen väri: "
-
-msgid "Fade amount: "
-msgstr "Häivytyksen voimakkuus: "
-
msgid "Soft"
msgstr "Lievä"
@@ -11928,6 +11972,9 @@ msgstr ""
msgid "Available default entries:"
msgstr "Oletuksena tunnetut kuvatasot:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "Valikkoon käytettäviksi valitut kuvatasot:"
@@ -13155,6 +13202,9 @@ msgstr "Lisäominaisuudet:"
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "Virheellinen jäseniin viittava hakulause: {0}"
@@ -14356,6 +14406,9 @@ msgstr ""
msgid "no longer required"
msgstr "ei enää tarpeellinen"
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -14574,9 +14627,6 @@ msgstr ""
"Liitännäinen on poistettu asetuksista. Se poistuu käytöstä, kun JOSM "
"käynnistään uudelleen."
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr "kuvausta ei ole saatavilla"
@@ -15318,6 +15368,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "asuinalue"
@@ -15329,6 +15387,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -15341,6 +15411,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -15696,6 +15790,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -15798,6 +15900,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15849,10 +15954,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15885,6 +15990,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15937,6 +16117,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -16083,6 +16269,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16122,6 +16314,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -16146,6 +16346,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -16190,34 +16393,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -16358,6 +16570,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -16386,7 +16606,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -16535,6 +16755,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -16610,6 +16838,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -16715,33 +16946,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -16751,12 +17025,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -17077,8 +17364,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -17228,9 +17515,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -19164,24 +19448,31 @@ msgstr "Pyöräkaista / pyörätie muun tien ominaisuutena"
msgid "Cycleway"
msgstr "Pyörätie"
+msgctxt "cycleway"
msgid "lane"
-msgstr "pyöräkaista"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "Pyöräkaista tien suuntaa vastaan"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "Pyörätie vain tien suuntaa vastaan"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
-msgstr "Pyöräily sallittu tiellä yksisuuntaisuutta vastaan."
+msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "Merkinnöin osoitettu bussikaistalle"
+msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -20354,6 +20645,9 @@ msgstr ""
msgid "Wash"
msgstr "Autopesula"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Autokauppa"
@@ -22169,10 +22463,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -23573,6 +23863,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Arkeologinen kaivaus"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Taistelukenttä"
@@ -25114,6 +25419,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -26635,15 +26955,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -26885,6 +27196,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26920,6 +27268,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26929,6 +27280,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26938,15 +27292,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26979,7 +27351,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26996,9 +27374,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -27697,6 +28072,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -28547,6 +28925,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -28567,46 +28951,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
+msgstr "Korvaa geometria"
+
+msgid "Merge Tags"
msgstr ""
-msgid "<Please select data>"
+msgid "List of tags to merge"
msgstr ""
-msgid "Configure conflation settings"
+msgid "except"
msgstr ""
-msgid "Generate matches"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Reference:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Subject:"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Programming"
+msgid "Simple Example"
msgstr ""
-msgid "Merging"
+msgid "Advanced Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Korvaa geometria"
+msgid "<Please select data>"
+msgstr ""
-msgid "Merge Tags"
+msgid "Configure conflation settings"
msgstr ""
-msgid "List of tags to merge"
+msgid "Generate matches"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Merging"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -28639,6 +29031,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -29014,9 +29412,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -29510,9 +29905,6 @@ msgstr "Kuvatason siirrostietoja haetaan..."
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr "Siirros"
-
msgid "Imagery Offset Database"
msgstr ""
@@ -29639,24 +30031,6 @@ msgstr "Lähetetään siirrosta palvelimelle..."
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
-msgstr ""
-
-msgid "Start adjusting"
-msgstr ""
-
-msgid "There are currently no imagery layer to adjust."
-msgstr ""
-
-msgid "No layers to adjust"
-msgstr ""
-
msgid "Normal"
msgstr "Normaali"
@@ -29669,12 +30043,21 @@ msgstr "Kierrä 180"
msgid "Rotate 270"
msgstr "Kierrä 270"
-msgid "Previous image"
-msgstr "Edellinen kuva"
+msgid "WayPoint Image"
+msgstr "WayPoint-kuva"
+
+msgid "Display non-geotagged photos"
+msgstr "Näytä kuvat, joita ei ole geo-merkitty"
+
+msgid "Imported Images"
+msgstr "Tuodut kuvat"
msgid "Next image"
msgstr "Seuraava kuva"
+msgid "Previous image"
+msgstr "Edellinen kuva"
+
msgid "Rotate left"
msgstr "Käännä vasemmalle"
@@ -29687,15 +30070,6 @@ msgstr "Käännä oikealle"
msgid "Rotate image right"
msgstr "Kääntää kuvaa oikealle"
-msgid "WayPoint Image"
-msgstr "WayPoint-kuva"
-
-msgid "Display non-geotagged photos"
-msgstr "Näytä kuvat, joita ei ole geo-merkitty"
-
-msgid "Imported Images"
-msgstr "Tuodut kuvat"
-
msgid "Import vector graphics"
msgstr ""
@@ -31818,9 +32192,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr "Osavaltio"
diff --git a/i18n/po/fil.po b/i18n/po/fil.po
index fa0767c..84ef925 100644
--- a/i18n/po/fil.po
+++ b/i18n/po/fil.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2011-06-19 14:15+0000\n"
"Last-Translator: Anthony Balico <Unknown>\n"
"Language-Team: Filipino <fil at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:21+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:18+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: fil\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3305,6 +3305,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3313,6 +3316,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3977,6 +3985,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4033,6 +4044,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9011,46 +9025,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9165,7 +9182,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9279,9 +9302,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9292,8 +9312,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9455,16 +9478,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9594,12 +9607,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9759,6 +9782,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11175,15 +11228,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11232,6 +11276,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12407,6 +12454,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13549,6 +13599,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13747,9 +13800,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14453,6 +14503,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14464,6 +14522,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14476,6 +14546,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14831,6 +14925,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14933,6 +15035,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14984,10 +15089,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15020,6 +15125,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15072,6 +15252,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15218,6 +15404,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15257,6 +15449,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15281,6 +15481,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15325,34 +15528,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15493,6 +15705,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15521,7 +15741,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15670,6 +15890,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15745,6 +15973,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15850,33 +16081,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15886,12 +16160,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16210,8 +16497,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16352,9 +16639,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18259,24 +18543,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19449,6 +19740,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21264,10 +21558,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22668,6 +22958,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24209,6 +24514,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25705,15 +26025,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25955,6 +26266,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25990,6 +26338,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25999,6 +26350,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26008,15 +26362,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26049,7 +26421,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26066,9 +26444,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26761,6 +27136,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27599,6 +27977,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27619,46 +28003,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27691,6 +28083,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28066,9 +28464,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28553,9 +28948,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28674,42 +29066,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28722,15 +29105,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30823,9 +31197,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/fo.po b/i18n/po/fo.po
index 07e4ca4..2824df4 100644
--- a/i18n/po/fo.po
+++ b/i18n/po/fo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2015-02-28 16:15+0000\n"
"Last-Translator: LiFo <Unknown>\n"
"Language-Team: Faroese <fo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:45+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:44+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}: valmøguleiki ''{1}'' er tvítýddur"
@@ -3304,6 +3304,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3312,6 +3315,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3976,6 +3984,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4032,6 +4043,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9010,46 +9024,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9164,7 +9181,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9278,9 +9301,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9291,8 +9311,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9454,16 +9477,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9593,12 +9606,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9758,6 +9781,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11174,15 +11227,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11231,6 +11275,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12406,6 +12453,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13548,6 +13598,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13746,9 +13799,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14452,6 +14502,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14463,6 +14521,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14475,6 +14545,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14830,6 +14924,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14932,6 +15034,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14983,10 +15088,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15019,6 +15124,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15071,6 +15251,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15217,6 +15403,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15256,6 +15448,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15280,6 +15480,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15324,34 +15527,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15492,6 +15704,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15520,7 +15740,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15669,6 +15889,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15744,6 +15972,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15849,33 +16080,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15885,12 +16159,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16209,8 +16496,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16351,9 +16638,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18258,24 +18542,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19448,6 +19739,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21263,10 +21557,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22667,6 +22957,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24208,6 +24513,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25704,15 +26024,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25954,6 +26265,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25989,6 +26337,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25998,6 +26349,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26007,15 +26361,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26048,7 +26420,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26065,9 +26443,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26760,6 +27135,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27598,6 +27976,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27618,46 +28002,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27690,6 +28082,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28065,9 +28463,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28552,9 +28947,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28673,42 +29065,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28721,15 +29104,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30822,9 +31196,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/fr.po b/i18n/po/fr.po
index 2e812ab..d6b289b 100644
--- a/i18n/po/fr.po
+++ b/i18n/po/fr.po
@@ -5,16 +5,16 @@ msgid ""
msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
-"PO-Revision-Date: 2017-02-25 16:25+0000\n"
-"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"PO-Revision-Date: 2017-04-28 19:54+0000\n"
+"Last-Translator: Carolopolitain <david_chmfr at yahoo.fr>\n"
"Language-Team: Fr <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:47+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:45+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: fr\n"
"X-Poedit-Bookmarks: 1767,-1,-1,2669,-1,-1,-1,-1,-1,-1\n"
@@ -1519,7 +1519,7 @@ msgid "Toggles the global setting ''{0}''."
msgstr "Bascule vers la configuration globale ''{0}''."
msgid "Discourage upload"
-msgstr ""
+msgstr "Dissuader l’envoi"
msgid "UnGlue Ways"
msgstr "Séparer les chemins"
@@ -3630,6 +3630,10 @@ msgstr "Projection"
msgid "Matrix set identifier"
msgstr "Identifiant de jeu de matrice"
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+"Pas de couche par défaut sélectionnée, donc sélection de la première."
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Aucun calque défini par le document getCapabilities : {0}"
@@ -3640,6 +3644,11 @@ msgstr ""
"l''élément de fin {2}"
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4360,6 +4369,9 @@ msgstr "Ce test vérifie la validité des multipolygones."
msgid "Area style way is not closed"
msgstr "Le chemin délimitant la surface n’est pas fermé"
+msgid "No outer way for boundary"
+msgstr "Frontière sans tracé extérieur"
+
msgid "No outer way for multipolygon"
msgstr "Aucun chemin intérieur pour le multipolygone"
@@ -4401,13 +4413,13 @@ msgid "Multipolygon is not closed"
msgstr "Le multipolygone n’est pas fermé"
msgid "Multipolygon rings share node(s)"
-msgstr "Cercles de multipolygone partageant des nœuds"
+msgstr "Des membres d’un multipolygone partagent des nœuds"
msgid "Intersection between multipolygon ways"
msgstr "Intersection entre les chemins du multipolygone"
msgid "Multipolygon rings are equal"
-msgstr "Cercles de multipolygone identiques"
+msgstr "Des membres d’un multipolygone sont identiques"
msgid "Role for ''{0}'' should be ''{1}''"
msgstr "Le rôle de \"{0}\" devrait être \"{1}\""
@@ -4416,16 +4428,19 @@ msgid "Multipolygon inner way is outside"
msgstr "Le chemin intérieur du multipolygone est à l’extérieur"
msgid "Multipolygon ring contains segments twice"
-msgstr "Cercle de multipolygone contenant des segments répétés"
+msgstr "Un membre de multipolygone contient deux fois le même segment"
msgid "Multipolygon outer way shares segment(s) with other ring"
msgstr ""
-"Cercle externe de multipolygone partageant un/des segment(s) avec autres "
-"cercles"
+"Un membre externe d’un multipolygone partage un ou des segment(s) avec un "
+"autre membre"
msgid "No useful role for multipolygon member"
msgstr "Membre du multipolygone sans rôle utile"
+msgid "Non-Way in boundary"
+msgstr "Élément de frontière qui n’est pas un chemin"
+
msgid "Non-Way in multipolygon"
msgstr "Non-chemin dans le multipolygone"
@@ -8635,10 +8650,12 @@ msgstr ""
"barre d’outils.</html>"
msgid "Zoom to downloaded data"
-msgstr ""
+msgstr "Zoomer sur les données téléchargées"
msgid "Select to zoom to entire newly downloaded data."
msgstr ""
+"Sélectionner pour zoomer sur l’ensemble des données nouvellement "
+"téléchargées."
msgid ""
"Use left click&drag to select area, arrows or right mouse button to scroll "
@@ -9939,47 +9956,50 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} objet supprimé :"
msgstr[1] "{0} objets supprimés :"
-msgid "Show tile info"
-msgstr "Afficher les informations de la tuile"
+msgid "Native projections"
+msgstr "Projections natives"
-msgid "Tile Info"
-msgstr "Info de la tuile"
+msgid "Offset"
+msgstr "Décalage"
-msgid "Metadata "
-msgstr "Métadonnées "
+msgid "Tile download projection"
+msgstr "Projection des tuiles téléchargées"
-msgid "Load tile"
-msgstr "Charger la tuile"
+msgid "Tile display projection"
+msgstr "Projection des tuiles affichées"
-msgid "Auto zoom"
-msgstr "Zoom auto"
+msgid "Current zoom"
+msgstr "Zoom actuel"
-msgid "Auto load tiles"
-msgstr "Charger automatiquement les tuiles"
+msgid "Show tile info"
+msgstr "Afficher les informations de la tuile"
-msgid "Show errors"
-msgstr "Afficher les erreurs"
+msgid "Tile Info"
+msgstr "Info de la tuile"
-msgid "Load all tiles"
-msgstr "Charger toutes les tuiles"
+msgid "Tile name"
+msgstr "Nom de la tuile"
-msgid "Load all error tiles"
-msgstr "Charger les tuiles avec des erreurs"
+msgid "Tile URL"
+msgstr "URL de la tuile"
-msgid "Zoom to native resolution"
-msgstr "Zoomer à la résolution native"
+msgid "Tile size"
+msgstr "Taille de la tuile"
-msgid "Change resolution"
-msgstr "Changer la résolution"
+msgid "Tile display size"
+msgstr "Taille affichée de la tuile"
-msgid "Increase zoom"
-msgstr "Zoomer en avant"
+msgid "Reprojection"
+msgstr "Reprojection"
-msgid "Decrease zoom"
-msgstr "Zoomer en arrière"
+msgid "Reprojected tile size"
+msgstr "Taille de la tuile reprojetée"
-msgid "Flush tile cache"
-msgstr "Vider le cache des tuiles"
+msgid "Metadata "
+msgstr "Métadonnées "
+
+msgid "Load tile"
+msgstr "Charger la tuile"
msgid "Failed to create tile source"
msgstr "Impossible de créer la source de la tuile"
@@ -10097,8 +10117,14 @@ msgstr[1] "{0} traces, "
msgid "Save GPX file"
msgstr "Enregistrer le fichier GPX"
-msgid "Imagery fade"
-msgstr "Effacement de l’imagerie"
+msgid "Id"
+msgstr "Identifiant"
+
+msgid "Min. zoom"
+msgstr "Zoom min."
+
+msgid "Max. zoom"
+msgstr "Zoom max."
msgid "Unsupported imagery type: {0}"
msgstr "Unsupported imagery type: {0}"
@@ -10171,7 +10197,7 @@ msgid "Upload is discouraged"
msgstr "L’’envoi est dissuadé"
msgid "Upload is blocked"
-msgstr ""
+msgstr "L’envoi est verrouillé."
msgid "Convert to GPX layer"
msgstr "Convertir en calque GPX"
@@ -10213,9 +10239,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Enregistrer le fichier OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "Les projections EPSG:4326 et Mercator sont supportées."
-
msgid "Validation errors"
msgstr "Erreurs de validation"
@@ -10226,11 +10249,12 @@ msgid "Set WMS Bookmark"
msgstr "Placer un signet WMS"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
-"JOSM utilisera EPSG:4326 pour interroger le serveur, mais les résultats "
-"pourront varier selon le serveur WMS"
msgid "Correlate to GPX"
msgstr "Corréler au format GPX"
@@ -10403,20 +10427,6 @@ msgstr "Vous devez sélectionner une trace GPX"
msgid "No selected GPX track"
msgstr "Aucune trace GPX sélectionnée"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Erreur d’analyse du fuseau horaire.\n"
-"Format attendu : {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Erreur d’analyse du décalage.\n"
-"Format attendu : {0}"
-
msgid "Geotagged Images"
msgstr "Images géolocalisées"
@@ -10559,12 +10569,26 @@ msgstr ""
"\n"
"heure GPS : {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Erreur d’analyse du décalage.\n"
+"Format attendu : {0}"
+
msgid "Show thumbnails"
msgstr "Afficher les vignettes"
msgid "Show image thumbnails instead of icons."
msgstr "Afficher les vignettes des images au lieu d’icônes"
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Erreur d’analyse du fuseau horaire.\n"
+"Format attendu : {0}"
+
msgid "Choose visible tracks"
msgstr "Choisir les traces visibles"
@@ -10742,6 +10766,36 @@ msgstr "Créer des marqueurs depuis des points nommés"
msgid "Named Trackpoints from {0}"
msgstr "Points de la trace nommés depuis {0}"
+msgid "Auto load tiles"
+msgstr "Charger automatiquement les tuiles"
+
+msgid "Auto zoom"
+msgstr "Zoom auto"
+
+msgid "Decrease zoom"
+msgstr "Zoomer en arrière"
+
+msgid "Flush tile cache"
+msgstr "Vider le cache des tuiles"
+
+msgid "Increase zoom"
+msgstr "Zoomer en avant"
+
+msgid "Load all tiles"
+msgstr "Charger toutes les tuiles"
+
+msgid "Load all error tiles"
+msgstr "Charger les tuiles avec des erreurs"
+
+msgid "Show errors"
+msgstr "Afficher les erreurs"
+
+msgid "Change resolution"
+msgstr "Changer la résolution"
+
+msgid "Zoom to native resolution"
+msgstr "Zoomer à la résolution native"
+
msgid "gps marker"
msgstr "marqueur GPS"
@@ -12245,6 +12299,8 @@ msgstr "Crans de zoom pour doubler l’échelle"
msgid ""
"Higher value means more steps needed, therefore zoom steps will be smaller"
msgstr ""
+"Une valeur élevée correspond à plus de niveau de zoom, donc les niveau de "
+"zoom seront plus petit"
msgid "Look and Feel"
msgstr "Apparence"
@@ -12346,15 +12402,6 @@ msgstr "Nom du cache"
msgid "Object Count"
msgstr "Nombre d''objets"
-msgid "imagery fade"
-msgstr "Effacement de l’imagerie"
-
-msgid "Fade Color: "
-msgstr "Couleur de fond : "
-
-msgid "Fade amount: "
-msgstr "Opacité : "
-
msgid "Soft"
msgstr "Doux"
@@ -12403,6 +12450,9 @@ msgstr "Arrière-plan d’’imagerie: défaut"
msgid "Available default entries:"
msgstr "Fournisseurs disponibles :"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "Fournisseurs actifs :"
@@ -13688,6 +13738,9 @@ msgstr "Attributs facultatifs :"
msgid "Unknown requisite: {0}"
msgstr "Prérequis inconnu : {0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "Expression de membre illégale : {0}"
@@ -13913,6 +13966,8 @@ msgid ""
"Error adding certificate {0} - certificate fingerprint mismatch. Expected "
"{1}, was {2}"
msgstr ""
+"Erreur lors de l''ajout du certificat {0} - non-concordance de signature du "
+"certificat. Attendu {1} , était {2}"
msgid "Adding certificate for TLS connections: {0}"
msgstr "Ajout de certificat pour les connexions TLS: {0}"
@@ -15028,6 +15083,9 @@ msgstr "remplacé par {0} nouveau greffon"
msgid "no longer required"
msgstr "n’’est plus requis"
+msgid "Plugin information"
+msgstr "Informations sur le greffon"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -15271,9 +15329,6 @@ msgstr ""
"Le greffon a été supprimé de la configuration. Veuillez redémarrer JOSM pour "
"le retirer complètement."
-msgid "Plugin information"
-msgstr "Informations sur le greffon"
-
msgid "no description available"
msgstr "Aucune description disponible"
@@ -16180,16 +16235,36 @@ msgid "farmland"
msgstr "terre arable"
msgctxt "landuse"
+msgid "farmyard"
+msgstr "cour de ferme"
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr "cimetière"
+
+msgctxt "landuse"
msgid "residential"
msgstr "residentiel"
msgctxt "landuse"
msgid "greenfield"
-msgstr ""
+msgstr "terrain à bâtir"
msgctxt "landuse"
msgid "village_green"
-msgstr ""
+msgstr "espace vert"
+
+msgctxt "landuse"
+msgid "quarry"
+msgstr "carrière"
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr "jardins familiaux"
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr "vignoble"
msgctxt "natural"
msgid "scrub"
@@ -16201,8 +16276,32 @@ msgstr "bois"
msgctxt "natural"
msgid "grassland"
+msgstr "prairie naturelle"
+
+msgctxt "natural"
+msgid "wetland"
+msgstr "zone humide"
+
+msgctxt "natural"
+msgid "heath"
msgstr ""
+msgctxt "amenity"
+msgid "fire_station"
+msgstr "caserne de pompiers"
+
+msgctxt "leisure"
+msgid "park"
+msgstr "parc"
+
+msgctxt "leisure"
+msgid "track"
+msgstr "piste"
+
+msgctxt "building"
+msgid "industrial"
+msgstr "Batiment industrielle"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "associatedStreet"
@@ -16558,6 +16657,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr "IGN Argentine (TMS)"
@@ -16649,16 +16756,19 @@ msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
msgstr ""
msgid "OpenStreetMap (Belgian Style)"
-msgstr ""
+msgstr "OpenStreetMap (style belge)"
msgid "OpenStreetMap (Belgian Style - French)"
-msgstr ""
+msgstr "OpenStreetMap (style belge francophone)"
msgid "OpenStreetMap (Belgian Style - Dutch)"
-msgstr ""
+msgstr "OpenStreetMap (style belge néerlandophone)"
msgid "OpenStreetMap (Belgian Style - German)"
-msgstr ""
+msgstr "OpenStreetMap (style belge germanophone)"
+
+msgid "Orthophoto IGN-NGI"
+msgstr "Orthophoto IGN-NGI"
msgid "AGIV Flanders most recent aerial imagery"
msgstr "AGIV Flandres images les plus récentes"
@@ -16700,7 +16810,7 @@ msgid "SPW(allonie) PICC numerical imagery"
msgstr "Imagerie numérique SPW(allonie) PICC"
msgid "SPW(allonie) most recent aerial imagery"
-msgstr "SPW(allonie) images les plus récentes"
+msgstr "Imagerie aérienne SPW(allonie) images les plus récentes"
msgid "SPW(allonie) 2015 aerial imagery"
msgstr "Imagerie aérienne SPW(allonie) 2015"
@@ -16711,11 +16821,11 @@ msgstr "Imagerie aérienne SPW(allonie) 2012-2013"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "Imagerie aérienne SPW(allonie) 2009-2010"
-msgid "TEC bus lines (2014)"
-msgstr "Lignes du réseau TEC (2014)"
+msgid "TEC bus lines"
+msgstr "Lignes du réseau TEC"
-msgid "TEC bus stops (2014)"
-msgstr "Poteaux d''arrêt du réseau TEC (2014) (Peu précis)"
+msgid "TEC bus stops"
+msgstr "Arrêts du réseau TEC (peu précis)"
msgid "Benin: Cotonou Pleiade 2016"
msgstr "Benin : Cotonou Pleiade 2016"
@@ -16747,6 +16857,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr "Arapiraca AL"
+
+msgid "Branquinha AL"
+msgstr "Branquinha AL"
+
+msgid "Cajueiro AL"
+msgstr "Cajueiro AL"
+
+msgid "Campo Alegre AL"
+msgstr "Campo Alegre AL"
+
+msgid "Capela AL"
+msgstr "Capela AL"
+
+msgid "Delmiro Gouveia AL"
+msgstr "Delmiro Gouveia AL"
+
+msgid "Estrela de Alagoas"
+msgstr "Estrela de Alagoas"
+
+msgid "Girau do Ponciano"
+msgstr "Girau do Ponciano"
+
+msgid "Major Isidoro AL"
+msgstr "Major Isidoro AL"
+
+msgid "Mar Vermelho AL"
+msgstr "Mar Vermelho AL"
+
+msgid "Minador do Negrão"
+msgstr "Minador do Negrão"
+
+msgid "Olho d’Agua do Casado AL"
+msgstr "Olho d’Agua do Casado AL"
+
+msgid "Palestina AL"
+msgstr "Palestina AL"
+
+msgid "Palmeira dos Indios AL"
+msgstr "Palmeira dos Indios AL"
+
+msgid "Pão de Açucar AL"
+msgstr "Pão de Açucar AL"
+
+msgid "Piranhas AL"
+msgstr "Piranhas AL"
+
+msgid "Poço das Trincheiras AL"
+msgstr "Poço das Trincheiras AL"
+
+msgid "Santana do Ipanema AL"
+msgstr "Santana do Ipanema AL"
+
+msgid "São Miguel dos Campos AL"
+msgstr "São Miguel dos Campos AL"
+
+msgid "Teotonio Vilela AL"
+msgstr "Teotonio Vilela AL"
+
+msgid "União dos Palmares AL"
+msgstr "União dos Palmares AL"
+
+msgid "Viçosa AL"
+msgstr "Viçosa AL"
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Hydrographie Geobase"
@@ -16760,7 +16945,7 @@ msgid "British Columbia Mosaic"
msgstr "Mosaïque de la Colombie Britannique"
msgid "Latest southwest British Columbia Landsat"
-msgstr ""
+msgstr "Dernières images Landsat de la Colombie britannique"
msgid "Kelowna 2012"
msgstr "Kelowna 2012"
@@ -16799,6 +16984,12 @@ msgstr "République tchèque RUIAN parcely"
msgid "Czech pLPIS"
msgstr "République tchèque pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Danemark)"
@@ -16809,10 +17000,10 @@ msgid "Geodatastyrelsen DTK Kort25"
msgstr "Geodatastyrelsen DTK Kort25"
msgid "SDFE Terræn Skyggekort (40 cm)"
-msgstr ""
+msgstr "SDFE Terræn Skyggekort (40 cm)"
msgid "SDFE Overflade Skyggekort (40 cm)"
-msgstr ""
+msgstr "SDFE Overflade Skyggekort (40 cm)"
msgid "Geodatastyrelsen Skærmkort"
msgstr "Geodatastyrelsen Skærmkort"
@@ -16947,6 +17138,12 @@ msgstr "Imagerie aérienne Berlin 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Berlin Photographie aérienne 2016"
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Erlangen imagerie aérienne (2016 5.0 cm)"
@@ -16988,6 +17185,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -17012,6 +17217,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -17056,34 +17264,43 @@ msgstr "Drone Imagery Canaan(Haiti) novembre 2015"
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -17224,6 +17441,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -17252,8 +17477,8 @@ 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)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2 : Ortofotomapa (image aérienne)"
@@ -17401,6 +17626,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Voiture"
@@ -17476,6 +17709,9 @@ msgstr "Canton d''Argovie 25 cm (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Canton d''Argovie 25 cm (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -17581,33 +17817,76 @@ msgstr "Surcouche routes TIGER 2012"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr "Routes nouvelles & mal alignées de TIGER (2015)"
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+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 ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr "Texas Orthophoto"
@@ -17617,12 +17896,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -17958,8 +18250,8 @@ msgstr ""
"bâtiments à partir de calques en arrière-plan. Optimisé pour basemap.at."
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -18141,9 +18433,6 @@ msgstr ""
"Base de données de décalages d’’imagerie: partager et acquérir des décalages "
"d’’imagerie avec un seul bouton."
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "Style WMSPlugin ajustement de lʼimagerie mapmode"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18590,7 +18879,7 @@ msgid "concrete:plates"
msgstr "dalles de béton préfabriquées"
msgid "concrete:lanes"
-msgstr ""
+msgstr "Béton: bandes de roulement"
msgid "paving_stones"
msgstr "pavés"
@@ -18805,7 +19094,7 @@ msgstr "Électrifié"
msgctxt "electrified"
msgid "contact_line"
-msgstr ""
+msgstr "caténaire"
msgctxt "electrified"
msgid "no"
@@ -20168,24 +20457,31 @@ msgstr "Bande cyclable"
msgid "Cycleway"
msgstr "Bande cyclable"
+msgctxt "cycleway"
msgid "lane"
-msgstr "bande"
+msgstr "voie"
+msgctxt "cycleway"
msgid "track"
msgstr "piste"
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "bande dans le sens opposé de circulation"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "piste dans le sens opposé de circulation"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
-msgstr "dans le sens opposé de circulation"
+msgstr "circulation des cyclistes en sens inverse"
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "Couloir de bus ouvert"
+msgstr "couloir de bus"
+msgctxt "cycleway"
msgid "shared_lane"
msgstr "voie partagée"
@@ -20665,7 +20961,7 @@ msgid "River"
msgstr "Fleuve, rivière"
msgid "Lock"
-msgstr ""
+msgstr "écluse"
msgid "Canal"
msgstr "Canal"
@@ -20702,10 +20998,10 @@ msgid "Basin"
msgstr "Bassin"
msgid "retention"
-msgstr ""
+msgstr "rétention"
msgid "infiltration"
-msgstr ""
+msgstr "infiltration"
msgid "detention"
msgstr ""
@@ -20714,13 +21010,13 @@ msgid "Reservoir"
msgstr "Réservoir"
msgid "evaporator"
-msgstr ""
+msgstr "évaporation"
msgid "tailings"
msgstr ""
msgid "water_storage"
-msgstr ""
+msgstr "stockage"
msgid "Covered Reservoir"
msgstr "Réservoir couvert"
@@ -20757,7 +21053,7 @@ msgid "river"
msgstr "rivière"
msgid "lock"
-msgstr ""
+msgstr "écluse"
msgid "wastewater"
msgstr "Eau usée"
@@ -21304,7 +21600,7 @@ msgid "Amperage"
msgstr "Ampérage"
msgid "Types of vehicles which can be charged:"
-msgstr ""
+msgstr "Types de véhicules pouvant être rechargés :"
msgid "Scooter"
msgstr "Scooter"
@@ -21372,6 +21668,9 @@ msgstr "Carte de membre"
msgid "Wash"
msgstr "Lavage"
+msgid "Self Service"
+msgstr "Self-service"
+
msgid "Car Dealer"
msgstr "Concessionnaire auto"
@@ -21491,7 +21790,7 @@ msgid "Public Transport"
msgstr "Transports publics"
msgid "Public Transport Route (Rail)"
-msgstr ""
+msgstr "Itinéraire de transport en commun ferroviaire"
msgid "Route type"
msgstr "Itinéraire"
@@ -21527,7 +21826,7 @@ msgid "route segment"
msgstr "route (sens aller et retour)"
msgid "Public Transport Route (Bus)"
-msgstr ""
+msgstr "Itinéraire de transport en commun par bus"
msgid "trolleybus"
msgstr "trolleybus"
@@ -22377,7 +22676,7 @@ msgid "Automated Defibrillator"
msgstr "Défibrillateur automatique"
msgid "Location description"
-msgstr ""
+msgstr "Description de l’emplacement"
msgid "Phone Number"
msgstr "Numéro de téléphone"
@@ -22771,7 +23070,7 @@ msgid "Water Point"
msgstr "Point d''eau"
msgid "Animal watering place"
-msgstr ""
+msgstr "Abreuvoir"
msgid "Compressed Air"
msgstr "Air comprimé"
@@ -22810,7 +23109,7 @@ msgid "Sports Centre"
msgstr "Centre sportif"
msgid "Fitness Centre"
-msgstr ""
+msgstr "Centre de fitness"
msgid "Pitch"
msgstr "Terrain de sport"
@@ -22899,7 +23198,7 @@ msgstr "centre sportif"
msgctxt "running"
msgid "fitness_centre"
-msgstr ""
+msgstr "centre de fitness"
msgctxt "running"
msgid "stadium"
@@ -22959,7 +23258,7 @@ msgid "Gymnastics"
msgstr "Gymnastique"
msgid "fitness_centre"
-msgstr ""
+msgstr "centre de fitness"
msgid "Ice Skating"
msgstr "Patinage sur glace"
@@ -23193,10 +23492,6 @@ msgid "garages"
msgstr "garages"
msgctxt "building"
-msgid "industrial"
-msgstr "Batiment industrielle"
-
-msgctxt "building"
msgid "school"
msgstr "Batiment scolaire"
@@ -23246,7 +23541,7 @@ msgstr "université"
msgctxt "building"
msgid "college"
-msgstr ""
+msgstr "université"
msgctxt "building"
msgid "hospital"
@@ -23365,7 +23660,7 @@ msgstr "refuge"
msgctxt "building"
msgid "bungalow"
-msgstr ""
+msgstr "bungalow"
msgctxt "building"
msgid "dormitory"
@@ -24599,6 +24894,21 @@ msgstr "palais"
msgid "Archaeological Site"
msgstr "Site archéologique"
+msgid "tumulus"
+msgstr "tumulus"
+
+msgid "megalith"
+msgstr "mégalithe"
+
+msgid "fortification"
+msgstr "fortification"
+
+msgid "settlement"
+msgstr "implantation"
+
+msgid "necropolis"
+msgstr "nécropole"
+
msgid "Battlefield"
msgstr "Lieu de bataille"
@@ -24945,10 +25255,10 @@ msgid "Vending products"
msgstr "Produits vendus"
msgid "admission_tickets"
-msgstr ""
+msgstr "tickets d’entrée"
msgid "animal_feed"
-msgstr ""
+msgstr "nourriture pour animaux"
msgid "bicycle_tube"
msgstr "chambres à air"
@@ -24984,7 +25294,7 @@ msgid "parking_tickets"
msgstr "tickets de parking"
msgid "parcel_pickup"
-msgstr ""
+msgstr "retrait de colis"
msgid "parcel_mail_in"
msgstr ""
@@ -25166,7 +25476,7 @@ msgid "tax"
msgstr "impôt"
msgid "register_office"
-msgstr ""
+msgstr "état-civil"
msgctxt "office"
msgid "Insurance"
@@ -26169,6 +26479,21 @@ msgstr "centre administratif"
msgid "Label point"
msgstr "Point de placement de l’étiquette"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "Site"
@@ -26674,7 +26999,7 @@ msgid "{0} is deprecated"
msgstr "{0} est déprécié"
msgid "deprecated tagging"
-msgstr ""
+msgstr "attributs dépréciés"
msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
msgstr ""
@@ -26774,13 +27099,13 @@ msgid "{0} is deprecated. Use the {1}: key prefix instead."
msgstr "{0} est obsolète. A la place, utilisez {1}: préfixe de clé."
msgid "questionable key (ending with a number)"
-msgstr ""
+msgstr "clé discutable (se termine par un chiffre)"
msgid "The key {0} has an uncommon value."
msgstr "La clé {0} possède une valeur peu courante."
msgid "misspelled value"
-msgstr ""
+msgstr "valeur mal orthographiée"
msgid "wrong value: {0}"
msgstr ""
@@ -27318,7 +27643,7 @@ msgid "Importing..."
msgstr "Importation…"
msgid "DXF files [ImportDxf plugin] (*.dxf)"
-msgstr ""
+msgstr "Fichiers DXF [plugin ImportDxf] (*.dxf)"
msgid "Please open or create data layer before importing"
msgstr ""
@@ -27742,15 +28067,6 @@ msgstr "Importer des photos locales"
msgid "Import pictures into Mapillary layer"
msgstr "Importer des photos dans un calque Mapillary"
-msgid "Select pictures"
-msgstr "Sélectionner des photos"
-
-msgid "Import pictures into sequence"
-msgstr "Importer une séquence de photos"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importer une séquence de photos dans un calque Mapillary"
-
msgid "Join mode"
msgstr "Mode assemblage"
@@ -27996,6 +28312,43 @@ msgstr "Suivre l''image sélectionnée"
msgid "Go forward"
msgstr "Avancer"
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Importer"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -28031,6 +28384,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -28040,6 +28396,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -28049,15 +28408,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -28090,7 +28467,13 @@ msgstr[1] "{0} images tournées"
msgid "2 images unjoined"
msgstr "2 images désassemblées"
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -28107,9 +28490,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr "Téléchargement en cours"
@@ -28933,6 +29313,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -29843,6 +30226,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -29863,46 +30252,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
-msgstr ""
+msgid "Replace Geometry"
+msgstr "Remplacer la géométrie"
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
-msgstr "Configurer les paramétres d’assemblage"
+msgid "List of tags to merge"
+msgstr ""
-msgid "Generate matches"
-msgstr "Générer les correspondances"
+msgid "except"
+msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Remplacer la géométrie"
+msgid "Advanced Example"
+msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
+msgstr "Configurer les paramétres d’assemblage"
+
+msgid "Generate matches"
+msgstr "Générer les correspondances"
+
+msgid "Merging"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -29936,6 +30333,12 @@ msgstr "Sélection vide"
msgid "Freeze reference selection"
msgstr "Geler la sélection de référence"
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -30338,9 +30741,6 @@ msgstr ""
"Importer les données depuis le traceur GPS Globalsat DG100 dans le calque "
"GPX."
-msgid "Import"
-msgstr "Importer"
-
msgid "GPS Blams"
msgstr "GPS Blams"
@@ -30865,9 +31265,6 @@ msgstr "Chargement de l’ajustement d’imagerie en cours..."
msgid "Error processing XML response: {0}"
msgstr "Erreur pendant le traitement de la réponse XML: {0}"
-msgid "Offset"
-msgstr "Décalage"
-
msgid "Imagery Offset Database"
msgstr "Base de données des ajustement de décalage d’imagerie"
@@ -31010,24 +31407,6 @@ msgid "This string should be 3 to 200 letters long."
msgstr ""
"Cette chaîne devrait avoir une longueur comprise entre 3 et 200 lettres."
-msgid "Adjust imagery"
-msgstr "Ajustement de l’imagerie"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Ajuster la position du calque d’imagerie selectionné"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Merci de selectionné le calque d’imagerie à ajuster"
-
-msgid "Start adjusting"
-msgstr "Début de l’ajustemeent"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "Il n’y a pas actuellement de calque d’imagerie à ajuster."
-
-msgid "No layers to adjust"
-msgstr "Pas de calque à ajuster"
-
msgid "Normal"
msgstr "Normal"
@@ -31040,12 +31419,21 @@ msgstr "Rotation à 180°"
msgid "Rotate 270"
msgstr "Rotation à 270°"
-msgid "Previous image"
-msgstr "Image précédente"
+msgid "WayPoint Image"
+msgstr "Image WayPoint"
+
+msgid "Display non-geotagged photos"
+msgstr "Afficher des photos non géolocalisées"
+
+msgid "Imported Images"
+msgstr "Images importées"
msgid "Next image"
msgstr "Image suivante"
+msgid "Previous image"
+msgstr "Image précédente"
+
msgid "Rotate left"
msgstr "Rotation à gauche"
@@ -31058,15 +31446,6 @@ msgstr "Rotation à droite"
msgid "Rotate image right"
msgstr "Tourner l’image vers la droite"
-msgid "WayPoint Image"
-msgstr "Image WayPoint"
-
-msgid "Display non-geotagged photos"
-msgstr "Afficher des photos non géolocalisées"
-
-msgid "Imported Images"
-msgstr "Images importées"
-
msgid "Import vector graphics"
msgstr "Importer des images vectorielles"
@@ -33286,9 +33665,6 @@ msgstr "Joindre"
msgid "Public Transport: Join GTFS stops"
msgstr "Transport public : joindre des arrêts GTFS"
-msgid "Id"
-msgstr "Identifiant"
-
msgid "State"
msgstr "Département"
@@ -33717,7 +34093,7 @@ msgstr ""
"contenu du groupe de modifications n’est pas supporté. Abandon."
msgid "Create Roundabout"
-msgstr ""
+msgstr "Créer un rond-point"
msgid "Roundabout Expander"
msgstr ""
diff --git a/i18n/po/ga.po b/i18n/po/ga.po
index ffd2b8c..8e748c6 100644
--- a/i18n/po/ga.po
+++ b/i18n/po/ga.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2015-05-17 11:43+0000\n"
"Last-Translator: Thorsten <Unknown>\n"
"Language-Team: Irish <ga at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:49+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:47+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -3304,6 +3304,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3312,6 +3315,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3976,6 +3984,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4032,6 +4043,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9010,46 +9024,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9164,7 +9181,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9278,9 +9301,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9291,8 +9311,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9454,16 +9477,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9593,12 +9606,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9758,6 +9781,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11174,15 +11227,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11231,6 +11275,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12406,6 +12453,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13548,6 +13598,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13746,9 +13799,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14452,6 +14502,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14463,6 +14521,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14475,6 +14545,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14830,6 +14924,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14932,6 +15034,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14983,10 +15088,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15019,6 +15124,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15071,6 +15251,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15217,6 +15403,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15256,6 +15448,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15280,6 +15480,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15324,34 +15527,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15492,6 +15704,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15520,7 +15740,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15669,6 +15889,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15744,6 +15972,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15849,33 +16080,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15885,12 +16159,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16209,8 +16496,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16351,9 +16638,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18258,24 +18542,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19448,6 +19739,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21263,10 +21557,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22667,6 +22957,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24208,6 +24513,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25704,15 +26024,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25954,6 +26265,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25989,6 +26337,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25998,6 +26349,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26007,15 +26361,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26048,7 +26420,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26065,9 +26443,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26760,6 +27135,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27598,6 +27976,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27618,46 +28002,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27690,6 +28082,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28065,9 +28463,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28552,9 +28947,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28673,42 +29065,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28721,15 +29104,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30822,9 +31196,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/gl.po b/i18n/po/gl.po
index 91bff36..0edaa9c 100644
--- a/i18n/po/gl.po
+++ b/i18n/po/gl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2016-01-01 15:11+0000\n"
"Last-Translator: Marcos Lans <Unknown>\n"
"Language-Team: Galician <proxecto at trasno.net>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:49+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:47+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: gl\n"
"X-Poedit-Language: Galician\n"
@@ -3492,6 +3492,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3500,6 +3503,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4184,6 +4192,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4240,6 +4251,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9381,46 +9395,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} obxecto para eliminar:"
msgstr[1] "{0} obxectos para eliminar:"
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
-msgstr "Cambiar a resolución"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9535,7 +9552,13 @@ msgstr[1] "{0} camiños, "
msgid "Save GPX file"
msgstr "Gardar ficheiro GPX"
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9651,9 +9674,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Gardar ficheiro OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr "Erros de validación"
@@ -9664,8 +9684,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9827,16 +9850,6 @@ msgstr "Debe escoller un camiño GPX"
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr "Imaxes xeo-etiquetadas"
@@ -9968,12 +9981,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -10137,6 +10160,36 @@ msgstr "Marca dos puntos con nome"
msgid "Named Trackpoints from {0}"
msgstr "Puntos do camiño co nome de {0}"
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr "Cambiar a resolución"
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr "marca gps"
@@ -11608,15 +11661,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11665,6 +11709,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12848,6 +12895,9 @@ msgstr "Atributos Opcionais:"
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -14033,6 +14083,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr "Información do complemento"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -14261,9 +14314,6 @@ msgstr ""
"O complemento foi retirado da configuración. Reinicie JOSM para descargar o "
"complemento."
-msgid "Plugin information"
-msgstr "Información do complemento"
-
msgid "no description available"
msgstr "sen descrición dispoñíbel"
@@ -14975,6 +15025,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14986,6 +15044,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14998,6 +15068,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -15353,6 +15447,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -15455,6 +15557,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15506,10 +15611,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15542,6 +15647,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15594,6 +15774,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15740,6 +15926,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15779,6 +15971,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15803,6 +16003,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15847,34 +16050,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -16015,6 +16227,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -16043,7 +16263,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -16192,6 +16412,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -16267,6 +16495,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -16372,33 +16603,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -16408,12 +16682,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16732,8 +17019,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16877,9 +17164,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18813,24 +19097,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "camiño"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -20004,6 +20295,9 @@ msgstr ""
msgid "Wash"
msgstr "Limpeza"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Concesionario de automóviles"
@@ -21819,10 +22113,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -23223,6 +23513,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Lugar arqueolóxico"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Campo de batalla"
@@ -24764,6 +25069,21 @@ msgstr "Centro de Administración"
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -26260,15 +26580,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -26510,6 +26821,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Importar"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26545,6 +26893,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26554,6 +26905,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26563,15 +26917,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26604,7 +26976,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26621,9 +26999,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -27317,6 +27692,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -28169,6 +28547,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -28189,46 +28573,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -28261,6 +28653,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28640,9 +29038,6 @@ msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
"Importar datos do capturador de datos Globalsat DG100 dentro de unha capa GPX"
-msgid "Import"
-msgstr "Importar"
-
msgid "GPS Blams"
msgstr ""
@@ -29127,9 +29522,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -29248,24 +29640,6 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
-msgstr ""
-
-msgid "Start adjusting"
-msgstr ""
-
-msgid "There are currently no imagery layer to adjust."
-msgstr ""
-
-msgid "No layers to adjust"
-msgstr ""
-
msgid "Normal"
msgstr "Normal"
@@ -29278,12 +29652,21 @@ msgstr "Rotar 180"
msgid "Rotate 270"
msgstr "Rotar 270"
-msgid "Previous image"
-msgstr "Imaxe anterior"
+msgid "WayPoint Image"
+msgstr "Imaxe de punto de referencia"
+
+msgid "Display non-geotagged photos"
+msgstr "Amosar fotos non xeolocalizadas"
+
+msgid "Imported Images"
+msgstr "Imaxes Importadas"
msgid "Next image"
msgstr "Imaxe Seguinte"
+msgid "Previous image"
+msgstr "Imaxe anterior"
+
msgid "Rotate left"
msgstr "Xirar á esquerda"
@@ -29296,15 +29679,6 @@ msgstr "Xirar á dereita"
msgid "Rotate image right"
msgstr "Xirar imaxe á dereita"
-msgid "WayPoint Image"
-msgstr "Imaxe de punto de referencia"
-
-msgid "Display non-geotagged photos"
-msgstr "Amosar fotos non xeolocalizadas"
-
-msgid "Imported Images"
-msgstr "Imaxes Importadas"
-
msgid "Import vector graphics"
msgstr "Importar gráficos vectoriais"
@@ -31405,9 +31779,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr "Estado"
diff --git a/i18n/po/he.po b/i18n/po/he.po
index b211e34..625bacd 100644
--- a/i18n/po/he.po
+++ b/i18n/po/he.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\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: 2017-03-24 04:51+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:49+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: he\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3318,6 +3318,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3326,6 +3329,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3992,6 +4000,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4048,6 +4059,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9038,46 +9052,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
-msgstr "שנה רזולוציה"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
-msgstr "הגדל"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "הקטן"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9192,7 +9209,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr "שמור קובץ GPX"
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9308,9 +9331,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "שמור קובץ OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr "שגיאת תקינות"
@@ -9321,8 +9341,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9484,20 +9507,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"שגיאה בזמן ניתוח אזור זמן.\n"
-"פורמט מצופה: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"שגיאה בזמן ניתוח היסט.\n"
-"פורמט מצופה: {0}"
-
msgid "Geotagged Images"
msgstr "תמונות בעלות גאותגיות"
@@ -9629,12 +9638,26 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"שגיאה בזמן ניתוח היסט.\n"
+"פורמט מצופה: {0}"
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"שגיאה בזמן ניתוח אזור זמן.\n"
+"פורמט מצופה: {0}"
+
msgid "Choose visible tracks"
msgstr ""
@@ -9796,6 +9819,36 @@ msgstr "סמנים מנקודות בעלות שם"
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr "הקטן"
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr "הגדל"
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr "שנה רזולוציה"
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr "סמן gps"
@@ -11212,15 +11265,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11269,6 +11313,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12444,6 +12491,9 @@ msgstr "מאפייני רשות:"
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13588,6 +13638,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13786,9 +13839,6 @@ msgid ""
"unload the plugin."
msgstr "התוסף הוסר מהתצורה. אתחל מחדש את JOSM להסרת התוסף."
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr "אין תיאור זמין"
@@ -14494,6 +14544,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14505,6 +14563,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14517,6 +14587,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14872,6 +14966,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14974,6 +15076,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15025,10 +15130,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15061,6 +15166,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15113,6 +15293,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15259,6 +15445,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15298,6 +15490,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15322,6 +15522,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15366,34 +15569,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15534,6 +15746,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15562,7 +15782,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15711,6 +15931,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15786,6 +16014,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15891,33 +16122,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15927,12 +16201,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16251,8 +16538,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16393,9 +16680,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18300,24 +18584,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19490,6 +19781,9 @@ msgstr ""
msgid "Wash"
msgstr "שטיפה"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21305,10 +21599,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22709,6 +22999,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "אתר ארכיאולוגי"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "שדה קרב"
@@ -24250,6 +24555,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25746,15 +26066,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25996,6 +26307,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "ייבא"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26031,6 +26379,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26040,6 +26391,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26049,15 +26403,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26090,7 +26462,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26107,9 +26485,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26802,6 +27177,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27640,6 +28018,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27660,46 +28044,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
+msgstr ""
+
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27732,6 +28124,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28107,9 +28505,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr "ייבא"
-
msgid "GPS Blams"
msgstr ""
@@ -28594,9 +28989,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28715,24 +29107,6 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
-msgstr ""
-
-msgid "Start adjusting"
-msgstr ""
-
-msgid "There are currently no imagery layer to adjust."
-msgstr ""
-
-msgid "No layers to adjust"
-msgstr ""
-
msgid "Normal"
msgstr "רגיל"
@@ -28745,12 +29119,21 @@ msgstr "סובב 180"
msgid "Rotate 270"
msgstr "סובב 270"
-msgid "Previous image"
-msgstr "תמונה קודמת"
+msgid "WayPoint Image"
+msgstr "תמונת נקודת דרך"
+
+msgid "Display non-geotagged photos"
+msgstr "הצג תמונות ללא תיוג גיאוגרפי"
+
+msgid "Imported Images"
+msgstr "תמונות מיובאות"
msgid "Next image"
msgstr "תמונה הבאה"
+msgid "Previous image"
+msgstr "תמונה קודמת"
+
msgid "Rotate left"
msgstr "סובב שמאלה"
@@ -28763,15 +29146,6 @@ msgstr "סובב ימינה"
msgid "Rotate image right"
msgstr "סובב תמונה ימינה"
-msgid "WayPoint Image"
-msgstr "תמונת נקודת דרך"
-
-msgid "Display non-geotagged photos"
-msgstr "הצג תמונות ללא תיוג גיאוגרפי"
-
-msgid "Imported Images"
-msgstr "תמונות מיובאות"
-
msgid "Import vector graphics"
msgstr ""
@@ -30868,9 +31242,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr "מדינה"
diff --git a/i18n/po/hi.po b/i18n/po/hi.po
index 7a85ce9..74dc8f7 100644
--- a/i18n/po/hi.po
+++ b/i18n/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2009-11-14 16:28+0000\n"
"Last-Translator: nipunreddevil <nipunreddevil at gmail.com>\n"
"Language-Team: Hindi <hi at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:52+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:49+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: hi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3305,6 +3305,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3313,6 +3316,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3977,6 +3985,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4033,6 +4044,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9011,46 +9025,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9165,7 +9182,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9279,9 +9302,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9292,8 +9312,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9455,16 +9478,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9594,12 +9607,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9759,6 +9782,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11175,15 +11228,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11232,6 +11276,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12407,6 +12454,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13549,6 +13599,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13747,9 +13800,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14453,6 +14503,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14464,6 +14522,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14476,6 +14546,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14831,6 +14925,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14933,6 +15035,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14984,10 +15089,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15020,6 +15125,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15072,6 +15252,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15218,6 +15404,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15257,6 +15449,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15281,6 +15481,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15325,34 +15528,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15493,6 +15705,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15521,7 +15741,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15670,6 +15890,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15745,6 +15973,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15850,33 +16081,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15886,12 +16160,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16210,8 +16497,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16352,9 +16639,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18259,24 +18543,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19449,6 +19740,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21264,10 +21558,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22668,6 +22958,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24209,6 +24514,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25705,15 +26025,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25955,6 +26266,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25990,6 +26338,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25999,6 +26350,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26008,15 +26362,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26049,7 +26421,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26066,9 +26444,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26761,6 +27136,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27599,6 +27977,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27619,46 +28003,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27691,6 +28083,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28066,9 +28464,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28553,9 +28948,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28674,42 +29066,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28722,15 +29105,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30823,9 +31197,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/hr.po b/i18n/po/hr.po
index 19c8258..f27a9ea 100644
--- a/i18n/po/hr.po
+++ b/i18n/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2016-01-04 15:56+0000\n"
"Last-Translator: gogo <trebelnik2 at gmail.com>\n"
"Language-Team: Croatian <hr at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:09+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:06+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: hr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3410,6 +3410,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3418,6 +3421,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4085,6 +4093,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4141,6 +4152,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9156,46 +9170,49 @@ msgstr[0] "{0} objekt za izbrisati:"
msgstr[1] "{0} objekta za izbrisati:"
msgstr[2] "{0} objekta za izbrisati:"
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
-msgstr "Automatski učitaj naslove"
+msgid "Show tile info"
+msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
-msgstr "Promijeni rezoluciju"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Povećaj zim"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Smanji zum"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9311,7 +9328,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr "Spremi GPX datoteku"
-msgid "Imagery fade"
+msgid "Id"
+msgstr "Id"
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9428,9 +9451,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Spremi OSM datoteku"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "EPSG:4326 i Mercator projekcije su podržane"
-
msgid "Validation errors"
msgstr ""
@@ -9441,8 +9461,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9604,16 +9627,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9744,12 +9757,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9909,6 +9932,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr "Automatski učitaj naslove"
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr "Smanji zum"
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr "Povećaj zim"
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr "Promijeni rezoluciju"
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11325,15 +11378,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11382,6 +11426,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12557,6 +12604,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13699,6 +13749,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13897,9 +13950,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14603,6 +14653,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14614,6 +14672,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14626,6 +14696,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14981,6 +15075,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -15083,6 +15185,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15134,10 +15239,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15170,6 +15275,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15222,6 +15402,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15368,6 +15554,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15407,6 +15599,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15431,6 +15631,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15475,34 +15678,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15643,6 +15855,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15671,7 +15891,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15820,6 +16040,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15895,6 +16123,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -16000,33 +16231,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -16036,12 +16310,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16360,8 +16647,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16502,9 +16789,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18409,24 +18693,31 @@ msgstr ""
msgid "Cycleway"
msgstr "Biciklistička staza"
+msgctxt "cycleway"
msgid "lane"
-msgstr "traka"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "poljoprivredni put"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19599,6 +19890,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21414,10 +21708,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22818,6 +23108,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24359,6 +24664,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25855,15 +26175,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -26105,6 +26416,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26140,6 +26488,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26149,6 +26500,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26158,15 +26512,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26199,7 +26571,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26216,9 +26594,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26911,6 +27286,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27749,6 +28127,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27769,46 +28153,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
+msgstr ""
+
+msgid "Merging"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27841,6 +28233,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28216,9 +28614,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28703,9 +29098,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28824,42 +29216,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28872,15 +29255,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30977,9 +31351,6 @@ msgstr "Spoji"
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr "Id"
-
msgid "State"
msgstr ""
diff --git a/i18n/po/ht.po b/i18n/po/ht.po
index 3ac5f24..248816d 100644
--- a/i18n/po/ht.po
+++ b/i18n/po/ht.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2010-03-11 21:17+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Haitian; Haitian Creole <ht at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:50+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:48+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3305,6 +3305,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3313,6 +3316,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3977,6 +3985,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4033,6 +4044,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9011,46 +9025,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9165,7 +9182,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9279,9 +9302,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9292,8 +9312,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9455,16 +9478,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9594,12 +9607,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9759,6 +9782,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11175,15 +11228,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11232,6 +11276,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12407,6 +12454,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13549,6 +13599,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13747,9 +13800,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14453,6 +14503,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14464,6 +14522,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14476,6 +14546,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14831,6 +14925,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14933,6 +15035,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14984,10 +15089,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15020,6 +15125,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15072,6 +15252,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15218,6 +15404,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15257,6 +15449,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15281,6 +15481,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15325,34 +15528,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15493,6 +15705,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15521,7 +15741,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15670,6 +15890,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15745,6 +15973,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15850,33 +16081,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15886,12 +16160,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16210,8 +16497,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16352,9 +16639,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18259,24 +18543,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19449,6 +19740,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21264,10 +21558,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22668,6 +22958,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24209,6 +24514,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25705,15 +26025,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25955,6 +26266,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25990,6 +26338,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25999,6 +26350,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26008,15 +26362,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26049,7 +26421,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26066,9 +26444,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26761,6 +27136,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27599,6 +27977,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27619,46 +28003,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27691,6 +28083,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28066,9 +28464,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28553,9 +28948,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28674,42 +29066,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28722,15 +29105,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30823,9 +31197,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/hu.po b/i18n/po/hu.po
index 38aad94..806b1a6 100644
--- a/i18n/po/hu.po
+++ b/i18n/po/hu.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
-"PO-Revision-Date: 2017-03-13 23:18+0000\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"PO-Revision-Date: 2017-03-29 22:46+0000\n"
"Last-Translator: Báthory Péter <bathory86p at gmail.com>\n"
"Language-Team: Hungarian <kde-l10n-hu at kde.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:52+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:50+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: hu\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3591,6 +3591,9 @@ msgstr "Vetület"
msgid "Matrix set identifier"
msgstr "Mátrix halmaz azonosító"
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "A getCapabilities dokumentum nem definiált rétegeket: {0}"
@@ -3600,6 +3603,13 @@ msgstr ""
"WMTS elemzési hiba – {0} kezdőelem neve különbözik {2} lezáró elemétől"
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+"{0} réteg nem használható, mert nem található támogatott formátum. A réteg "
+"az alábbi formátumokban érhető el: {1}"
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4300,6 +4310,9 @@ msgstr "Ellenőrzi, hogy érvényesek-e a multipoligonok"
msgid "Area style way is not closed"
msgstr "Terület típusú vonal nincs bezárva"
+msgid "No outer way for boundary"
+msgstr "A határvonalnak nincs külső vonala"
+
msgid "No outer way for multipolygon"
msgstr "Nincs külső vonala a multipoligonnak"
@@ -4365,6 +4378,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr "Nincs használható szerepe a multipoligon tagnak"
+msgid "Non-Way in boundary"
+msgstr "Nem-vonal a határvonalban"
+
msgid "Non-Way in multipolygon"
msgstr "Nem-vonal a multipoligonban"
@@ -9824,47 +9840,50 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} törlendő objektum:"
msgstr[1] "{0} törlendő objektum:"
-msgid "Show tile info"
-msgstr "Csempe infó megjelenítése"
+msgid "Native projections"
+msgstr ""
-msgid "Tile Info"
-msgstr "Csempe infó"
+msgid "Offset"
+msgstr "Eltolás"
-msgid "Metadata "
-msgstr "Metaadatok "
+msgid "Tile download projection"
+msgstr ""
-msgid "Load tile"
-msgstr "Csempe betöltése"
+msgid "Tile display projection"
+msgstr ""
-msgid "Auto zoom"
-msgstr "Automatikus zoom"
+msgid "Current zoom"
+msgstr ""
-msgid "Auto load tiles"
-msgstr "Csempék automatikus betöltése"
+msgid "Show tile info"
+msgstr "Csempe infó megjelenítése"
-msgid "Show errors"
-msgstr "Hibák jelzése"
+msgid "Tile Info"
+msgstr "Csempe infó"
-msgid "Load all tiles"
-msgstr "Összes csempe újratöltése"
+msgid "Tile name"
+msgstr ""
-msgid "Load all error tiles"
-msgstr "Összes hibás csempe újratöltése"
+msgid "Tile URL"
+msgstr ""
-msgid "Zoom to native resolution"
-msgstr "Nagyítás eredeti felbontásra"
+msgid "Tile size"
+msgstr ""
-msgid "Change resolution"
-msgstr "Felbontás váltása"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Nagyítás növelése"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Nagyítás csökkentése"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
-msgstr "Csempe gyorsítótár ürítése"
+msgid "Metadata "
+msgstr "Metaadatok "
+
+msgid "Load tile"
+msgstr "Csempe betöltése"
msgid "Failed to create tile source"
msgstr "Csempeforrás létrehozása nem sikerült"
@@ -9982,8 +10001,14 @@ msgstr[1] "{0} nyomvonal, "
msgid "Save GPX file"
msgstr "GPX fájl mentése"
-msgid "Imagery fade"
-msgstr "Légifelvétel áttetszősége"
+msgid "Id"
+msgstr "ID"
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
+msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr "Nem támogatott légifelvétel típus: {0}"
@@ -10098,9 +10123,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "OSM fájl mentése"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "EPSG:4326 és Mercator vetület támogatott"
-
msgid "Validation errors"
msgstr "Ellenőrzési hibák"
@@ -10111,11 +10133,12 @@ msgid "Set WMS Bookmark"
msgstr "WMS könyvjelző beállítása"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
-"A JOSM EPSG:4326 (WGS84) vetületet fog használni a szerverről lekérdezéshez, "
-"de a válasz a WMS szervertől függően eltérhet"
msgid "Correlate to GPX"
msgstr "Korrelálás GPX-hez"
@@ -10288,20 +10311,6 @@ msgstr "Választanod kell egy GPX nyomvonalat"
msgid "No selected GPX track"
msgstr "Nincs kiválasztott GPX nyomvonal"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Hiba az időzóna értelmezésekor.\n"
-"Várt formátum: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Hiba az eltolás értelmezésekor.\n"
-"Várt formátum: {0}"
-
msgid "Geotagged Images"
msgstr "Geotagelt képek"
@@ -10443,12 +10452,26 @@ msgstr ""
"\n"
"GPS idő: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Hiba az eltolás értelmezésekor.\n"
+"Várt formátum: {0}"
+
msgid "Show thumbnails"
msgstr "Bélyegképek megjelenítése"
msgid "Show image thumbnails instead of icons."
msgstr "Bélyegképek megjelenítése ikonok helyett"
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Hiba az időzóna értelmezésekor.\n"
+"Várt formátum: {0}"
+
msgid "Choose visible tracks"
msgstr "Látható nyomvonalak kiválasztása"
@@ -10625,6 +10648,36 @@ msgstr "Jelölők az elnevezett pontokból"
msgid "Named Trackpoints from {0}"
msgstr "Elnevezett útpontok innen {0}"
+msgid "Auto load tiles"
+msgstr "Csempék automatikus betöltése"
+
+msgid "Auto zoom"
+msgstr "Automatikus zoom"
+
+msgid "Decrease zoom"
+msgstr "Nagyítás csökkentése"
+
+msgid "Flush tile cache"
+msgstr "Csempe gyorsítótár ürítése"
+
+msgid "Increase zoom"
+msgstr "Nagyítás növelése"
+
+msgid "Load all tiles"
+msgstr "Összes csempe újratöltése"
+
+msgid "Load all error tiles"
+msgstr "Összes hibás csempe újratöltése"
+
+msgid "Show errors"
+msgstr "Hibák jelzése"
+
+msgid "Change resolution"
+msgstr "Felbontás váltása"
+
+msgid "Zoom to native resolution"
+msgstr "Nagyítás eredeti felbontásra"
+
msgid "gps marker"
msgstr "gps jelölő"
@@ -12216,15 +12269,6 @@ msgstr "Gyorsítótár neve"
msgid "Object Count"
msgstr "Objektumok száma"
-msgid "imagery fade"
-msgstr "légifelvétel áttetszősége"
-
-msgid "Fade Color: "
-msgstr "Áttetszőség színe: "
-
-msgid "Fade amount: "
-msgstr "Áttetszőség mértéke: "
-
msgid "Soft"
msgstr "Gyenge"
@@ -12273,6 +12317,9 @@ msgstr "Légifelvétel háttérkép: Alapértelmezett"
msgid "Available default entries:"
msgstr "Elérhető alapértelmezett bejegyzések:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "Kiválasztott bejegyzések:"
@@ -13556,6 +13603,9 @@ msgstr "Opcionális tulajdonságok:"
msgid "Unknown requisite: {0}"
msgstr "Ismeretlen követelmény: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "Helytelen tagi kifejezés: {0}"
@@ -14837,6 +14887,9 @@ msgstr "lecserélve az új {0} bővítményre"
msgid "no longer required"
msgstr "többé nem szükséges"
+msgid "Plugin information"
+msgstr "Bővítmény információ"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -15075,9 +15128,6 @@ msgstr ""
"A bővítmény el lett távolítva a konfigurációból. A bővítmény kikapcsolásához "
"indítsd újra a JOSM-t."
-msgid "Plugin information"
-msgstr "Bővítmény információ"
-
msgid "no description available"
msgstr "nem érhető el leírás"
@@ -15981,6 +16031,14 @@ msgid "farmland"
msgstr "szántóföld"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "lakóterület"
@@ -15992,6 +16050,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr "bozót"
@@ -16002,8 +16072,32 @@ msgstr "erdő"
msgctxt "natural"
msgid "grassland"
+msgstr "puszta"
+
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
msgstr ""
+msgctxt "building"
+msgid "industrial"
+msgstr "ipari"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "kapcsolódó utca"
@@ -16359,6 +16453,14 @@ msgstr "imagico.de OSM képek térképezéshez: Pensacola-hegység"
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr "imagico.de OSM képek térképezéshez: Elefánt-sziget/Clarence-sziget"
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr "IGN Argentina (TMS)"
@@ -16461,6 +16563,9 @@ msgstr "OpenStreetMap (belga stílus – holland)"
msgid "OpenStreetMap (Belgian Style - German)"
msgstr "OpenStreetMap (belga stílus – német)"
+msgid "Orthophoto IGN-NGI"
+msgstr "Ortofotó IGN-NGI"
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr "AGIV Flanders legfrissebb légifelvételei"
@@ -16474,13 +16579,13 @@ msgid "URBISfr numerical imagery (2013)"
msgstr "URBISfr numerical imagery (2013)"
msgid "URBISfr numerical imagery"
-msgstr ""
+msgstr "URBISfr numerical imagery"
msgid "URBISnl numerical imagery (2013)"
msgstr "URBISnl numerical imagery (2013)"
msgid "URBISnl numerical imagery"
-msgstr ""
+msgstr "URBISnl numerical imagery"
msgid "URBIS 2009 aerial imagery"
msgstr "URBIS 2009 légifelvétel"
@@ -16495,7 +16600,7 @@ msgid "URBIS 2015 aerial imagery"
msgstr "URBIS 2015 légifelvétel"
msgid "URBIS 2016 aerial imagery"
-msgstr ""
+msgstr "URBIS 2016 légifotó"
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW(allonie) PICC numerical imagery"
@@ -16512,11 +16617,11 @@ msgstr "SPW(allonie) 2012-2013 légifelvétel"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 légifelvétel"
-msgid "TEC bus lines (2014)"
-msgstr "TEC busz útvonalak (2014)"
+msgid "TEC bus lines"
+msgstr ""
-msgid "TEC bus stops (2014)"
-msgstr "TEC buszmegállók (2014)"
+msgid "TEC bus stops"
+msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
msgstr "Benin: Cotonou Pleiade 2016"
@@ -16548,6 +16653,81 @@ msgstr "Londrina Ortofotó 2011"
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr "SIG Santa Catarina OrtoRGB 2012"
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Geobase Hidrológiai"
@@ -16600,6 +16780,12 @@ msgstr "Czech RUIAN parcellák"
msgid "Czech pLPIS"
msgstr "Czech pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Denmark)"
@@ -16749,6 +16935,12 @@ msgstr "Berlin légifotó 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Berlin légifotó 2016"
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Erlangen légifotó (2016. 5,0 cm)"
@@ -16791,29 +16983,40 @@ msgstr ""
"imagico.de OSM képek térképezéshez: Észak-német nyugati parti "
"árapálysíkságok (infravörös)"
-msgid "Saxony latest aerial imagery"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
msgstr ""
-msgid "Saxony latest aerial imagery infrared"
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
msgstr ""
+msgid "Saxony latest aerial imagery"
+msgstr "Szászország legfrissebb légifotó"
+
+msgid "Saxony latest aerial imagery infrared"
+msgstr "Szászország legfrissebb légifotó, infravörös"
+
msgid "Saxony aerial imagery 2005"
-msgstr ""
+msgstr "Szászország légifotó 2016"
msgid "Saxony WebAtlasSN"
-msgstr ""
+msgstr "Szászország WebAtlasSN"
msgid "Saxony topographic map"
-msgstr ""
+msgstr "Szászország topográfiai térkép"
msgid "Saxony digital terrain model"
-msgstr ""
+msgstr "Szászország digitális terepmodell"
msgid "Mainz all aerial imageries"
-msgstr ""
+msgstr "Mainz összes légifotó"
msgid "Mainz latest aerial imagery"
-msgstr ""
+msgstr "Mainz legfrissebb légifotó"
+
+msgid "Munich latest aerial imagery 60cm"
+msgstr "München legfrissebb légifotó 60cm"
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr "imagico.de OSM képek térképezéshez: Qasigiannguit"
@@ -16866,35 +17069,44 @@ msgstr "Drónos légifelvétel Canaan (Haiti) 2015 november"
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr "Drónfelvétel Matthew (Haiti) 2016 október"
-msgid "FÖMI ortophoto 2000"
-msgstr "FÖMI ortofotó 2000"
+msgid "FÖMI orthophoto 2000"
+msgstr ""
-msgid "FÖMI ortophoto 2005"
-msgstr "FÖMI ortofotó 2005"
+msgid "FÖMI orthophoto 2005"
+msgstr ""
-msgid "Szeged ortophoto 2011"
-msgstr "Szeged ortofotó 2011"
+msgid "Szeged orthophoto 2011"
+msgstr ""
msgid "Inner part of Szeged"
msgstr "Szeged belváros"
-msgid "Törökbálint ortophoto 2013"
-msgstr "Törökbálint ortofotó 2013"
+msgid "Törökbálint orthophoto 2013"
+msgstr ""
msgid "5 cm resolution bald image"
msgstr "5 cm felbontású csupasz kép"
-msgid "Törökbálint ortophoto 2015"
-msgstr "Törökbálint ortofotó 2015"
+msgid "Törökbálint orthophoto 2015"
+msgstr ""
-msgid "Danube flood ortophoto 2013"
-msgstr "Dunai árvízi ortofotó 2013"
+msgid "Danube flood orthophoto 2013"
+msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Dunapart budapesti, szentendrei és szigetmonostori szakasza"
-msgid "Budapest district XI ortophoto 2015"
-msgstr "Budapest XI. kerületi ortofotó 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
+msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Magyarország (turistautak)"
@@ -17008,10 +17220,10 @@ msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Lithuania)"
msgid "geoportail.lu all layers"
-msgstr ""
+msgstr "geoportail.lu összes réteg"
msgid "geoportail.lu ortho 2016"
-msgstr ""
+msgstr "geoportail.lu ortofotó 2016"
msgid "Luxembourg Inspire Railway"
msgstr "Luxembourg Inspire Vasúti"
@@ -17034,6 +17246,14 @@ msgstr "PDOK légifotó Beeldmateriaal 25cm (WMTS)"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard -ortofotó 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr "imagico.de OSM képek térképezéshez: Nyugat-Karakorum"
@@ -17064,8 +17284,8 @@ msgid ""
msgstr ""
"imagico.de OSM képek térképezéshez: Willkanuta-hegység és Quelccaya-jégsapka"
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: Ortofotomapa (légifelvétel)"
@@ -17214,6 +17434,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr "imagico.de OSM képek térképezéshez: Vostochny Cosmodrome"
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Autó"
@@ -17289,6 +17517,9 @@ msgstr "Kanton Aargau 25cm (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Kanton Aargau 25cm (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr "Kanton Zürich ortofotó 2014/2015 10cm"
@@ -17305,10 +17536,10 @@ msgid "Stadt Zürich Luftbild 2011"
msgstr "Stadt Zürich Luftbild 2011"
msgid "Canton Solothurn latest aerial imagery SOGIS RGB"
-msgstr ""
+msgstr "Canton Solothurn legfrissebb légifotó SOGIS RGB"
msgid "Canton Solothurn latest aerial imagery SOGIS Infrared"
-msgstr ""
+msgstr "Canton Solothurn legfrissebb légifotó SOGIS infravörös"
msgid "Canton de Génève 5cm (SITG 2011)"
msgstr "Canton de Génève 5cm (SITG 2011)"
@@ -17395,33 +17626,76 @@ msgstr "TIGER 2012 utak rátét"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr "Új és elcsúszott utak TIGER (2015)"
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcellák"
msgid "NC Latest Orthoimagery"
msgstr "NC Latest Ortofotó"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr "U.S. erdőgazdasági utak"
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr "imagico.de OSM képek térképezéshez: Alaszka"
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr "NJ 2015 légifelvétel (infravörös)"
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr "NJ 2015 légifelvétel (természetes színű)"
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr "San Juan Metro Area: 2013 USACE ortofotók"
msgid "WA 2013 aerial imagery for San Juan County"
msgstr "WA San Juan megye légifelvétele"
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr "WA San Juan megye vektoros utcatérképe"
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr "Texas ortofotó"
@@ -17429,14 +17703,27 @@ msgid "Philadelphia 2015 Imagery"
msgstr "Philadelphia 2015 légifelvétel"
msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr "MD legfrissebb 6 colos légifotó"
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
msgstr ""
msgid "MD Three Inch Aerial Imagery"
msgstr "MD három colos légifelvétel"
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr "MD közlekedési alaptérkép"
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr "Delaware 2012 orotfotó"
@@ -17570,7 +17857,7 @@ msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
msgstr "Angol (OS) városrendezési tervek, Edinburgh 1893-1894 (NLS)"
msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
-msgstr ""
+msgstr "OS várostervek, Edinburgh 1940s-1960s (NLS)"
msgid "OS Town Plans, Elgin 1868 (NLS)"
msgstr "Angol (OS) városrendezési tervek, Elgin 1868 (NLS)"
@@ -17769,9 +18056,11 @@ msgstr ""
"könnyítése céljából készült. A basemap.at-ra van optimalizálva."
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
+"Automatikusan hozzárendeli a címet a kiválasztott objektumhoz Ausztriában. "
+"Data © Österreichisches Adressregister 2017, N 23806/2017."
msgid ""
"Allows the user to correct angle of buildings to 90 degrees, and aligns all "
@@ -17821,7 +18110,7 @@ msgstr ""
"is. Nézd meg a hivatkozást a szabvány parancsokhoz (arc, circle stb.)"
msgid "Tool for conflating data (matching and merging)."
-msgstr ""
+msgstr "Adatok egyesítésére szolgáló eszköz (megfeleltetés és összevonás)"
msgid "Downloads new data when you pan/zoom"
msgstr "Új adatokat tölt le amikor mozgatod a térképet vagy zoomolsz"
@@ -17944,6 +18233,7 @@ msgstr "Légifelvétel XML határvonalakat generál multipoligonból"
msgid "Export tiles from the imagery layer cache into the file system."
msgstr ""
+"Légifelvétel réteg gyorsítótárazott csempéinek exportálása a fájlrendszerbe."
msgid ""
"Database of imagery offsets: share and aquire imagery offsets with one "
@@ -17952,9 +18242,6 @@ msgstr ""
"Légifelvétel-eltolás adatbázis: eltolás értékeket lehet egyszerűen letölteni "
"vele, vagy megosztani másokkal."
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "WMSPlugin-stílusú légifelvétel igazító térképmód"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -17974,6 +18261,8 @@ msgid ""
"Extends ImproveWayAccuracy mode with helpers to place nodes at accurate "
"distances and angles."
msgstr ""
+"Kibővíti a Vonalpontosság növelő módot segédvonalakkal, hogy pontos "
+"távolságra és szögben lehessen pontokat elhelyezni."
msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr "A bővítmény leegyszerűsíti a beltéri folyosók térképezését."
@@ -18120,6 +18409,9 @@ msgid ""
"Recommends categories/tags on newly created OSM entities by analysing "
"spatial entities into training features and using SVM classification"
msgstr ""
+"Kategóriákat, címkéket javasol a frissen létrehozott OSM objektumokhoz, "
+"elemezve a térbeli entitásokat, gyakorló elemeket, SVM osztályozás "
+"használatával."
msgid "Import/export OSM data in PBF format"
msgstr "OSM adatok importálása és exportálása PBF formátumból/-ba."
@@ -18193,6 +18485,9 @@ msgid ""
"Expand a simple intersection to a roundabout in gradual steps. Select an "
"intersection node or a roundabout and press Crtl-Shift-R"
msgstr ""
+"Egy egyszerű kereszteződés kiterjesztése körforgalommá lépcsőzetesen. "
+"Válassz egy kereszteződés pontot vagy egy körforgalmat és nyomj Ctrl-Shift-R "
+"kombinációt."
msgid ""
"Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -18281,6 +18576,8 @@ msgid ""
"Adds a todo list dialog that makes it easy to go through large lists of "
"objects"
msgstr ""
+"Egy tennivaló dialógusablakot hoz létre, ami egyszerűbbé teszi sok objektum "
+"átnézését"
msgid ""
"Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
@@ -18315,7 +18612,7 @@ msgid "Plugin to digital sign OSM-Data"
msgstr "Bővítmény az OSM adatok digitális aláírására"
msgid "Editor to add turn lanes tags in highways"
-msgstr ""
+msgstr "Szerkesztőfelület utak kanyarodósávjainak beállításához"
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -18489,7 +18786,7 @@ msgstr "Kerekes járművel nem járható"
msgctxt "riding"
msgid "horse_riding"
-msgstr ""
+msgstr "lovaglás"
msgctxt "riding"
msgid "pitch"
@@ -19821,7 +20118,7 @@ msgid "Ford"
msgstr "Gázló"
msgid "stepping_stones"
-msgstr ""
+msgstr "lépőkő"
msgid "Ways"
msgstr "Egyéb utak"
@@ -19974,26 +20271,33 @@ msgstr "Kerékpár sáv/Nyomvonal"
msgid "Cycleway"
msgstr "Kerékpárút"
+msgctxt "cycleway"
msgid "lane"
-msgstr "sáv"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "út"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "szembe sáv"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "szembe út"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
-msgstr "szembeforgalom"
+msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "buszsávval közös"
+msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "közös sáv"
+msgstr ""
msgid "Cycleway left"
msgstr "Kerékpárút bal oldalon"
@@ -20471,7 +20775,7 @@ msgid "River"
msgstr "Folyam"
msgid "Lock"
-msgstr ""
+msgstr "Zsilip"
msgid "Canal"
msgstr "Csatorna"
@@ -21168,6 +21472,9 @@ msgstr "Tagsági kártya"
msgid "Wash"
msgstr "Autómosó"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Autókereskedés"
@@ -21524,10 +21831,10 @@ msgid "Guest House/Bed & Breakfast"
msgstr "Vendégház/ Szállás és reggeli"
msgid "Apartment"
-msgstr ""
+msgstr "Apartman"
msgid "Number of apartments"
-msgstr ""
+msgstr "Apartmanok száma"
msgid "Chalet"
msgstr "Apartman"
@@ -21597,10 +21904,10 @@ msgid "Takeaway"
msgstr "Elvitelre"
msgid "Delivery"
-msgstr ""
+msgstr "Házhozszállítás"
msgid "Mo-Su 12:00-22:00"
-msgstr ""
+msgstr "Házhozszállítás"
msgid "Fast Food"
msgstr "Gyorsétterem"
@@ -22173,7 +22480,7 @@ msgid "Automated Defibrillator"
msgstr "Automata defibrillátor"
msgid "Location description"
-msgstr ""
+msgstr "Helyszínleírás"
msgid "Phone Number"
msgstr "Telefonszám"
@@ -22401,7 +22708,7 @@ msgid "Telephone cards"
msgstr "Telefonkártya"
msgid "Internet Cafe"
-msgstr ""
+msgstr "Internetkávézó"
msgid "Internet Access"
msgstr "Internet hozzáférés"
@@ -22449,7 +22756,7 @@ msgid "Shows humidity"
msgstr "Kijelzi a páratartalmat"
msgid "Photo booth"
-msgstr ""
+msgstr "Fotófülke"
msgid "Recycling Container"
msgstr "Szelektív hulladékgyűjtő konténer"
@@ -22561,13 +22868,13 @@ msgid "Hide"
msgstr "Rejtek"
msgid "Lockable"
-msgstr ""
+msgstr "Zárható"
msgid "Water Point"
msgstr "Vízcsap"
msgid "Animal watering place"
-msgstr ""
+msgstr "Állat itató hely"
msgid "Compressed Air"
msgstr "Sűrített levegő/kerékfújó"
@@ -22990,10 +23297,6 @@ msgid "garages"
msgstr "garázsok"
msgctxt "building"
-msgid "industrial"
-msgstr "ipari"
-
-msgctxt "building"
msgid "school"
msgstr "iskola"
@@ -24382,23 +24685,38 @@ msgid "Castle"
msgstr "Vár"
msgid "stately"
-msgstr ""
+msgstr "kastély"
msgid "defensive"
-msgstr ""
+msgstr "vár"
msgid "fortress"
-msgstr ""
+msgstr "erőd"
msgid "manor"
-msgstr ""
+msgstr "nemesi majorság"
msgid "palace"
-msgstr ""
+msgstr "palota"
msgid "Archaeological Site"
msgstr "Régészeti lelőhely"
+msgid "tumulus"
+msgstr "halomsír"
+
+msgid "megalith"
+msgstr "megalit"
+
+msgid "fortification"
+msgstr "erődítmény"
+
+msgid "settlement"
+msgstr "település"
+
+msgid "necropolis"
+msgstr "temetkezőhely"
+
msgid "Battlefield"
msgstr "Csatamező"
@@ -25965,6 +26283,21 @@ msgstr "Adminisztratív központ"
msgid "Label point"
msgstr "Felirat pontja"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "Hely"
@@ -26068,10 +26401,10 @@ msgid "Bicycle Route"
msgstr "Kerékpár útvonal"
msgid "national"
-msgstr ""
+msgstr "nemzeti"
msgid "local"
-msgstr ""
+msgstr "helyi"
msgid "Mountain Biking Route"
msgstr "Hegyikerékpár útvonal"
@@ -26275,22 +26608,22 @@ msgid "Test"
msgstr "Próba"
msgid "View website"
-msgstr ""
+msgstr "Weboldal megtekintése"
msgid "View URL"
-msgstr ""
+msgstr "URL megtekintése"
msgid "Send Email"
-msgstr ""
+msgstr "Email küldése"
msgid "View image"
-msgstr ""
+msgstr "Kép megtekintése"
msgid "View %name% article"
-msgstr ""
+msgstr "%name% szócikk megtekintése"
msgid "View Wikidata page"
-msgstr ""
+msgstr "Wikipédia oldal megtekintése"
msgid "View UNESCO sheet"
msgstr ""
@@ -27532,15 +27865,6 @@ msgstr "Helyi képek importálása"
msgid "Import pictures into Mapillary layer"
msgstr "Képek importálása a Mapillary rétegre"
-msgid "Select pictures"
-msgstr "Képek kiválasztása"
-
-msgid "Import pictures into sequence"
-msgstr "Képek importálása sorozatba"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Képek importálása a Mapillary rétegre egy sorozatba"
-
msgid "Join mode"
msgstr "Összekapcsolási mód"
@@ -27783,6 +28107,43 @@ msgstr "Kiválasztott kép követése"
msgid "Go forward"
msgstr "Menj előre"
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Importálás"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -27818,6 +28179,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -27827,6 +28191,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -27836,15 +28203,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -27877,7 +28262,13 @@ msgstr[1] "{0} kép elfordítva"
msgid "2 images unjoined"
msgstr "2 kép szétválasztva"
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -27896,9 +28287,6 @@ msgstr ""
"A letöltött OSM terület túl nagy. A letöltési mód a réteg újrakezdéséig "
"módosítva lett OSM területre."
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr "Letöltés"
@@ -28605,6 +28993,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -29458,6 +29849,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -29478,46 +29875,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
-msgstr ""
+msgid "Replace Geometry"
+msgstr "Geometria cseréje"
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
-msgstr "Összeolvasztás beállításai"
+msgid "List of tags to merge"
+msgstr ""
-msgid "Generate matches"
-msgstr "Egyezések keresése"
+msgid "except"
+msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Geometria cseréje"
+msgid "Advanced Example"
+msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
+msgstr "Összeolvasztás beállításai"
+
+msgid "Generate matches"
+msgstr "Egyezések keresése"
+
+msgid "Merging"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -29550,6 +29955,12 @@ msgstr "Üres kijelölés"
msgid "Freeze reference selection"
msgstr "Referencia kijelölés fagyasztása"
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -29929,9 +30340,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr "Importálás"
-
msgid "GPS Blams"
msgstr ""
@@ -30427,9 +30835,6 @@ msgstr "Légifelvétel-eltolás betöltése..."
msgid "Error processing XML response: {0}"
msgstr "Hiba történt az XML válasz feldolgozása közben: {0}"
-msgid "Offset"
-msgstr "Eltolás"
-
msgid "Imagery Offset Database"
msgstr "Légifelvétel-eltolás adatbázis"
@@ -30569,24 +30974,6 @@ msgstr "Új eltolás feltöltése..."
msgid "This string should be 3 to 200 letters long."
msgstr "A szöveg 3 - 200 karakter hosszú kell legyen."
-msgid "Adjust imagery"
-msgstr "Légifelvétel igazítása"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "A kiválasztott légifelvétel-réteg pozicionálásának igazítása"
-
-msgid "Please select the imagery layer to adjust."
-msgstr ""
-
-msgid "Start adjusting"
-msgstr "Igazítás megkezdése"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "Jelenleg nincs ábrázoló réteg az igazításhoz."
-
-msgid "No layers to adjust"
-msgstr "Nincs igazítandó réteg"
-
msgid "Normal"
msgstr "Normál"
@@ -30599,12 +30986,21 @@ msgstr "Forgatás 180"
msgid "Rotate 270"
msgstr "Forgatás 270"
-msgid "Previous image"
-msgstr "Korábbi kép"
+msgid "WayPoint Image"
+msgstr "WayPoint kép"
+
+msgid "Display non-geotagged photos"
+msgstr "Nem geo-cimkézett fotók mutatása"
+
+msgid "Imported Images"
+msgstr "betöltött képek"
msgid "Next image"
msgstr "Következő kép"
+msgid "Previous image"
+msgstr "Korábbi kép"
+
msgid "Rotate left"
msgstr "Balra forgatás"
@@ -30617,15 +31013,6 @@ msgstr "Jobbra forgatás"
msgid "Rotate image right"
msgstr "Képi jobbra forgatás"
-msgid "WayPoint Image"
-msgstr "WayPoint kép"
-
-msgid "Display non-geotagged photos"
-msgstr "Nem geo-cimkézett fotók mutatása"
-
-msgid "Imported Images"
-msgstr "betöltött képek"
-
msgid "Import vector graphics"
msgstr "Vektorgrafikák betöltés"
@@ -32820,9 +33207,6 @@ msgstr "Összekapcsol"
msgid "Public Transport: Join GTFS stops"
msgstr "Tömegközlekedés: GTFSStops összekapcsolása"
-msgid "Id"
-msgstr "ID"
-
msgid "State"
msgstr "Állam"
diff --git a/i18n/po/hy.po b/i18n/po/hy.po
index 0dfdc0f..b0cdf2d 100644
--- a/i18n/po/hy.po
+++ b/i18n/po/hy.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2011-04-13 21:51+0000\n"
"Last-Translator: Gev777 <Unknown>\n"
"Language-Team: Armenian <hy at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:36+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:36+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: hy\n"
msgid "Cancel"
@@ -3305,6 +3305,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3313,6 +3316,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3977,6 +3985,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4033,6 +4044,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9011,46 +9025,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9165,7 +9182,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9279,9 +9302,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9292,8 +9312,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9455,16 +9478,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9594,12 +9607,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9759,6 +9782,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11175,15 +11228,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11232,6 +11276,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12407,6 +12454,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13549,6 +13599,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13747,9 +13800,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14453,6 +14503,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14464,6 +14522,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14476,6 +14546,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14831,6 +14925,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14933,6 +15035,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14984,10 +15089,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15020,6 +15125,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15072,6 +15252,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15218,6 +15404,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15257,6 +15449,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15281,6 +15481,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15325,34 +15528,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15493,6 +15705,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15521,7 +15741,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15670,6 +15890,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15745,6 +15973,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15850,33 +16081,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15886,12 +16160,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16210,8 +16497,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16352,9 +16639,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18259,24 +18543,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19449,6 +19740,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21264,10 +21558,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22668,6 +22958,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24209,6 +24514,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25705,15 +26025,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25955,6 +26266,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25990,6 +26338,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25999,6 +26350,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26008,15 +26362,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26049,7 +26421,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26066,9 +26444,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26761,6 +27136,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27599,6 +27977,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27619,46 +28003,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27691,6 +28083,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28066,9 +28464,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28553,9 +28948,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28674,42 +29066,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28722,15 +29105,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30823,9 +31197,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/ia.po b/i18n/po/ia.po
index 26fee7c..7ca8e4b 100644
--- a/i18n/po/ia.po
+++ b/i18n/po/ia.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2011-08-29 01:02+0000\n"
"Last-Translator: Emilio Sepulveda <Unknown>\n"
"Language-Team: Interlingua <ia at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:53+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:51+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: ia\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3305,6 +3305,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3313,6 +3316,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3977,6 +3985,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4033,6 +4044,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9011,46 +9025,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9165,7 +9182,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9279,9 +9302,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9292,8 +9312,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9455,16 +9478,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9594,12 +9607,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9759,6 +9782,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11175,15 +11228,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11232,6 +11276,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12407,6 +12454,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13549,6 +13599,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13747,9 +13800,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14453,6 +14503,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14464,6 +14522,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14476,6 +14546,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14831,6 +14925,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14933,6 +15035,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14984,10 +15089,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15020,6 +15125,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15072,6 +15252,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15218,6 +15404,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15257,6 +15449,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15281,6 +15481,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15325,34 +15528,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15493,6 +15705,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15521,7 +15741,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15670,6 +15890,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15745,6 +15973,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15850,33 +16081,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15886,12 +16160,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16210,8 +16497,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16352,9 +16639,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18259,24 +18543,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19449,6 +19740,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21264,10 +21558,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22668,6 +22958,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24209,6 +24514,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25705,15 +26025,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25955,6 +26266,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25990,6 +26338,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25999,6 +26350,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26008,15 +26362,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26049,7 +26421,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26066,9 +26444,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26761,6 +27136,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27599,6 +27977,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27619,46 +28003,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27691,6 +28083,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28066,9 +28464,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28553,9 +28948,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28674,42 +29066,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28722,15 +29105,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30823,9 +31197,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/id.po b/i18n/po/id.po
index e1fbec8..c6aeaed 100644
--- a/i18n/po/id.po
+++ b/i18n/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2016-03-10 03:36+0000\n"
"Last-Translator: Ezagren <ezagren at gmail.com>\n"
"Language-Team: Indonesian <id at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:54+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:52+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: id\n"
"X-Language: id_ID\n"
@@ -3505,6 +3505,9 @@ msgstr "Proyeksi"
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3513,6 +3516,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4210,6 +4218,9 @@ msgstr "tes ini memeriksa jika multipoligon valid/berlaku"
msgid "Area style way is not closed"
msgstr "Model area garis tidak menutup"
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "Tidak ada garis terluar untuk multipoligon"
@@ -4266,6 +4277,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr "Peran tidak berguna untuk anggota multipoligon"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "Bukan garis di multipoligon"
@@ -9529,46 +9543,49 @@ msgid "{0} object to delete:"
msgid_plural "{0} objects to delete:"
msgstr[0] "{0} objek untuk dihapus:"
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
+msgstr "Pergeseran"
+
+msgid "Tile download projection"
msgstr ""
-msgid "Metadata "
+msgid "Tile display projection"
msgstr ""
-msgid "Load tile"
+msgid "Current zoom"
msgstr ""
-msgid "Auto zoom"
+msgid "Show tile info"
msgstr ""
-msgid "Auto load tiles"
-msgstr "Memuat indeks otomatis"
+msgid "Tile Info"
+msgstr ""
-msgid "Show errors"
+msgid "Tile name"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile size"
msgstr ""
-msgid "Zoom to native resolution"
-msgstr "Memperbesar resolusi asal"
+msgid "Tile display size"
+msgstr ""
-msgid "Change resolution"
-msgstr "Mengubah resolusi"
+msgid "Reprojection"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Meningkatkan perbesaran"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Menurunkan perbesaran"
+msgid "Metadata "
+msgstr ""
-msgid "Flush tile cache"
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9679,8 +9696,14 @@ msgstr[0] "{0} jalur, "
msgid "Save GPX file"
msgstr "Simpan file GPX"
-msgid "Imagery fade"
-msgstr "Citra satelit pudar"
+msgid "Id"
+msgstr "ID"
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
+msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
@@ -9794,9 +9817,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Simpan file OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "EPSG:4326 dan proyeksi Mercator mendukung"
-
msgid "Validation errors"
msgstr "Kesalahan validasi"
@@ -9807,8 +9827,11 @@ msgid "Set WMS Bookmark"
msgstr "Pengaturan bookmark WMS"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9979,20 +10002,6 @@ msgstr "Anda harus memilih sebuah track GPX"
msgid "No selected GPX track"
msgstr "Tidak ada track GPX yang dipilih"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Kesalahan ketika mencocokkan zona waktu.\n"
-"Format yang diharapkan: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Kesalahan ketika mencocokkan offset\n"
-"Format yang diharapkan: {0}"
-
msgid "Geotagged Images"
msgstr "Citra Geotag"
@@ -10130,12 +10139,26 @@ msgstr ""
"\n"
"Waktu GPS: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Kesalahan ketika mencocokkan offset\n"
+"Format yang diharapkan: {0}"
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Kesalahan ketika mencocokkan zona waktu.\n"
+"Format yang diharapkan: {0}"
+
msgid "Choose visible tracks"
msgstr "Pilih jalur yang terlihat"
@@ -10312,6 +10335,36 @@ msgstr "Penanda dari nama point/titik"
msgid "Named Trackpoints from {0}"
msgstr "Nama titik trek dari {0}"
+msgid "Auto load tiles"
+msgstr "Memuat indeks otomatis"
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr "Menurunkan perbesaran"
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr "Meningkatkan perbesaran"
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr "Mengubah resolusi"
+
+msgid "Zoom to native resolution"
+msgstr "Memperbesar resolusi asal"
+
msgid "gps marker"
msgstr "Penanda GPS"
@@ -11880,15 +11933,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr "citra satelit pudar"
-
-msgid "Fade Color: "
-msgstr "Warna Pudar: "
-
-msgid "Fade amount: "
-msgstr "Jumlah yang meragukan : "
-
msgid "Soft"
msgstr "Lembut"
@@ -11938,6 +11982,9 @@ msgstr "Tampilan belakang citra satelit: Standar"
msgid "Available default entries:"
msgstr "Tersedia entri pengaturan awal"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "Entri yang dipilih"
@@ -13190,6 +13237,9 @@ msgstr "Atribut Tambahan:"
msgid "Unknown requisite: {0}"
msgstr "Tidak diketahui keperluan: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "ekspresi anggota ilegal: {0}"
@@ -14414,6 +14464,9 @@ msgstr "digantikan oleh plugin baru {0}"
msgid "no longer required"
msgstr "Tidak diperlukan lagi"
+msgid "Plugin information"
+msgstr "Informasi plugin"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -14632,9 +14685,6 @@ msgstr ""
"Plugin telah dihapus dari konfigurasi. Harap restart JOSM untuk memuat "
"plugin."
-msgid "Plugin information"
-msgstr "Informasi plugin"
-
msgid "no description available"
msgstr "Tidak ada deskripsi yang tersedia"
@@ -15448,6 +15498,14 @@ msgid "farmland"
msgstr "Lahan Pertanian"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "Permukiman"
@@ -15459,6 +15517,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr "Semak"
@@ -15471,6 +15541,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "Jalan yang terasosiasi"
@@ -15826,6 +15920,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -15928,6 +16030,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15979,10 +16084,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -16015,6 +16120,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -16067,6 +16247,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -16213,6 +16399,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16252,6 +16444,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -16276,6 +16476,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -16320,34 +16523,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -16488,6 +16700,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -16516,7 +16736,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -16665,6 +16885,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -16740,6 +16968,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -16845,33 +17076,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -16881,12 +17155,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -17209,8 +17496,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -17373,9 +17660,6 @@ msgstr ""
"Database citra satelit offset: berbagi dan mendapatkan citra satelit dengan "
"satu tombol."
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -19347,26 +19631,33 @@ msgstr ""
msgid "Cycleway"
msgstr "Jalan melingkar"
+msgctxt "cycleway"
msgid "lane"
-msgstr "jalur"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "trek"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "jalur_berlawanan"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "trek_berlawanan"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
-msgstr "berlawanan"
+msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "berbagi_jalur bis"
+msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "shared_lane"
+msgstr ""
msgid "Cycleway left"
msgstr "Jalan melingkar kiri"
@@ -20537,6 +20828,9 @@ msgstr ""
msgid "Wash"
msgstr "Cuci"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Penjual Mobil"
@@ -22352,10 +22646,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -23756,6 +24046,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Situs Arkeologi"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Tempat pertempuran"
@@ -25297,6 +25602,21 @@ msgstr "Pusat Administrasi"
msgid "Label point"
msgstr "Label titik"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "Site"
@@ -26817,15 +27137,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -27067,6 +27378,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "import"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -27102,6 +27450,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -27111,6 +27462,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -27120,15 +27474,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -27161,7 +27533,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -27178,9 +27556,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -27959,6 +28334,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -28849,6 +29227,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -28869,46 +29253,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
+msgstr "Ganti Geometri"
+
+msgid "Merge Tags"
msgstr ""
-msgid "<Please select data>"
+msgid "List of tags to merge"
msgstr ""
-msgid "Configure conflation settings"
+msgid "except"
msgstr ""
-msgid "Generate matches"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Reference:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Subject:"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Programming"
+msgid "Simple Example"
msgstr ""
-msgid "Merging"
+msgid "Advanced Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Ganti Geometri"
+msgid "<Please select data>"
+msgstr ""
-msgid "Merge Tags"
+msgid "Configure conflation settings"
msgstr ""
-msgid "List of tags to merge"
+msgid "Generate matches"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Merging"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -28941,6 +29333,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -29324,9 +29722,6 @@ msgstr "Import Globalstat"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Import Data dari Globalsat Datalogger DG100 kedalam layer GPX."
-msgid "Import"
-msgstr "import"
-
msgid "GPS Blams"
msgstr "GPS Blams"
@@ -29845,9 +30240,6 @@ msgstr "Memuat pegeseran citra satelit..."
msgid "Error processing XML response: {0}"
msgstr "Kesalahan pengolahan XML respon: {0}"
-msgid "Offset"
-msgstr "Pergeseran"
-
msgid "Imagery Offset Database"
msgstr "Database pergeseran citra"
@@ -29984,24 +30376,6 @@ msgstr "Mengunggah pergeseran baru"
msgid "This string should be 3 to 200 letters long."
msgstr "String harus terdeiri dari 3 sampai 200 huruf"
-msgid "Adjust imagery"
-msgstr "Menyesuaikan citra"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Menyesuaikan posisi dari layer citra yang terpilih"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Tolong pilih layer citra untuk disesuaikan."
-
-msgid "Start adjusting"
-msgstr "Memulai penyesuaian"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "Saat ini tidak ada layer citra yang disesuaikan"
-
-msgid "No layers to adjust"
-msgstr "Tidak ada layer yang disesuaikan"
-
msgid "Normal"
msgstr "Normal"
@@ -30014,12 +30388,21 @@ msgstr "Putar 180"
msgid "Rotate 270"
msgstr "Putar 270"
-msgid "Previous image"
-msgstr "Gambar sebelumnya"
+msgid "WayPoint Image"
+msgstr "gambar titik"
+
+msgid "Display non-geotagged photos"
+msgstr "Menampilkan foto non-geotagged"
+
+msgid "Imported Images"
+msgstr "Gambar diimport"
msgid "Next image"
msgstr "Gambar berikutnya"
+msgid "Previous image"
+msgstr "Gambar sebelumnya"
+
msgid "Rotate left"
msgstr "Putar kiri"
@@ -30032,15 +30415,6 @@ msgstr "Putar kanan"
msgid "Rotate image right"
msgstr "Putar gambar ke kanan"
-msgid "WayPoint Image"
-msgstr "gambar titik"
-
-msgid "Display non-geotagged photos"
-msgstr "Menampilkan foto non-geotagged"
-
-msgid "Imported Images"
-msgstr "Gambar diimport"
-
msgid "Import vector graphics"
msgstr "Import vektor grafik"
@@ -32232,9 +32606,6 @@ msgstr "Gabung"
msgid "Public Transport: Join GTFS stops"
msgstr "Transportasi Umumr: Gabungkan pemberhentian GTFS"
-msgid "Id"
-msgstr "ID"
-
msgid "State"
msgstr "Negara Bagian / Provinsi"
diff --git a/i18n/po/is.po b/i18n/po/is.po
index 7ecb66e..3cc8057 100644
--- a/i18n/po/is.po
+++ b/i18n/po/is.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2015-11-06 00:32+0000\n"
"Last-Translator: Stefán Örvar Sigmundsson <stefan.orvar.sigmundsson at emi.is>\n"
"Language-Team: Icelandic <is at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:53+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:51+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: is\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3324,6 +3324,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3332,6 +3335,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3996,6 +4004,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4052,6 +4063,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9046,46 +9060,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} hlut verður eytt:"
msgstr[1] "{0} hlutum verður eytt:"
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
-msgstr "Breyta upplausn"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9200,7 +9217,13 @@ msgstr[1] "{0} ferlar, "
msgid "Save GPX file"
msgstr "Vista GPX skrá"
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9314,9 +9337,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Vista OSM skrá"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr "Villur sem fundust við athugun"
@@ -9327,8 +9347,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9490,16 +9513,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9629,12 +9642,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9794,6 +9817,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr "Breyta upplausn"
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr "gps punktur"
@@ -11216,15 +11269,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11273,6 +11317,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12452,6 +12499,9 @@ msgstr "Valfrjáls eigind:"
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13597,6 +13647,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13796,9 +13849,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14504,6 +14554,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14515,6 +14573,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14527,6 +14597,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14882,6 +14976,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14984,6 +15086,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15035,10 +15140,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15071,6 +15176,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15123,6 +15303,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15269,6 +15455,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15308,6 +15500,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15332,6 +15532,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15376,34 +15579,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15544,6 +15756,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15572,7 +15792,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15721,6 +15941,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15796,6 +16024,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15901,33 +16132,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15937,12 +16211,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16261,8 +16548,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16404,9 +16691,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18311,24 +18595,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19501,6 +19792,9 @@ msgstr ""
msgid "Wash"
msgstr "Bílaþvottastöð"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21316,10 +21610,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22720,6 +23010,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Fornleifasvæði"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Vígvöllur"
@@ -24261,6 +24566,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25757,15 +26077,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -26007,6 +26318,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26042,6 +26390,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26051,6 +26402,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26060,15 +26414,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26101,7 +26473,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26118,9 +26496,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26813,6 +27188,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27651,6 +28029,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27671,46 +28055,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
+msgstr ""
+
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27743,6 +28135,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28118,9 +28516,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28605,9 +29000,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28726,42 +29118,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
-msgstr ""
+msgid "Next image"
+msgstr "Næsta mynd"
msgid "Previous image"
msgstr "Fyrri mynd"
-msgid "Next image"
-msgstr "Næsta mynd"
-
msgid "Rotate left"
msgstr ""
@@ -28774,15 +29157,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30875,9 +31249,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr "Fylki"
diff --git a/i18n/po/it.po b/i18n/po/it.po
index 7f10af0..214de8c 100644
--- a/i18n/po/it.po
+++ b/i18n/po/it.po
@@ -4,16 +4,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm 20081003\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
-"PO-Revision-Date: 2017-03-22 08:29+0000\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"PO-Revision-Date: 2017-05-02 14:16+0000\n"
"Last-Translator: Moire <Unknown>\n"
"Language-Team: Italian <talk-it at lists.openstreetmap.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:55+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:52+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: it\n"
"X-Language: it_IT\n"
"X-Source-Language: en\n"
@@ -1521,7 +1521,7 @@ msgid "Toggles the global setting ''{0}''."
msgstr "Commuta l''impostazione globale ''{0}''."
msgid "Discourage upload"
-msgstr ""
+msgstr "Scoraggia il caricamento"
msgid "UnGlue Ways"
msgstr "Separa percorsi"
@@ -2818,6 +2818,8 @@ msgstr "tutti gli oggetti incompleti"
msgid "all deleted objects (checkbox <b>{0}</b> must be enabled)"
msgstr ""
+"Tutti gli oggetti eliminati (la casella di spunta <b>{0}</b> deve essere "
+"abilitata)"
msgid "related objects"
msgstr "oggetti collegati"
@@ -3665,6 +3667,9 @@ msgstr "Proiezione"
msgid "Matrix set identifier"
msgstr "Identificatore Matrix set"
+msgid "No default layer selected, choosing first layer."
+msgstr "Nessun livello selezionato, scelgo il primo."
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Nessun livello selezionato da getCapabilities document: {0}"
@@ -3675,6 +3680,13 @@ msgstr ""
"finale {2}"
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+"Impossibile usare il livello {0} perché non sono stati trovati dei formati "
+"compatibili. Il livello è disponibile nei formati: {1}"
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4397,6 +4409,9 @@ msgstr "Questo controllo verifica che i multi-poligoni siano validi."
msgid "Area style way is not closed"
msgstr "Percorso di tipo area non chiuso"
+msgid "No outer way for boundary"
+msgstr "Il confine non contiene un percorso esterno"
+
msgid "No outer way for multipolygon"
msgstr "Nessun percorso esterno per il multi-poligono"
@@ -4461,6 +4476,9 @@ msgstr "Tracciato esterno del multipoligono"
msgid "No useful role for multipolygon member"
msgstr "Nessun ruolo utile per il membro del multi-poligono"
+msgid "Non-Way in boundary"
+msgstr "Il confine contiene un elemento che non è un percorso"
+
msgid "Non-Way in multipolygon"
msgstr "Nel multi-poligono è presente un elemento che non è un percorso"
@@ -4608,15 +4626,17 @@ msgid ""
"Type ''{0}'' of relation member with role ''{1}'' does not match accepted "
"types ''{2}'' in template {3}"
msgstr ""
+"Il tipo ''{0}'' del membro della relazione con ruolo ''{1}'' non è tra "
+"quelli accettati ''{2}'' nel modello {3}"
msgid "<empty>"
msgstr "<vuoto>"
msgid "Role ''{0}'' unknown in templates ''{1}''"
-msgstr ""
+msgstr "Ruolo ''{0}'' sconosciuto nei modelli ''{1}''"
msgid "Empty role type found when expecting one of ''{0}''"
-msgstr ""
+msgstr "Nessun ruolo trovato invece che un ruolo tra ''{0}''"
msgid "Role ''{0}'' missing"
msgstr "Manca un membro con ruolo \"{0}\""
@@ -5224,6 +5244,8 @@ msgid ""
"Set the preferences+data+cache directory (cache directory will be "
"josm.home/cache)"
msgstr ""
+"Impostare le cartelle preferenze+data+cache (la cartella della cache sarà "
+"impostata su josm.home/cache)"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -5426,6 +5448,8 @@ msgstr "Barra degli strumenti"
msgid ""
"Toggles the visibility of the main toolbar (i.e., the horizontal toolbar)"
msgstr ""
+"Commuta la visibilità della barra degli strumenti principale (cioè la barra "
+"orizzontale)"
msgid "Edit toolbar"
msgstr "Barra degli strumenti di modifica"
@@ -5604,6 +5628,10 @@ msgid ""
"addresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid "
"too.</html>"
msgstr ""
+"<html>In alternativa, è possibile inserire un <strong>indirizzo dei "
+"tasselli</strong> per un solo tassello nel formato <i>zoomlevel/x/y</i>, per "
+"esempio <i>15/256/233</i>. Sono validi anche gli indirizzi dei tasselli nel "
+"formato <i>zoom,x,y</i>.</html>"
msgid "Tile address:"
msgstr "Indirizzo del tassello:"
@@ -6057,6 +6085,8 @@ msgstr "Primitiva"
msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
+"I membri uniti non sono ancora bloccati. Impossibile costruire il comando di "
+"risoluzione"
msgid "<undefined>"
msgstr "<indefinito>"
@@ -6519,16 +6549,16 @@ msgstr ""
"sopra."
msgid "Resolve to my versions"
-msgstr ""
+msgstr "Risolvi usando le mie versioni"
msgid "Resolves all unresolved conflicts to ''my'' version"
-msgstr ""
+msgstr "Risolvi tutti i conflitti rimanenti usando la ''mia'' versione"
msgid "Resolve to their versions"
-msgstr ""
+msgstr "Risolvi usando la loro versione"
msgid "Resolves all unresolved conflicts to ''their'' version"
-msgstr ""
+msgstr "Risolvi tutti i conflitti rimanenti usando la ''loro'' versione"
msgid "There was {0} conflict detected."
msgid_plural "There were {0} conflicts detected."
@@ -7386,6 +7416,8 @@ msgid ""
"Download the current version of the changed objects in the selected "
"changesets"
msgstr ""
+"Scarica la versione corrente degli oggetti modificati nei gruppi di modifica "
+"selezionati"
msgid "My changesets"
msgstr "Gruppi di modifiche personali"
@@ -7905,7 +7937,7 @@ msgid "Gamma"
msgstr "Gamma"
msgid "Adjust sharpness/blur value of the layer."
-msgstr ""
+msgstr "Regola i valori di nitidezza/sfocatura del livello"
msgid "Sharpness"
msgstr "Nitidezza"
@@ -8124,7 +8156,7 @@ msgid "Remember last used tags after a restart"
msgstr "Ricorda le ultime etichette usati, dopo il riavvio"
msgid "Recent tags with existing key"
-msgstr ""
+msgstr "Etichette recenti con una chiave esistente"
msgid "Enable"
msgstr "Abilita"
@@ -8134,15 +8166,18 @@ msgstr "Nascondi"
msgid "Refresh recent tags list after applying tag"
msgstr ""
+"Aggiorna la lista delle etichette recenti dopo aver applicato un'etichetta"
msgid "No refresh"
msgstr "Non aggiornare"
msgid "Refresh tag status only (enabled / disabled)"
-msgstr ""
+msgstr "Aggiorna solo lo stato delle etichette (abilitato / disabilitato)"
msgid "Refresh tag status and list of recently added tags"
msgstr ""
+"Aggiorna lo stato delle etichette e la lista delle etichette recentemente "
+"aggiunte"
msgid "to apply first suggestion"
msgstr "applicare il primo suggerimento"
@@ -8340,7 +8375,7 @@ msgid "Refers to"
msgstr "Fa riferimento a"
msgid "Cannot add {0} since it is not part of dataset"
-msgstr ""
+msgstr "Impossibile aggiungere {0} perché non fa parte dell'insieme di dati"
msgid "Download referring relations"
msgstr "Scarica le relazioni collegate"
@@ -8470,10 +8505,10 @@ msgid "Apply the updates and close the dialog"
msgstr "Applica gli aggiornamenti e chiudi la finestra"
msgid "Relation Editor: Refresh"
-msgstr ""
+msgstr "Editor delle relazioni: Aggiorna"
msgid "Refresh relation from data layer"
-msgstr ""
+msgstr "Aggiorna la relazione dal livello dei dati"
msgid "Refresh"
msgstr "Aggiorna"
@@ -10060,47 +10095,50 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} oggetto da eliminare:"
msgstr[1] "{0} oggetti da eliminare:"
+msgid "Native projections"
+msgstr "Proiezioni native"
+
+msgid "Offset"
+msgstr "Scostamento"
+
+msgid "Tile download projection"
+msgstr ""
+
+msgid "Tile display projection"
+msgstr ""
+
+msgid "Current zoom"
+msgstr "Ingrandimento corrente"
+
msgid "Show tile info"
msgstr "Mostra informazioni dei tasselli"
msgid "Tile Info"
msgstr "Info Tasselli"
-msgid "Metadata "
-msgstr "Metadata "
-
-msgid "Load tile"
-msgstr "Carica tassello"
+msgid "Tile name"
+msgstr "Nome dei tasselli"
-msgid "Auto zoom"
-msgstr "Zoom automatico"
+msgid "Tile URL"
+msgstr "Indirizzo URL dei tasselli"
-msgid "Auto load tiles"
-msgstr "Carica automaticamente i tasselli"
+msgid "Tile size"
+msgstr "Dimensione dei tasselli"
-msgid "Show errors"
-msgstr "Mostra errori"
-
-msgid "Load all tiles"
-msgstr "Carica tutti i tasselli"
-
-msgid "Load all error tiles"
+msgid "Tile display size"
msgstr ""
-msgid "Zoom to native resolution"
-msgstr "Ingrandisci la visuale alla risoluzione originale"
-
-msgid "Change resolution"
-msgstr "Cambia risoluzione"
+msgid "Reprojection"
+msgstr "Riproiezione"
-msgid "Increase zoom"
-msgstr "Aumenta l''ingrandimento"
+msgid "Reprojected tile size"
+msgstr "Dimensione dei tasselli riproiettati"
-msgid "Decrease zoom"
-msgstr "Diminuisci l''ingrandimento"
+msgid "Metadata "
+msgstr "Metadata "
-msgid "Flush tile cache"
-msgstr ""
+msgid "Load tile"
+msgstr "Carica tassello"
msgid "Failed to create tile source"
msgstr "Impossibile creare la fonte dei tasselli"
@@ -10113,6 +10151,8 @@ msgstr "ingrandire per caricare più tasselli"
msgid "increase tiles zoom level (change resolution) to see more detail"
msgstr ""
+"aumentare il livello di ingrandimento dei tasselli (cambio di risoluzione) "
+"per vedere altri dettagli"
msgid "No tiles at this zoom level"
msgstr "Nessun tassello in questo livello di ingrandimento"
@@ -10151,6 +10191,8 @@ msgid ""
"Aerial imagery \"{0}\" might be misaligned. Please check its offset using "
"GPS tracks!"
msgstr ""
+"Le immagini satellitari ''{0}'' potrebbero essere disallineate. Verificare "
+"lo scostamento mediante tracce GPS!"
msgid "http://wiki.openstreetmap.org/wiki/Using_Imagery"
msgstr "http://wiki.openstreetmap.org/wiki/Using_Imagery"
@@ -10214,8 +10256,14 @@ msgstr[1] "{0} percorsi, "
msgid "Save GPX file"
msgstr "Salva in un file GPX"
-msgid "Imagery fade"
-msgstr "Dissolvenza delle immagini aeree"
+msgid "Id"
+msgstr "ID"
+
+msgid "Min. zoom"
+msgstr "Ingrandimento minimo"
+
+msgid "Max. zoom"
+msgstr "Ingrandimento massimo"
msgid "Unsupported imagery type: {0}"
msgstr "Tipo di immagini non supportato: {0}"
@@ -10236,13 +10284,13 @@ msgid "All projections are supported"
msgstr "Sono supportate tutte le proiezioni"
msgid "The layer {0} does not support the new projection {1}."
-msgstr ""
+msgstr "Il livello {0} non supporta la nuova proiezione {1}."
msgid "Supported projections are: {0}"
msgstr "Le proiezioni supportate sono: {0}"
msgid "Change the projection again or remove the layer."
-msgstr ""
+msgstr "Impostare una nuova proiezione o rimuovere il livello."
msgid "Save Layer"
msgstr "Salva livello"
@@ -10288,7 +10336,7 @@ msgid "Upload is discouraged"
msgstr "Il caricamento è sconsigliato"
msgid "Upload is blocked"
-msgstr ""
+msgstr "Il caricamento è bloccato"
msgid "Convert to GPX layer"
msgstr "Converti in un livello GPX"
@@ -10330,9 +10378,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Salva file OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "Sono supportate le proiezioni EPSG:4326 e di Mercatore"
-
msgid "Validation errors"
msgstr "Errori di verifica"
@@ -10343,11 +10388,13 @@ msgid "Set WMS Bookmark"
msgstr "Imposta segnalibro WMS"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
msgstr ""
-"JOSM userà EPSG:4326 per interrogare il server, ma il risultato può variare "
-"in base al server WMS"
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
+msgstr ""
+"Impossibile trovare una proiezione supportata dal livello {0}. Userò {1}."
msgid "Correlate to GPX"
msgstr "Correlazione ai dati GPX"
@@ -10522,20 +10569,6 @@ msgstr "Selezionare un tracciato GPX"
msgid "No selected GPX track"
msgstr "Nessun tracciato GPX selezionato"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Errore nella interpretazione del fuso orario.\n"
-"Formato atteso: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Errore durante l''analisi dello scostamento.\n"
-"Formato atteso: {0}."
-
msgid "Geotagged Images"
msgstr "Immagini georeferenziate"
@@ -10677,12 +10710,26 @@ msgstr ""
"\n"
"temo GPS: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Errore durante l''analisi dello scostamento.\n"
+"Formato atteso: {0}."
+
msgid "Show thumbnails"
msgstr "Mostra le miniature"
msgid "Show image thumbnails instead of icons."
msgstr "Mostra le miniature al posto delle icone."
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Errore nella interpretazione del fuso orario.\n"
+"Formato atteso: {0}"
+
msgid "Choose visible tracks"
msgstr "Scegli i tracciati visibili"
@@ -10795,7 +10842,7 @@ msgid "gps point"
msgstr "punto GPS"
msgid "HDOP"
-msgstr ""
+msgstr "Diluizione orizzontale della precisione (HDOP)"
msgid "Time"
msgstr "Tempo"
@@ -10863,6 +10910,36 @@ msgstr "Crea contrassegni dai punti con nome"
msgid "Named Trackpoints from {0}"
msgstr "Nomina i punti del percorso da {0}"
+msgid "Auto load tiles"
+msgstr "Carica automaticamente i tasselli"
+
+msgid "Auto zoom"
+msgstr "Zoom automatico"
+
+msgid "Decrease zoom"
+msgstr "Diminuisci l''ingrandimento"
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr "Aumenta l''ingrandimento"
+
+msgid "Load all tiles"
+msgstr "Carica tutti i tasselli"
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr "Mostra errori"
+
+msgid "Change resolution"
+msgstr "Cambia risoluzione"
+
+msgid "Zoom to native resolution"
+msgstr "Ingrandisci la visuale alla risoluzione originale"
+
msgid "gps marker"
msgstr "contrassegno gps"
@@ -12503,15 +12580,6 @@ msgstr "Nome della cache"
msgid "Object Count"
msgstr "Numero oggetti"
-msgid "imagery fade"
-msgstr "dissolvenza delle immagini aeree"
-
-msgid "Fade Color: "
-msgstr "Colore della dissolvenza: "
-
-msgid "Fade amount: "
-msgstr "Grado di dissolvenza: "
-
msgid "Soft"
msgstr "Leggero"
@@ -12562,6 +12630,9 @@ msgstr "Sfondo delle immagini aeree: predefinito"
msgid "Available default entries:"
msgstr "Voci predefinite disponibili:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "Voci selezionate:"
@@ -13815,10 +13886,10 @@ msgid "Presets"
msgstr "Preimpostazioni"
msgid "Search for objects by preset..."
-msgstr ""
+msgstr "Cerca oggetti con preimpostazioni..."
msgid "Search for objects by preset"
-msgstr "Ricerca oggetti da preimpostazioni"
+msgstr "Cerca oggetti con preimpostazioni"
msgid "Show only applicable to selection"
msgstr "Visualizza solamente per la selezione"
@@ -13882,6 +13953,9 @@ msgstr "Attributi opzionali:"
msgid "Unknown requisite: {0}"
msgstr "Requisito sconosciuto: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr "Espressione regolare sconosciuta: {0}"
+
msgid "Illegal member expression: {0}"
msgstr "Espessione non valida del mebro: {0}"
@@ -15196,6 +15270,9 @@ msgstr "sostituita dalla nuova estensione {0}"
msgid "no longer required"
msgstr "non più richiesto"
+msgid "Plugin information"
+msgstr "Informazioni sull''estensione"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -15448,9 +15525,6 @@ msgstr ""
"L''estensione è stata rimossa dalla configurazione. Riavviare JOSM per "
"eliminare l''estensione."
-msgid "Plugin information"
-msgstr "Informazioni sull''estensione"
-
msgid "no description available"
msgstr "nessuna descrizione disponibile"
@@ -16357,6 +16431,14 @@ msgid "farmland"
msgstr "agricola"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "residenziale"
@@ -16368,6 +16450,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr "incolta"
@@ -16380,6 +16474,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "industriale"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "strada associata (associatedStreet)"
@@ -16735,6 +16853,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr "IGN Argentina (TMS)"
@@ -16837,6 +16963,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -16888,10 +17017,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -16924,6 +17053,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Idrografia Geobase"
@@ -16976,6 +17180,12 @@ msgstr "Rep.Ceca RUIAN terreni"
msgid "Czech pLPIS"
msgstr "Rep. Ceca pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Danimarca)"
@@ -17123,6 +17333,12 @@ msgstr "Foto aeree Berlino 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Berlino foto aeree 2016"
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -17162,6 +17378,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -17186,6 +17410,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -17230,35 +17457,44 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
-msgstr "FÖMI ortofoto 2000"
+msgid "FÖMI orthophoto 2000"
+msgstr ""
-msgid "FÖMI ortophoto 2005"
-msgstr "FÖMI ortofoto 2005"
+msgid "FÖMI orthophoto 2005"
+msgstr ""
-msgid "Szeged ortophoto 2011"
-msgstr "Szeged ortofoto 2011"
+msgid "Szeged orthophoto 2011"
+msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
-msgstr "Törökbálint ortofoto 2013"
+msgid "Törökbálint orthophoto 2013"
+msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
-msgstr "Törökbálint ortofoto 2015"
+msgid "Törökbálint orthophoto 2015"
+msgstr ""
-msgid "Danube flood ortophoto 2013"
-msgstr "Alluvine del Danubio ortofoto 2013"
+msgid "Danube flood orthophoto 2013"
+msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
-msgstr "Ortofoto Budapest distretto XI 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
+msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr ""
@@ -17398,6 +17634,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard -Orthofoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -17426,8 +17670,8 @@ 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)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: Ortofotomapa (aerial image)"
@@ -17575,6 +17819,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Car"
@@ -17650,6 +17902,9 @@ msgstr "Kanton Aargau 25cm (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Kanton Aargau 25cm (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -17755,33 +18010,76 @@ msgstr "TIGER 2012 Roads Overlay"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr "TIGER Roads nuova o disallineata (2015)"
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
msgid "NC Latest Orthoimagery"
msgstr "NC Latest Orthoimagery"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr "U.S. Forest Service strade"
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr "Ortofoto del Texas"
@@ -17791,12 +18089,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr "Ortofoto del Delaware 2012"
@@ -18123,8 +18434,8 @@ msgstr ""
"partire dai livelli di sfondo. Ottimizzato per basemap.at."
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -18302,9 +18613,6 @@ msgstr ""
"Base dati degli scostamenti delle immagini aeree: condividi e acquisisci gli "
"scostamenti delle immagini aeree con un pulsante."
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "Modalità mappa regolazione mmagini aeree in stile WMSPlugin"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -20328,26 +20636,33 @@ msgstr "Corsia ciclabile"
msgid "Cycleway"
msgstr "Pista ciclabile"
+msgctxt "cycleway"
msgid "lane"
-msgstr "corsia ciclabile"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "tracciato"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "corsia ciclabile contromano"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "pista ciclabile contromano"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
-msgstr "contromano"
+msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "corsia autobus condivisa"
+msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "corsia ciclabile condivisa"
+msgstr ""
msgid "Cycleway left"
msgstr "Pista ciclabile sinistra"
@@ -21529,6 +21844,9 @@ msgstr "Carta fedeltà"
msgid "Wash"
msgstr "Autolavaggio"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Concessionaria"
@@ -23345,10 +23663,6 @@ msgid "garages"
msgstr "box per auto multipli"
msgctxt "building"
-msgid "industrial"
-msgstr "industriale"
-
-msgctxt "building"
msgid "school"
msgstr "scuola"
@@ -24752,6 +25066,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Sito archeologico"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Campo di battaglia"
@@ -26315,6 +26644,21 @@ msgstr "Centro amministrativo"
msgid "Label point"
msgstr "Punto di etichetta"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "Sito"
@@ -27865,15 +28209,6 @@ msgstr "Importa foto locali"
msgid "Import pictures into Mapillary layer"
msgstr "Importa foto nel livello Mapillary"
-msgid "Select pictures"
-msgstr "Seleziona foto"
-
-msgid "Import pictures into sequence"
-msgstr "Importa foto in sequenza"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importa foto in un livello Mapillary con una sequenza"
-
msgid "Join mode"
msgstr "modalità unisci"
@@ -28115,6 +28450,43 @@ msgstr ""
msgid "Go forward"
msgstr "Procedi"
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Importa"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -28150,6 +28522,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -28159,6 +28534,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -28168,15 +28546,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -28209,7 +28605,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -28226,9 +28628,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr "Download in corso"
@@ -29058,6 +29457,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -29978,6 +30380,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -29998,46 +30406,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
-msgstr ""
+msgid "Replace Geometry"
+msgstr "Sostituisci dimensioni e posizione"
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
-msgstr "Configura impostazioni di fusione"
+msgid "List of tags to merge"
+msgstr ""
-msgid "Generate matches"
-msgstr "Genera corrispondenze"
+msgid "except"
+msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Sostituisci dimensioni e posizione"
+msgid "Advanced Example"
+msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
+msgstr "Configura impostazioni di fusione"
+
+msgid "Generate matches"
+msgstr "Genera corrispondenze"
+
+msgid "Merging"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -30071,6 +30487,12 @@ msgstr "Nessuna selezione"
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -30455,9 +30877,6 @@ msgstr "Importazione Globalsat"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Importa dati da Globalsat Datalogger DG100 in un livello GPX."
-msgid "Import"
-msgstr "Importa"
-
msgid "GPS Blams"
msgstr "GPS Blams"
@@ -30986,9 +31405,6 @@ msgstr "Caricamento degli scostamenti delle immagini aeree..."
msgid "Error processing XML response: {0}"
msgstr "Errore nell''elaborazione della risposta XML: {0}"
-msgid "Offset"
-msgstr "Scostamento"
-
msgid "Imagery Offset Database"
msgstr "Database degli scostamenti delle immagini aeree"
@@ -31131,24 +31547,6 @@ msgstr "Caricamento del nuovo scostamento..."
msgid "This string should be 3 to 200 letters long."
msgstr "Questa stringa dovrebbe essere lunga dalle 3 alle 200 lettere."
-msgid "Adjust imagery"
-msgstr "Regolazione immagini aeree"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Regola la posizione del livello di immagini aeree selezionato"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Si prega di selezionare il livello delle immagini aeree da regolare."
-
-msgid "Start adjusting"
-msgstr "Inizia regolazione"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "Non c''è al momento alcun livello di immagini aeree da regolare."
-
-msgid "No layers to adjust"
-msgstr "Nessun livello da regolare"
-
msgid "Normal"
msgstr "Normale"
@@ -31161,12 +31559,21 @@ msgstr "Ruota di 180°"
msgid "Rotate 270"
msgstr "Ruota di 270°"
-msgid "Previous image"
-msgstr "Immagine precedente"
+msgid "WayPoint Image"
+msgstr "Immagine del punto del percorso"
+
+msgid "Display non-geotagged photos"
+msgstr "Visualizza le foto non georeferenziate"
+
+msgid "Imported Images"
+msgstr "Immagini importate"
msgid "Next image"
msgstr "Immagine successiva"
+msgid "Previous image"
+msgstr "Immagine precedente"
+
msgid "Rotate left"
msgstr "Ruota a sinistra"
@@ -31179,15 +31586,6 @@ msgstr "Ruota a destra"
msgid "Rotate image right"
msgstr "Ruota l''immagine a destra"
-msgid "WayPoint Image"
-msgstr "Immagine del punto del percorso"
-
-msgid "Display non-geotagged photos"
-msgstr "Visualizza le foto non georeferenziate"
-
-msgid "Imported Images"
-msgstr "Immagini importate"
-
msgid "Import vector graphics"
msgstr "Importa immagini vettoriali"
@@ -33415,9 +33813,6 @@ msgstr "Unisci"
msgid "Public Transport: Join GTFS stops"
msgstr "Trasporto pubblico: Unisci fermate GTFS"
-msgid "Id"
-msgstr "ID"
-
msgid "State"
msgstr "Regione"
diff --git a/i18n/po/ja.po b/i18n/po/ja.po
index 21118d0..ad141c2 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: 2017-03-23 03:37+0100\n"
-"PO-Revision-Date: 2017-03-22 16:46+0000\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"PO-Revision-Date: 2017-04-21 15:53+0000\n"
"Last-Translator: fujimoto <fujimoto at internet.ne.jp>\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: 2017-03-24 04:55+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:53+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"X-Poedit-Country: JAPAN\n"
"Language: ja\n"
"X-Poedit-Language: Japanese\n"
@@ -3337,6 +3337,9 @@ msgstr "投影法"
msgid "Matrix set identifier"
msgstr "マトリックス設定識別子"
+msgid "No default layer selected, choosing first layer."
+msgstr "既定のレイヤーが選択されていません。先頭のレイヤーを選択します。"
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "getCapabilities ドキュメントで定義されたレイヤーがありません: {0}"
@@ -3345,6 +3348,11 @@ msgid ""
msgstr "WMTS パーサエラー - 開始要素 {0} が終了要素 {2} の名前が異なります"
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr "正方形のタイルのみをサポートしています。 TileMatrix identifier {2} のサーバが{0}x{1}を返しました。"
@@ -3536,7 +3544,7 @@ msgid "areatext"
msgstr "エリアテキスト"
msgid "Expected element ''{0}'', but got ''{1}''"
-msgstr ""
+msgstr "''{0}'' 要素が必要ですが、 ''{1}'' が現れました"
msgid "value expected"
msgstr ""
@@ -3655,7 +3663,7 @@ msgid "Unsuitable parameters ''{0}'' and ''{1}'' for two point method."
msgstr ""
msgid "Illegal value for parameter ''{0}'': {1}"
-msgstr ""
+msgstr "引数 ''{0}'' の値が不正です: {1}"
msgid "error in initialization"
msgstr "初期化時のエラー"
@@ -4007,6 +4015,9 @@ msgstr "このテストはマルチポリゴンが有効かを調べます。"
msgid "Area style way is not closed"
msgstr "エリアスタイルウェイが閉じられていません"
+msgid "No outer way for boundary"
+msgstr "境界線にouterのウェイがありません"
+
msgid "No outer way for multipolygon"
msgstr "マルチポリゴンに外側のウェイがありません"
@@ -4062,6 +4073,9 @@ msgstr "マルチポリゴンの外側のウェイが他の輪と区間を共有
msgid "No useful role for multipolygon member"
msgstr "マルチポリゴンメンバのための有用なロールがない"
+msgid "Non-Way in boundary"
+msgstr "境界線にウェイがありません"
+
msgid "Non-Way in multipolygon"
msgstr "マルチポリゴン内にウェイ以外が含まれています"
@@ -4210,13 +4224,13 @@ msgid "Empty role type found when expecting one of ''{0}''"
msgstr ""
msgid "Role ''{0}'' missing"
-msgstr ""
+msgstr "ロール ''{0}'' がありません"
msgid "Number of ''{0}'' roles too low ({1})"
-msgstr ""
+msgstr "ロール ''{0}'' の数が少なすぎます（{1}）"
msgid "Number of ''{0}'' roles too high ({1})"
-msgstr ""
+msgstr "ロール ''{0}'' の数が多すぎます（{1}）"
msgid "Self-intersecting ways"
msgstr "自身で交差するウェイ"
@@ -6759,7 +6773,7 @@ msgstr "変更されたオブジェクトをダウンロード"
msgid ""
"Download the current version of the changed objects in the selected "
"changesets"
-msgstr ""
+msgstr "選択された変更セットで変更されたオブジェクトの現在のバージョンをダウンロード"
msgid "My changesets"
msgstr "自分の変更分"
@@ -7418,7 +7432,7 @@ msgid "Remember last used tags after a restart"
msgstr "再起動時に最後に使用したタグを記憶"
msgid "Recent tags with existing key"
-msgstr ""
+msgstr "既存キーの最新のタグ"
msgid "Enable"
msgstr "有効"
@@ -8298,7 +8312,7 @@ msgid "B"
msgstr "B"
msgid "Editor"
-msgstr ""
+msgstr "エディタ"
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
@@ -8648,7 +8662,7 @@ msgid "Unsaved changes - Save/Upload before deleting?"
msgstr "未保存の変更 - 削除前に保存/アップロードしますか？"
msgid "Unsaved changes - Save/Upload before restarting?"
-msgstr ""
+msgstr "変更が保存されていません - 再起動前に保存/アップロードしますか？"
msgid "Uploading and saving modified layers ..."
msgstr "修正されたレイヤーをアップロード、保存中 ..."
@@ -8705,10 +8719,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 "直ちに削除"
@@ -8723,7 +8737,7 @@ msgid "Exit JOSM with saving. Unsaved changes are uploaded and/or saved."
msgstr "保存せずにJOSMを終了。未保存の変更はアップロード、保存されます。"
msgid "Perform actions before restarting"
-msgstr ""
+msgstr "再起動前の動作"
msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
msgstr ""
@@ -9122,47 +9136,50 @@ msgid "{0} object to delete:"
msgid_plural "{0} objects to delete:"
msgstr[0] "削除するオブジェクト{0}件:"
-msgid "Show tile info"
-msgstr "タイル情報を表示"
+msgid "Native projections"
+msgstr ""
-msgid "Tile Info"
-msgstr "タイル情報"
+msgid "Offset"
+msgstr "オフセット"
-msgid "Metadata "
-msgstr "メタデータ "
+msgid "Tile download projection"
+msgstr ""
-msgid "Load tile"
-msgstr "タイルを読み込み"
+msgid "Tile display projection"
+msgstr ""
-msgid "Auto zoom"
-msgstr "自動ズーム"
+msgid "Current zoom"
+msgstr ""
-msgid "Auto load tiles"
-msgstr "タイルの自動読み込み"
+msgid "Show tile info"
+msgstr "タイル情報を表示"
-msgid "Show errors"
-msgstr "エラーを表示"
+msgid "Tile Info"
+msgstr "タイル情報"
-msgid "Load all tiles"
-msgstr "タイルをすべて読み込み"
+msgid "Tile name"
+msgstr ""
-msgid "Load all error tiles"
-msgstr "エラーになったタイルをすべて読み込み"
+msgid "Tile URL"
+msgstr ""
-msgid "Zoom to native resolution"
-msgstr "本来の解像度にズーム"
+msgid "Tile size"
+msgstr ""
-msgid "Change resolution"
-msgstr "解像度の変更"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
-msgstr "ズームアップ"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "ズームダウン"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
-msgstr "タイルキャッシュを破棄"
+msgid "Metadata "
+msgstr "メタデータ "
+
+msgid "Load tile"
+msgstr "タイルを読み込み"
msgid "Failed to create tile source"
msgstr "タイルソースの作成に失敗しました"
@@ -9272,8 +9289,14 @@ msgstr[0] "{0}本のトラック、 "
msgid "Save GPX file"
msgstr "GPXファイルの保存"
-msgid "Imagery fade"
-msgstr "画像の混合色"
+msgid "Id"
+msgstr "ID"
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
+msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr "サポートされていない画像種別: {0}"
@@ -9385,9 +9408,6 @@ msgstr "未解決の競合があります。競合箇所は保存されず、あ
msgid "Save OSM file"
msgstr "ファイルの保存"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "EPSG:4326とメルカトル図法がサポートされています"
-
msgid "Validation errors"
msgstr "妥当性検査エラー"
@@ -9398,9 +9418,12 @@ msgid "Set WMS Bookmark"
msgstr "WMSブックマークをセット"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
-msgstr "JOSM はサーバーへのクエリに EPSG:4326 を使いますが、結果は WMS サーバーによって様々です"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
+msgstr ""
msgid "Correlate to GPX"
msgstr "GPXに関連づける"
@@ -9563,20 +9586,6 @@ msgstr "GPXトラックを選択しなければなりません"
msgid "No selected GPX track"
msgstr "GPXトラックの選択がありません"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"タイムゾーンの解釈時にエラーになりました。\n"
-"期待する形式: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"オフセット区切り作業中にエラーです。\n"
-"期待されるフォーマット: {0}"
-
msgid "Geotagged Images"
msgstr "ジオタグのついた画像"
@@ -9713,12 +9722,26 @@ msgstr ""
"\n"
"GPSの時刻: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"オフセット区切り作業中にエラーです。\n"
+"期待されるフォーマット: {0}"
+
msgid "Show thumbnails"
msgstr "サムネイルを表示"
msgid "Show image thumbnails instead of icons."
msgstr "アイコンの代わりに画像のサムネイルを表示します。"
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"タイムゾーンの解釈時にエラーになりました。\n"
+"期待する形式: {0}"
+
msgid "Choose visible tracks"
msgstr "表示するトラックを選択"
@@ -9886,6 +9909,36 @@ msgstr "名前のついた地点からのマーカー"
msgid "Named Trackpoints from {0}"
msgstr "{0} からの名前付き測位点"
+msgid "Auto load tiles"
+msgstr "タイルの自動読み込み"
+
+msgid "Auto zoom"
+msgstr "自動ズーム"
+
+msgid "Decrease zoom"
+msgstr "ズームダウン"
+
+msgid "Flush tile cache"
+msgstr "タイルキャッシュを破棄"
+
+msgid "Increase zoom"
+msgstr "ズームアップ"
+
+msgid "Load all tiles"
+msgstr "タイルをすべて読み込み"
+
+msgid "Load all error tiles"
+msgstr "エラーになったタイルをすべて読み込み"
+
+msgid "Show errors"
+msgstr "エラーを表示"
+
+msgid "Change resolution"
+msgstr "解像度の変更"
+
+msgid "Zoom to native resolution"
+msgstr "本来の解像度にズーム"
+
msgid "gps marker"
msgstr "GPSマーカー"
@@ -11345,15 +11398,6 @@ msgstr "キャッシュ名"
msgid "Object Count"
msgstr "オブジェクト数"
-msgid "imagery fade"
-msgstr "画像の混合色"
-
-msgid "Fade Color: "
-msgstr "減らす色: "
-
-msgid "Fade amount: "
-msgstr "減色量: "
-
msgid "Soft"
msgstr "弱"
@@ -11402,6 +11446,9 @@ msgstr "画像の背景: デフォルト"
msgid "Available default entries:"
msgstr "利用可能なエントリ:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "選択済みのエントリ:"
@@ -12613,6 +12660,9 @@ msgstr "オプションの属性:"
msgid "Unknown requisite: {0}"
msgstr "不明な必要条件: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "メンバーの式が不正です: {0}"
@@ -13767,6 +13817,9 @@ msgstr "新しい{0}プラグインに置き換え"
msgid "no longer required"
msgstr "もはや必要ではありません"
+msgid "Plugin information"
+msgstr "プラグイン情報"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13965,9 +14018,6 @@ msgid ""
"unload the plugin."
msgstr "プラグインは設定から削除されています。プラグインをアンロードするためにJOSMを再起動してください。"
-msgid "Plugin information"
-msgstr "プラグイン情報"
-
msgid "no description available"
msgstr "説明がありません"
@@ -14725,6 +14775,14 @@ msgid "farmland"
msgstr "農地"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "住宅地"
@@ -14736,6 +14794,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr "やぶ"
@@ -14748,6 +14818,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "工場"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "通り名住居表示"
@@ -15103,6 +15197,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -15205,6 +15307,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15256,10 +15361,10 @@ msgstr "SPW(allonie) 2012-2013 aerial imagery"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 aerial imagery"
-msgid "TEC bus lines (2014)"
-msgstr "TEC bus lines (2014)"
+msgid "TEC bus lines"
+msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15292,6 +15397,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Geobase Hydrography"
@@ -15344,6 +15524,12 @@ msgstr "Czech RUIAN parcely"
msgid "Czech pLPIS"
msgstr "Czech pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Denmark)"
@@ -15492,6 +15678,12 @@ msgstr "Berlin aerial photograph 2015"
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15531,6 +15723,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15555,6 +15755,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15599,34 +15802,43 @@ msgstr "Drone Imagery Canaan(Haiti) November 2015"
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
-msgstr "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
+msgstr ""
-msgid "FÖMI ortophoto 2005"
-msgstr "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
+msgstr ""
-msgid "Szeged ortophoto 2011"
-msgstr "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
+msgstr ""
msgid "Inner part of Szeged"
msgstr "Inner part of Szeged"
-msgid "Törökbálint ortophoto 2013"
-msgstr "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
+msgstr ""
msgid "5 cm resolution bald image"
msgstr "5 cm resolution bald image"
-msgid "Törökbálint ortophoto 2015"
-msgstr "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
+msgstr ""
-msgid "Danube flood ortophoto 2013"
-msgstr "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
+msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15767,6 +15979,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard -Orthophoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15795,8 +16015,8 @@ 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)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15944,6 +16164,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Car"
@@ -16019,6 +16247,9 @@ msgstr "Kanton Aargau 25cm (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Kanton Aargau 25cm (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr "Kanton Zürich Orthophotos 2014/2015 10cm"
@@ -16124,33 +16355,76 @@ msgstr "TIGER 2012 Roads Overlay"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr "New & Misaligned TIGER Roads (2015)"
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
msgid "NC Latest Orthoimagery"
msgstr "NC Latest Orthoimagery"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr "U.S. Forest Service roads"
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -16160,12 +16434,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16489,8 +16776,8 @@ msgstr ""
".atに最適化されています。"
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16643,9 +16930,6 @@ msgid ""
"button."
msgstr "画像オフセットのデータベース: 画像オフセットをボタン1つで共有・取得"
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "WMSプラグイン形式画像調整地図モード"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18573,26 +18857,33 @@ msgstr "自転車専用通行帯"
msgid "Cycleway"
msgstr "自転車用道路"
+msgctxt "cycleway"
msgid "lane"
-msgstr "車線"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "トラック"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "反対車線"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "反対側のトラック"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
-msgstr "反対側"
+msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "バスと共用の車線"
+msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "共用車線"
+msgstr ""
msgid "Cycleway left"
msgstr "左側の自転車通行帯"
@@ -19765,6 +20056,9 @@ msgstr ""
msgid "Wash"
msgstr "洗車場"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "自動車販売店"
@@ -21580,10 +21874,6 @@ msgid "garages"
msgstr "車庫(集合)"
msgctxt "building"
-msgid "industrial"
-msgstr "工場"
-
-msgctxt "building"
msgid "school"
msgstr "学校"
@@ -22984,6 +23274,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "遺跡"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "古戦場"
@@ -24526,6 +24831,21 @@ msgstr "中心機関"
msgid "Label point"
msgstr "ラベル位置"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "サイト"
@@ -26032,15 +26352,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -26282,6 +26593,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "インポート"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26317,6 +26665,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26326,6 +26677,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26335,15 +26689,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26376,7 +26748,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26393,9 +26771,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -27169,6 +27544,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -28044,6 +28422,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -28064,46 +28448,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
+msgstr "位置を置き換え"
+
+msgid "Merge Tags"
msgstr ""
-msgid "<Please select data>"
+msgid "List of tags to merge"
msgstr ""
-msgid "Configure conflation settings"
+msgid "except"
msgstr ""
-msgid "Generate matches"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Reference:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Subject:"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Programming"
+msgid "Simple Example"
msgstr ""
-msgid "Merging"
+msgid "Advanced Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "位置を置き換え"
+msgid "<Please select data>"
+msgstr ""
-msgid "Merge Tags"
+msgid "Configure conflation settings"
msgstr ""
-msgid "List of tags to merge"
+msgid "Generate matches"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Merging"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -28136,6 +28528,12 @@ msgstr "選択されていません"
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28518,9 +28916,6 @@ msgstr "Globalsatのインポート"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "グローバルサット・データロガー DG100からGPXレイヤーにデータをインポート"
-msgid "Import"
-msgstr "インポート"
-
msgid "GPS Blams"
msgstr "GPSバン"
@@ -29018,9 +29413,6 @@ msgstr "画像オフセットを読み込み中..."
msgid "Error processing XML response: {0}"
msgstr "XMLの処理中にエラーが返りました: {0}"
-msgid "Offset"
-msgstr "オフセット"
-
msgid "Imagery Offset Database"
msgstr "画像オフセットデータベース"
@@ -29148,24 +29540,6 @@ msgstr "新しいオフセットをアップロード中..."
msgid "This string should be 3 to 200 letters long."
msgstr "文字列は3～200文字の範囲でなければなりません。"
-msgid "Adjust imagery"
-msgstr "画像を調整"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "選択された画像レイヤーの位置を調整します"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "調整する画像レイヤーを選択してください。"
-
-msgid "Start adjusting"
-msgstr "調整開始"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "現在、調整する画像レイヤーがありません。"
-
-msgid "No layers to adjust"
-msgstr "調整するレイヤーがありません"
-
msgid "Normal"
msgstr "通常"
@@ -29178,12 +29552,21 @@ msgstr "時計回りに180度回転"
msgid "Rotate 270"
msgstr "反時計回りに90度回転"
-msgid "Previous image"
-msgstr "前の画像"
+msgid "WayPoint Image"
+msgstr "ウェイポイントのイメージ"
+
+msgid "Display non-geotagged photos"
+msgstr "ジオタグのない写真を表示"
+
+msgid "Imported Images"
+msgstr "インポートした画像"
msgid "Next image"
msgstr "次の画像"
+msgid "Previous image"
+msgstr "前の画像"
+
msgid "Rotate left"
msgstr "左へ回転"
@@ -29196,15 +29579,6 @@ msgstr "右へ回転"
msgid "Rotate image right"
msgstr "画像を右へ回転"
-msgid "WayPoint Image"
-msgstr "ウェイポイントのイメージ"
-
-msgid "Display non-geotagged photos"
-msgstr "ジオタグのない写真を表示"
-
-msgid "Imported Images"
-msgstr "インポートした画像"
-
msgid "Import vector graphics"
msgstr "ベクターグラフィックスをインポート"
@@ -31318,9 +31692,6 @@ msgstr "統合"
msgid "Public Transport: Join GTFS stops"
msgstr "公共交通: GTFSの停留所を追加"
-msgid "Id"
-msgstr "ID"
-
msgid "State"
msgstr "州(state)"
@@ -34235,16 +34606,16 @@ msgstr[0] ""
msgstr[1] ""
msgid "Search Wikidata items"
-msgstr ""
+msgstr "ウィキデータの項目を検索"
msgid "Target key: "
-msgstr ""
+msgstr "ターゲットのキー: "
msgid "Search Wikipedia category"
-msgstr ""
+msgstr "ウィキペディアのカテゴリを検索"
msgid "Load category"
-msgstr ""
+msgstr "カテゴリを読み込む"
msgid "Fetch Wikipedia articles with coordinates"
msgstr "座標からWikipediaの記事を検索"
@@ -34264,10 +34635,10 @@ msgid "Not linked yet"
msgstr "まだリンクされていません"
msgid "{0}: {1}"
-msgstr ""
+msgstr "{0}: {1}"
msgid "Wikidata"
-msgstr ""
+msgstr "ウィキデータ"
msgid "Fetches all coordinates from Wikidata in the current view"
msgstr ""
diff --git a/i18n/po/ka.po b/i18n/po/ka.po
index 38149e7..c96f713 100644
--- a/i18n/po/ka.po
+++ b/i18n/po/ka.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2011-12-16 00:14+0000\n"
"Last-Translator: datogogishvili <Unknown>\n"
"Language-Team: Georgian <ka at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:47+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:46+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: ka\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3310,6 +3310,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3318,6 +3321,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3982,6 +3990,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4038,6 +4049,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9016,46 +9030,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9170,7 +9187,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9284,9 +9307,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9297,8 +9317,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9460,16 +9483,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9599,12 +9612,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9764,6 +9787,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11180,15 +11233,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11237,6 +11281,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12412,6 +12459,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13554,6 +13604,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13752,9 +13805,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14458,6 +14508,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14469,6 +14527,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14481,6 +14551,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14836,6 +14930,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14938,6 +15040,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14989,10 +15094,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15025,6 +15130,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15077,6 +15257,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15223,6 +15409,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15262,6 +15454,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15286,6 +15486,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15330,34 +15533,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15498,6 +15710,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15526,7 +15746,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15675,6 +15895,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15750,6 +15978,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15855,33 +16086,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15891,12 +16165,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16215,8 +16502,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16357,9 +16644,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18264,24 +18548,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19454,6 +19745,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21269,10 +21563,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22673,6 +22963,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24214,6 +24519,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25710,15 +26030,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25960,6 +26271,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25995,6 +26343,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26004,6 +26355,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26013,15 +26367,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26054,7 +26426,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26071,9 +26449,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26766,6 +27141,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27604,6 +27982,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27624,46 +28008,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27696,6 +28088,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28071,9 +28469,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28558,9 +28953,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28679,42 +29071,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28727,15 +29110,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30828,9 +31202,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/km.po b/i18n/po/km.po
index 7b501e8..ee74f74 100644
--- a/i18n/po/km.po
+++ b/i18n/po/km.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2015-01-27 10:25+0000\n"
"Last-Translator: Sophea Sok <sksophea at gmail.com>\n"
"Language-Team: Khmer <km at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:56+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:53+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3503,6 +3503,9 @@ msgstr "ចំណោល"
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3511,6 +3514,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4217,6 +4225,9 @@ msgstr "ការសាកល្បងនេះពិិនិត្យ
msgid "Area style way is not closed"
msgstr "ផ្លូវរចនាប័ទ្មផ្ទៃមិនបានបិទ"
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "មិនមានផ្លូវក្រៅសម្រាប់ពហុកោណចម្រុះ"
@@ -4273,6 +4284,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr "មិនមានតួនាទីចាំបាច់សម្រាប់សមាជិកពហុកោណចម្រុះ"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "មិនមានផ្លូវនៅក្នុងពហុកោណចម្រុះ"
@@ -9681,46 +9695,49 @@ msgid "{0} object to delete:"
msgid_plural "{0} objects to delete:"
msgstr[0] "វត្ថុ {0} ដែលត្រូវលុប៖"
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
-msgstr "ផ្ទុកក្រឡាស្វ័យប្រវត្តិ"
+msgid "Show tile info"
+msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
-msgstr "ពង្រីកទៅគុណភាពបង្ហាញដើម"
+msgid "Tile size"
+msgstr ""
-msgid "Change resolution"
-msgstr "ប្ដូរគុណភាពបង្ហាញ"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
-msgstr "បង្កើនការពង្រីក"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "បន្ថយការពង្រីក"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9831,8 +9848,14 @@ msgstr[0] "{0} ដាន, "
msgid "Save GPX file"
msgstr "រក្សាទុកឯកសារ GPX"
-msgid "Imagery fade"
-msgstr "រូបភាពថយពណ៌"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
+msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
@@ -9947,9 +9970,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "រក្សាទុកឯកសារ OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "បានគាំទ្រចំណោល EPSG:4326 និង Mercator"
-
msgid "Validation errors"
msgstr "កំហុសសុពលកម្ម"
@@ -9960,8 +9980,11 @@ msgid "Set WMS Bookmark"
msgstr "កំណត់ចំណាំ WMS"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -10131,20 +10154,6 @@ msgstr "អ្នកគួរតែជ្រើសដាន GPX"
msgid "No selected GPX track"
msgstr "មិនបានជ្រើសដាន GPX"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"មានកំហុសពេលញែកតំបន់ពេលវេលា។\n"
-"ទ្រង់ទ្រាយរំពឹងទុក៖ {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"មានកំហុសពេលញែកអុហ្វសិត។\n"
-"ទ្រង់ទ្រាយរំពឹងទុក៖ {0}"
-
msgid "Geotagged Images"
msgstr "រូបភាពដែលបានដាក់ស្លាកភូមិសាស្ត្រ"
@@ -10284,12 +10293,26 @@ msgstr ""
"\n"
"ពេលវេលាជីភីអេស៖ {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"មានកំហុសពេលញែកអុហ្វសិត។\n"
+"ទ្រង់ទ្រាយរំពឹងទុក៖ {0}"
+
msgid "Show thumbnails"
msgstr "បង្ហាញរូបភាពតូចៗ"
msgid "Show image thumbnails instead of icons."
msgstr "បង្ហាញរូបភាពតូចៗជំនួសរូបតំណាង។"
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"មានកំហុសពេលញែកតំបន់ពេលវេលា។\n"
+"ទ្រង់ទ្រាយរំពឹងទុក៖ {0}"
+
msgid "Choose visible tracks"
msgstr "ជ្រើសដានដែលមើលឃើញ"
@@ -10469,6 +10492,36 @@ msgstr "កម្មវិធីចំណាំពីចំណុច
msgid "Named Trackpoints from {0}"
msgstr "ចំណុចដានដែលបានដាក់ឈ្មោះពី {0}"
+msgid "Auto load tiles"
+msgstr "ផ្ទុកក្រឡាស្វ័យប្រវត្តិ"
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr "បន្ថយការពង្រីក"
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr "បង្កើនការពង្រីក"
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr "ប្ដូរគុណភាពបង្ហាញ"
+
+msgid "Zoom to native resolution"
+msgstr "ពង្រីកទៅគុណភាពបង្ហាញដើម"
+
msgid "gps marker"
msgstr "កម្មវិធីចំណាំជីភីអេស"
@@ -12067,15 +12120,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr "រូបភាពបន្ថយ"
-
-msgid "Fade Color: "
-msgstr "បន្ថយពណ៌៖ "
-
-msgid "Fade amount: "
-msgstr "បន្ថយចំនួន៖ "
-
msgid "Soft"
msgstr "ទន់"
@@ -12124,6 +12168,9 @@ msgstr "ផ្ទៃខាងក្រោយរូបភាព៖ លំ
msgid "Available default entries:"
msgstr "ធាតុលំនាំដើមដែលមាន៖"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "ធាតុដែលបានជ្រើស៖"
@@ -13407,6 +13454,9 @@ msgstr "គុណលក្ខណៈជាជម្រើស៖"
msgid "Unknown requisite: {0}"
msgstr "មិនស្គាល់តម្រូវការ៖ {0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "កន្សោមសមាជិកមិនត្រឹមត្រូវ៖ {0}"
@@ -14695,6 +14745,9 @@ msgstr "បានជំនួសដោយកម្មវិធីជ
msgid "no longer required"
msgstr "លែងទាមទារទៀតហើយ"
+msgid "Plugin information"
+msgstr "ព័ត៌មានកម្មវិធីជំនួយ"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -14929,9 +14982,6 @@ msgstr ""
"បានលុបកម្មវិធីជំនួយចេញពីការកំណត់រចនាសម្ព័ន្ធ។ សូមចាប់ផ្ដើម JOSM "
"ឡើងវិញដើម្បីមិនផ្ទុកកម្មវិធីជំនួយ។"
-msgid "Plugin information"
-msgstr "ព័ត៌មានកម្មវិធីជំនួយ"
-
msgid "no description available"
msgstr "មិនមានសេចក្ដីពណ៌នា"
@@ -15781,6 +15831,14 @@ msgid "farmland"
msgstr "ដីកសិដ្ឋាន"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "ដីលំនៅឋាន"
@@ -15792,6 +15850,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr "ព្រៃគុម្ពោត"
@@ -15804,6 +15874,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "ផ្លូវពាក់ព័ន្ធ"
@@ -16159,6 +16253,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -16261,6 +16363,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -16312,10 +16417,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -16348,6 +16453,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -16400,6 +16580,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -16546,6 +16732,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16585,6 +16777,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -16609,6 +16809,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -16653,34 +16856,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -16821,6 +17033,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -16849,7 +17069,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -16998,6 +17218,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -17073,6 +17301,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -17178,33 +17409,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -17214,12 +17488,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -17546,8 +17833,8 @@ msgstr ""
"គុណភាពខ្ពស់សម្រាប់ basemap.at."
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -17720,9 +18007,6 @@ msgstr ""
"មូលដ្ឋានទិន្នន័យអុហ្វសិតរូបភាព៖ ចែករំលែក "
"និងទទួលយកអុហ្វសិតរូបភាពដោយប្រើប៊ូតុងមួយ។"
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "WMSPlugin-style របៀបផែនទីការលៃតម្រូវរូបភាព"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -19674,24 +19958,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -20864,6 +21155,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -22679,10 +22973,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -24083,6 +24373,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -25624,6 +25929,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -27120,15 +27440,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -27370,6 +27681,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -27405,6 +27753,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -27414,6 +27765,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -27423,15 +27777,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -27464,7 +27836,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -27481,9 +27859,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -28176,6 +28551,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -29014,6 +29392,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -29034,46 +29418,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
+msgstr ""
+
+msgid "Merging"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -29106,6 +29498,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -29481,9 +29879,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -29968,9 +30363,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -30089,42 +30481,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -30137,15 +30520,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -32238,9 +32612,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/ko.po b/i18n/po/ko.po
index a1b5ee2..77d34c1 100644
--- a/i18n/po/ko.po
+++ b/i18n/po/ko.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
-"PO-Revision-Date: 2017-03-22 16:44+0000\n"
-"Last-Translator: Myeongjin <aranet100 at gmail.com>\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"PO-Revision-Date: 2017-04-30 02:42+0000\n"
+"Last-Translator: SeongHoon Ryu <Unknown>\n"
"Language-Team: Korean <ko 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=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:57+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:54+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: ko\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -65,13 +65,13 @@ msgid "Help"
msgstr "도움말"
msgid "Initializing internal boundaries data"
-msgstr ""
+msgstr "내부 경계 데이터를 초기화하는 중"
msgid "Initializing OSM API"
msgstr "OSM API 초기화 중"
msgid "Initializing internal traffic data"
-msgstr ""
+msgstr "내부 교통 정보를 초기화하는 중"
msgid "Initializing validator"
msgstr "유효성 검사 초기화 중"
@@ -204,7 +204,7 @@ msgstr "선택"
msgid ""
"Set the selected elements on the map to the selected items in the list above."
-msgstr ""
+msgstr "지도의 선택된 항목을 위 목록의 선택된 항목으로 설정합니다."
msgid "Select WMS layers"
msgstr "WMS 레이어 선택"
@@ -625,7 +625,7 @@ msgid "Are you really sure to continue?"
msgstr "정말로 계속 진행하시겠습니까?"
msgid "Please abort if you are not sure"
-msgstr "확실하지 않다면 중단을 눌러주세요."
+msgstr "확실하지 않다면 중단해주세요"
msgid "The selected area is incomplete. Continue?"
msgstr "선택된 영역이 다운로드되지 않았습니다. 계속하시겠습니까?"
@@ -754,7 +754,7 @@ msgid "Rectified Image..."
msgstr ""
msgid "Download Rectified Images From Various Services"
-msgstr ""
+msgstr "여러 서비스로부터 개정된 그림 다운로드"
msgid "Imagery: {0}"
msgstr "사진: {0}"
@@ -763,7 +763,7 @@ msgid "Custom WMS Link"
msgstr "사용자 정의 WMS 링크"
msgid "Supported Rectifier Services:"
-msgstr ""
+msgstr "지원되는 개정기 서비스:"
msgid "Visit Homepage"
msgstr "홈페이지 방문"
@@ -1885,7 +1885,7 @@ msgid "Ignore"
msgstr "무시"
msgid "Click to abort and to resume editing"
-msgstr ""
+msgstr "중단하고 편집을 재개하려면 클릭하세요"
msgid ""
"There is {0} object in your local dataset which might be deleted on the "
@@ -3293,6 +3293,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3301,6 +3304,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3962,6 +3970,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4018,6 +4029,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -5971,7 +5985,7 @@ msgid "Click to close the dialog and remove the object from the relations"
msgstr ""
msgid "Click to close the dialog and to abort deleting the objects"
-msgstr ""
+msgstr "대화 상자를 닫고 개체의 삭제를 중단하려면 클릭하세요"
msgid "Filter objects and hide/disable them."
msgstr ""
@@ -6133,7 +6147,7 @@ msgid_plural "{0} Members: "
msgstr[0] "구성 요소 {0}개: "
msgid " as \"{0}\""
-msgstr ""
+msgstr " (키 \"{0}\")"
msgid "{0} Nodes: "
msgstr "점 {0}개: "
@@ -6989,7 +7003,7 @@ msgid "Illegal changeset query URL"
msgstr ""
msgid "Close the dialog and abort querying of changesets"
-msgstr ""
+msgstr "대화 상자를 닫고 바뀜집합의 조회를 중단합니다"
msgid ""
"Please enter a date in the usual format for your locale.<br>Example: "
@@ -7937,10 +7951,10 @@ msgid "Download area ok, size probably acceptable to server"
msgstr "다운로드 영역이 적당한 크기입니다."
msgid "Click to close the dialog and to abort downloading"
-msgstr "대화 상자를 닫고 다운로드를 중단하려면 클릭합니다."
+msgstr "대화 상자를 닫고 다운로드를 중단하려면 클릭하세요"
msgid "Click to download the currently selected area"
-msgstr "현재 선택한 영역을 다운로드하려면 클릭합니다."
+msgstr "현재 선택한 영역을 다운로드하려면 클릭하세요."
msgid "Please select a download area first."
msgstr "먼저 다운로드 영역을 선택해 주세요."
@@ -8255,11 +8269,12 @@ msgid ""
"server.<br>Click <strong>{6}</strong> to abort and continue "
"editing.<br></html>"
msgstr ""
-"<html>서버에 있는 점, 선, 관계 중 하나가 업로드하려는 것보다 최신 버전이어서 업로드에 "
-"<strong>실패했습니다.</strong><br>{0} id <strong>{1}</strong>에서 충돌이 발생했습니다.<br>서버 "
-"것의 버전은 {2}, 업로드하려던 것은 {3}입니다.<br><br><strong>{4}</strong>를 클릭하여 충돌한 것들만 동기화 "
-"하거나,<br><strong>{5}</strong>를 클릭하여 전체 데이터 집합을 동기화 "
-"하거나,<br><strong>{6}</strong>를 클릭하여 업로드를 취소하고 계속 편집합니다.<br></html>"
+"<html>서버에 업로드하려는 점, 선, 관계 중 하나보다 새로운 버전이 있으므로 "
+"업로드에<br><strong>실패했습니다</strong>.<br>충돌은 id가 <strong>{1}</strong>인 "
+"<strong>{0}</strong>에서 발생했으며,<br>서버에는 버전 {2}이 있고, 업로드하려던 버전은 "
+"{3}입니다.<br><br>충돌한 원본만 동기화하려면 <strong>{4}</strong>를 클릭하세요.<br>전체 로컬 데이터집합을 "
+"서버에 동기화하려면 <strong>{5}</strong>를 클릭하세요.<br>업로드를 중단하고 편집을 계속하려면 "
+"<strong>{6}</strong>을 클릭하세요.<br></html>"
msgid ""
"<html>Uploading <strong>failed</strong> because the server has a newer "
@@ -8268,9 +8283,10 @@ msgid ""
"server.<br>Click <strong>{1}</strong> to abort and continue "
"editing.<br></html>"
msgstr ""
-"<html>서버에 있는 점, 선, 관계 중 하나가 업로드하려는 것보다 최신 버전이어서 업로드에 "
-"<strong>실패했습니다.</strong><br><br><strong>{0}</strong>을를 클릭하여 전체 데이터 집합을 동기화 "
-"하거나,<br><strong>{1}</strong>를 클릭하여 업로드를 취소하고 계속 편집합니다.<br></html>"
+"<html>서버에 업로드하려는 점, 선, 관계 중 하나보다 새로운 버전이 있으므로 "
+"업로드에<br><strong>실패했습니다</strong>.<br><br>전체 로컬 데이터집합을 서버에 동기화하려면 "
+"<strong>{0}</strong>를 클릭하세요.<br>업로드를 중단하고 편집을 계속하려면 <strong>{1}</strong>을 "
+"클릭하세요.<br></html>"
msgid ""
"<html>Uploading <strong>failed</strong> because you have been "
@@ -8722,7 +8738,7 @@ msgid "Manage open changesets and select a changeset to upload to"
msgstr ""
msgid "Configure advanced settings"
-msgstr "고급 설정을 구성합니다."
+msgstr "고급 설정을 구성합니다"
msgid "Upload to ''{0}''"
msgstr "''{0}''에 업로드"
@@ -8817,7 +8833,7 @@ msgid "The changeset is <strong>left open</strong> after this upload"
msgstr ""
msgid "configure changeset"
-msgstr ""
+msgstr "바뀜집합 구성"
msgid "Uploading <strong>{0} object</strong> to <strong>1 changeset</strong>"
msgid_plural ""
@@ -8840,7 +8856,7 @@ msgid ""
msgstr ""
msgid "advanced configuration"
-msgstr ""
+msgstr "고급 구성"
msgid ""
"{0} objects exceed the max. allowed {1} objects in a changeset on the server "
@@ -8872,7 +8888,7 @@ msgid "Abort"
msgstr "중단"
msgid "Click to abort uploading"
-msgstr "올리기를 중단하려면 클릭"
+msgstr "업로드를 중단하려면 클릭하세요"
msgid ""
"The server reported that the current changeset was closed.<br>This is most "
@@ -8891,33 +8907,35 @@ msgid ""
"dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return to "
"map editing.<br>"
msgstr ""
+"추가적인 새로운 바뀜집합의 업로드를 계속하려면 ''<strong>{0}</strong>''를 클릭하세요.<br>업로드 대화 상자로 "
+"돌아가려면 ''<strong>{1}</strong>''를 클릭하세요.<br>업로드를 중단하고 지도 편집으로 돌아가려면 "
+"''<strong>{2}</strong>''을 클릭하세요.<br>"
msgid "Changeset is full"
msgstr ""
msgid "Node ''{0}'' is already deleted. Skipping object in upload."
-msgstr ""
+msgstr "이미 점 ''{0}''은 삭제되었습니다. 개체를 건너뛰고 업로드합니다."
msgid "Way ''{0}'' is already deleted. Skipping object in upload."
-msgstr ""
+msgstr "이미 선 ''{0}''은 삭제되었습니다. 개체를 건너뛰고 업로드합니다."
msgid "Relation ''{0}'' is already deleted. Skipping object in upload."
-msgstr ""
+msgstr "이미 관계 ''{0}''은 삭제되었습니다. 개체를 건너뛰고 업로드합니다."
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
-msgstr ""
+msgstr "이미 개체 ''{0}''은 삭제되었습니다. 개체를 건너뛰고 업로드합니다."
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "개체 {0}개 업로드 중..."
msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
msgstr ""
msgid "Upload successful!"
-msgstr ""
+msgstr "업로드 성공!"
msgid ""
"<html>Mark modified objects <strong>from the current selection</strong> to "
@@ -8930,10 +8948,10 @@ msgid ""
msgstr ""
msgid "Select objects to upload"
-msgstr ""
+msgstr "업로드할 개체 선택"
msgid "Cancel uploading"
-msgstr ""
+msgstr "업로드 취소"
msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
@@ -8954,7 +8972,7 @@ msgid "Upload data in chunks of objects. Chunk size: "
msgstr ""
msgid "Upload each object individually"
-msgstr ""
+msgstr "각각의 개체를 개별적으로 업로드"
msgid ""
"<html>There are <strong>multiple changesets</strong> necessary in order to "
@@ -8970,93 +8988,92 @@ msgid ""
msgstr ""
msgid "(1 request)"
-msgstr ""
+msgstr "(1번 요청)"
msgid "(# requests unknown)"
-msgstr ""
+msgstr "(#번 요청)"
msgid "({0} request)"
msgid_plural "({0} requests)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "({0}번 요청)"
msgid "Illegal chunk size <= 0. Please enter an integer > 1"
-msgstr ""
+msgstr "청크 크기가 0 보다 크거나 같습니다. 1 보다 큰 정수를 입력해 주세요."
msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''"
msgstr ""
msgid "Please enter an integer > 1"
-msgstr ""
+msgstr "1 보다 큰 정수를 입력해 주세요."
msgid "Value ''{0}'' is not a number. Please enter an integer > 1"
-msgstr ""
+msgstr "값 ''{0}''는 숫자가 아닙니다. 1 보다 큰 정수를 입력해 주세요."
msgid "Objects to add:"
-msgstr "추가한 대상:"
+msgstr "추가한 개체:"
msgid "Objects to modify:"
-msgstr "수정한 대상:"
+msgstr "수정한 개체:"
msgid "Objects to delete:"
-msgstr "삭제한 대상:"
+msgstr "삭제한 개체:"
msgid "{0} object to add:"
msgid_plural "{0} objects to add:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "추가한 {0}개의 개체:"
msgid "{0} object to modify:"
msgid_plural "{0} objects to modify:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "수정한 {0}개의 개체:"
msgid "{0} object to delete:"
msgid_plural "{0} objects to delete:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "삭제한 {0}개의 개체:"
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
-msgstr ""
+msgid "Show tile info"
+msgstr "타일 정보 보기"
-msgid "Show errors"
-msgstr ""
+msgid "Tile Info"
+msgstr "타일 정보"
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
-msgstr ""
+msgid "Metadata "
+msgstr "메타데이터 "
+
+msgid "Load tile"
+msgstr "타일 불러오기"
msgid "Failed to create tile source"
msgstr ""
@@ -9077,7 +9094,7 @@ msgid "Current zoom: {0}"
msgstr ""
msgid "Display zoom: {0}"
-msgstr "확대 표시: {0}"
+msgstr ""
msgid "Pixel scale: {0}"
msgstr ""
@@ -9106,71 +9123,73 @@ msgstr ""
msgid ""
"Aerial imagery \"{0}\" might be misaligned. Please check its offset using "
"GPS tracks!"
-msgstr ""
+msgstr "항공사진 \"{0}\"이(가) 잘못 정렬되었을 수 있습니다. GPS 트랙을 사용하여 오프셋을 확인해 주세요!"
msgid "http://wiki.openstreetmap.org/wiki/Using_Imagery"
msgstr ""
msgid "Details..."
-msgstr ""
+msgstr "자세히..."
msgid "Do not show this message again"
-msgstr ""
+msgstr "이 메시지를 다시 표시하지 않음"
msgid "Hide this message and never show it again"
-msgstr ""
+msgstr "이 메시지를 숨기고 다시 표시하지 않음"
msgid "Customize Color"
-msgstr "사용자 지정 색상"
+msgstr "색상 사용자 지정"
msgid "Default"
msgstr "기본값"
msgid "Choose a color"
-msgstr "색을 선택하십시오."
+msgstr "색상 선택"
msgid "Name: {0}"
-msgstr ""
+msgstr "이름: {0}"
msgid "Description: {0}"
-msgstr ""
+msgstr "설명: {0}"
msgid "{0} track"
msgid_plural "{0} tracks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "경로 {0}개"
msgid "Description"
-msgstr ""
+msgstr "설명"
msgid "Timespan"
-msgstr ""
+msgstr "일시"
msgid "Length"
-msgstr ""
+msgstr "거리"
msgid "Length: {0}"
-msgstr ""
+msgstr "거리: {0}"
msgid "{0} route, "
msgid_plural "{0} routes, "
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "경로 {0}개, "
msgid "{0} waypoint"
msgid_plural "{0} waypoints"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "지점 {0}개"
msgid "{0} track, "
msgid_plural "{0} tracks, "
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "경로 {0}개, "
msgid "Save GPX file"
-msgstr "GPX 파일 저정"
+msgstr "GPX 파일 저장"
+
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
-msgid "Imagery fade"
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9201,18 +9220,17 @@ msgid "Change the projection again or remove the layer."
msgstr ""
msgid "Save Layer"
-msgstr "layer 저장"
+msgstr "레이어 저장"
msgid "{0} note"
msgid_plural "{0} notes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "참고 {0}개"
msgid "Notes layer"
-msgstr ""
+msgstr "참고 레이어"
msgid "Total notes:"
-msgstr ""
+msgstr "총 참고 개수:"
msgid "Changes need uploading?"
msgstr ""
@@ -9221,7 +9239,7 @@ msgid "outside downloaded area"
msgstr ""
msgid "Data Layer {0}"
-msgstr ""
+msgstr "데이터 레이어 {0}"
msgid "Merging layers"
msgstr ""
@@ -9232,13 +9250,13 @@ msgstr[0] ""
msgstr[1] ""
msgid "{0} consists of:"
-msgstr ""
+msgstr "{0}의 구성 요소:"
msgid "unset"
msgstr ""
msgid "API version: {0}"
-msgstr ""
+msgstr "API 버전: {0}"
msgid "Upload is discouraged"
msgstr ""
@@ -9247,7 +9265,7 @@ msgid "Upload is blocked"
msgstr ""
msgid "Convert to GPX layer"
-msgstr ""
+msgstr "GPX 레이어로 변환"
msgid "Converted from: {0}"
msgstr ""
@@ -9256,10 +9274,10 @@ msgid "Dataset consistency test"
msgstr ""
msgid "No problems found"
-msgstr ""
+msgstr "아무런 문제도 발견되지 않음"
msgid "Following problems found:"
-msgstr ""
+msgstr "다음과 같은 문제가 발견됨:"
msgid "Empty document"
msgstr "빈 문서"
@@ -9282,54 +9300,54 @@ msgid ""
msgstr "해결되지 않은 충돌이 있습니다. 충돌은 저장되지 않고 거부된 것처럼 처리됩니다. 계속하겠습니까?"
msgid "Save OSM file"
-msgstr "OSM 파일 저정"
-
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
+msgstr "OSM 파일 저장"
msgid "Validation errors"
-msgstr ""
+msgstr "유효성 검사 오류"
msgid "No validation errors"
-msgstr ""
+msgstr "유효성 검사 오류 없음"
msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
msgstr ""
msgid "Invalid timezone"
-msgstr ""
+msgstr "잘못된 시간대"
msgid "Invalid offset"
-msgstr ""
+msgstr "잘못된 오프셋"
msgid "Correlate images with GPX track"
msgstr ""
msgid "Try Again"
-msgstr ""
+msgstr "다시 시도"
msgid "No images could be matched!"
-msgstr ""
+msgstr "일치하는 이미지가 없습니다."
msgid "GPX Files (*.gpx *.gpx.gz)"
-msgstr ""
+msgstr "GPX 파일 (*.gpx *.gpx.gz)"
msgid "File {0} is loaded yet under the name \"{1}\""
msgstr ""
msgid "Error while parsing {0}"
-msgstr "분석 도중에 에러가 발생했습니다. {0}"
+msgstr "구문 분석 도중에 오류가 발생하였습니다. {0}"
msgid "Could not read \"{0}\""
-msgstr "\\\"{0}\\\"을 읽을 수가 없습니다."
+msgstr "\"{0}\"을 읽을 수가 없습니다."
msgid ""
"<html>Take a photo of your GPS receiver while it displays the "
@@ -9338,7 +9356,7 @@ msgid ""
msgstr ""
msgid "Photo time (from exif):"
-msgstr ""
+msgstr "촬영 일시 (exif):"
msgid "Gps time (read from the above photo): "
msgstr ""
@@ -9347,10 +9365,10 @@ msgid "I am in the timezone of: "
msgstr ""
msgid "No date"
-msgstr ""
+msgstr "일시 없음"
msgid "Open another photo"
-msgstr ""
+msgstr "다른 사진 열기"
msgid "Synchronize time from a photo of the GPS receiver"
msgstr ""
@@ -9361,16 +9379,16 @@ msgid ""
msgstr ""
msgid "Invalid date"
-msgstr ""
+msgstr "잘못된 날짜"
msgid "<No GPX track loaded yet>"
-msgstr ""
+msgstr "<GPX 경로가 아직 로드되지 않음>"
msgid "GPX track: "
-msgstr ""
+msgstr "GPX 경로: "
msgid "Open another GPX trace"
-msgstr ""
+msgstr "다른 GPX 경로 열기"
msgid ""
"<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
@@ -9383,7 +9401,7 @@ msgid "Matches first photo with first gpx point"
msgstr ""
msgid "Manual adjust"
-msgstr ""
+msgstr "수동 조정"
msgid "Override position for: "
msgstr ""
@@ -9395,19 +9413,19 @@ msgid "Images that are already tagged ({0}/{1})"
msgstr ""
msgid "Show Thumbnail images on the map"
-msgstr ""
+msgstr "지도에 썸네일 이미지 표시"
msgid "Timezone: "
-msgstr ""
+msgstr "시간대: "
msgid "Offset:"
-msgstr ""
+msgstr "오프셋:"
msgid "Correlate"
msgstr ""
msgid "No gpx selected"
-msgstr ""
+msgstr "gpx를 선택하지 않음"
msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
msgid_plural ""
@@ -9416,18 +9434,17 @@ msgstr[0] ""
msgstr[1] ""
msgid "Timezone: {0}"
-msgstr ""
+msgstr "시간대: {0}"
msgid "Minutes: {0}"
-msgstr ""
+msgstr "분: {0}"
msgid "Seconds: {0}"
-msgstr ""
+msgstr "초: {0}"
msgid "(Time difference of {0} day)"
msgid_plural "Time difference of {0} days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "(시차 {0}일)"
msgid ""
"An error occurred while trying to match the photos to the GPX track. You can "
@@ -9438,7 +9455,7 @@ msgid "Matching photos to track failed"
msgstr ""
msgid "Adjust timezone and offset"
-msgstr ""
+msgstr "시간대 및 오프셋 조정"
msgid "The selected photos do not contain time information."
msgstr ""
@@ -9460,18 +9477,8 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
-msgstr ""
+msgstr "지오태그 이미지"
msgid "Extracting GPS locations from EXIF"
msgstr ""
@@ -9483,7 +9490,7 @@ msgid "Read photos..."
msgstr ""
msgid "Reading {0}..."
-msgstr "{0} 읽는중..."
+msgstr "{0} 읽는 중..."
msgid "Unable to get canonical path for directory {0}\n"
msgstr ""
@@ -9499,8 +9506,7 @@ msgstr ""
msgid "{0} image loaded."
msgid_plural "{0} images loaded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0}개 이미지 불러옴."
msgid "{0} was found to be GPS tagged."
msgid_plural "{0} were found to be GPS tagged."
@@ -9513,7 +9519,7 @@ msgstr[0] ""
msgstr[1] ""
msgid "Delete image file from disk"
-msgstr ""
+msgstr "디스크에서 이미지 파일 삭제"
msgid ""
"<html><h3>Delete the file {0} from disk?<p>The image file will be "
@@ -9524,46 +9530,46 @@ msgid "Image file could not be deleted."
msgstr ""
msgid "No image"
-msgstr ""
+msgstr "이미지 없음"
msgid "Loading {0}"
-msgstr ""
+msgstr "{0} 불러오는 중"
msgid "Error on file {0}"
msgstr ""
msgid "Display geotagged images"
-msgstr ""
+msgstr "지오태그 이미지 표시"
msgid "Previous"
-msgstr ""
+msgstr "이전"
msgid "Show previous Image"
-msgstr ""
+msgstr "이전 이미지 보기"
msgid "Geoimage: {0}"
-msgstr ""
+msgstr "지오이미지: {0}"
msgid "Remove photo from layer"
-msgstr ""
+msgstr "레이어에서 사진 제거"
msgid "Delete File from disk"
-msgstr ""
+msgstr "디스크에서 파일 삭제"
msgid "Copy image path"
-msgstr ""
+msgstr "이미지 경로 복사"
msgid "Next"
-msgstr ""
+msgstr "다음"
msgid "Show next Image"
-msgstr ""
+msgstr "다음 이미지 보기"
msgid "Show first Image"
-msgstr ""
+msgstr "처음 이미지 보기"
msgid "Show last Image"
-msgstr ""
+msgstr "마지막 이미지 보기"
msgid "Center view"
msgstr ""
@@ -9572,17 +9578,21 @@ msgid "Zoom best fit and 1:1"
msgstr ""
msgid "Move dialog to the side pane"
-msgstr ""
+msgstr "대화 상자를 사이드 패널로 이동"
msgid ""
"\n"
"Altitude: {0} m"
msgstr ""
+"\n"
+"고도: {0} m"
msgid ""
"\n"
"Speed: {0} km/h"
msgstr ""
+"\n"
+"속도: {0} km/h"
msgid ""
"\n"
@@ -9599,12 +9609,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
-msgid "Show thumbnails"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
msgstr ""
+msgid "Show thumbnails"
+msgstr "썸네일 보기"
+
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9621,13 +9641,13 @@ msgid "Set track visibility for {0}"
msgstr ""
msgid "Show all"
-msgstr ""
+msgstr "모두 보기"
msgid "Show selected only"
-msgstr ""
+msgstr "선택된 것만 보기"
msgid "Convert to data layer"
-msgstr "데이터 레이어로 전환하기"
+msgstr "데이터 레이어로 변환"
msgid ""
"<html>Upload of unprocessed GPS data as map data is considered "
@@ -9635,7 +9655,7 @@ msgid ""
msgstr ""
msgid "Customize track drawing"
-msgstr ""
+msgstr "경로 그리기 사용자 지정"
msgid "From"
msgstr ""
@@ -9644,22 +9664,22 @@ msgid "To"
msgstr ""
msgid "No timestamp"
-msgstr ""
+msgstr "타임 스탬프 없음"
msgid "Select to download OSM data."
-msgstr ""
+msgstr "OSM 데이터를 다운로드하려면 선택하세요."
msgid "Select to download GPS traces."
-msgstr ""
+msgstr "GPS 경로를 다운로드하려면 선택하세요."
msgid "Download everything within:"
msgstr ""
msgid "meters"
-msgstr ""
+msgstr "미터"
msgid "Maximum area per request:"
-msgstr ""
+msgstr "요청당 최대 지역:"
msgid "Download near:"
msgstr ""
@@ -9674,16 +9694,16 @@ msgid "track and waypoints"
msgstr ""
msgid "Click to download"
-msgstr ""
+msgstr "다운로드하려면 클릭"
msgid "Click to cancel"
-msgstr ""
+msgstr "취소하려면 클릭"
msgid "Download from OSM along this track"
-msgstr ""
+msgstr "이 경로를 따라 OSM에서 데이터 다운로드"
msgid "Calculating Download Area"
-msgstr ""
+msgstr "다운로드 지역 계산 중"
msgid "Precache imagery tiles along this track"
msgstr ""
@@ -9692,7 +9712,7 @@ msgid "Precaching WMS"
msgstr ""
msgid "Please select the imagery layer."
-msgstr "사진 레이어를 선택하세요."
+msgstr "사진 레이어를 선택해 주세요."
msgid "Select imagery layer"
msgstr "사진 레이어 선택"
@@ -9713,16 +9733,16 @@ msgid "Time"
msgstr ""
msgid "Direction"
-msgstr ""
+msgstr "방향"
msgid "Velocity, {0}"
msgstr ""
msgid "Wave Audio files (*.wav)"
-msgstr ""
+msgstr "웨이브 오디오 파일 (*.wav)"
msgid "Import Audio"
-msgstr ""
+msgstr "오디오 가져오기"
msgid ""
"<html>The data in the GPX layer ''{0}'' has been downloaded from the "
@@ -9731,7 +9751,7 @@ msgid ""
msgstr ""
msgid "Import not possible"
-msgstr ""
+msgstr "가져올 수 없습니다"
msgid "Audio markers from {0}"
msgstr ""
@@ -9764,6 +9784,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr "타일 자동으로 불러오기"
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr "타일 캐시 비우기"
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr "모든 타일 불러오기"
+
+msgid "Load all error tiles"
+msgstr "모든 오류 타일 불러오기"
+
+msgid "Show errors"
+msgstr "오류 보기"
+
+msgid "Change resolution"
+msgstr "해상도 변경"
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -9787,7 +9837,7 @@ msgid "Toggle visible state of the marker text and icons."
msgstr ""
msgid "Synchronize Audio"
-msgstr ""
+msgstr "오디오 동기화"
msgid ""
"You need to pause audio at the moment when you hear your synchronization cue."
@@ -9854,10 +9904,10 @@ msgid "Save Access Token in preferences"
msgstr ""
msgid "Access Token Key:"
-msgstr ""
+msgstr "접근 토큰 키:"
msgid "Access Token Secret:"
-msgstr ""
+msgstr "접근 토큰 시크릿:"
msgid ""
"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
@@ -9865,34 +9915,34 @@ msgid ""
msgstr ""
msgid "Use default settings"
-msgstr ""
+msgstr "기본 설정 사용"
msgid "Consumer Key:"
-msgstr ""
+msgstr "컨슈머 키:"
msgid "Consumer Secret:"
-msgstr ""
+msgstr "컨슈머 시크릿:"
msgid "Request Token URL:"
-msgstr ""
+msgstr "리퀘스트 토큰 URL:"
msgid "Access Token URL:"
-msgstr ""
+msgstr "접근 토큰 URL:"
msgid "Authorize URL:"
msgstr ""
msgid "OSM login URL:"
-msgstr ""
+msgstr "OSM 로그인 URL:"
msgid "OSM logout URL:"
-msgstr ""
+msgstr "OSM 로그아웃 URL:"
msgid "Click to reset the OAuth settings to default values"
msgstr ""
msgid "Click to abort resetting to the OAuth default values"
-msgstr ""
+msgstr "OAuth 기본값으로 재설정을 중단하려면 클릭하세요"
msgid ""
"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
@@ -9903,13 +9953,13 @@ msgid "Overwrite custom OAuth settings?"
msgstr ""
msgid "Fully automatic"
-msgstr ""
+msgstr "전자동"
msgid "Semi-automatic"
-msgstr ""
+msgstr "반자동"
msgid "Manual"
-msgstr ""
+msgstr "수동"
msgid ""
"<html>Run a fully automatic procedure to get an access token from the OSM "
@@ -9937,60 +9987,67 @@ msgid ""
"will be submitted to the OSM server <strong>only once</strong>. Subsequent "
"data upload requests don''t use your password any more."
msgstr ""
+"OSM 사용자명과 비밀번호를 입력해 주세요. 비밀번호는 JOSM 기본 설정에 <strong>저장되지 않으며</strong> OSM 서버에 "
+"<strong>한번만 제출됩니다</strong>. 다음 데이터 업로드 요청부터는 더 이상 비밀번호를 사용하지 않습니다."
msgid "Username: "
-msgstr ""
+msgstr "사용자명: "
msgid "Password: "
-msgstr ""
+msgstr "비밀번호: "
msgid "Granted rights"
-msgstr ""
+msgstr "부여된 권한"
msgid "Advanced OAuth properties"
-msgstr ""
+msgstr "고급 OAuth 속성"
msgid "Accept Access Token"
-msgstr ""
+msgstr "접근 토큰 동의"
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>OSM 웹사이트에서 OAuth 접근 토큰을 성공적으로 검색하였습니다. 토큰에 동의하려면\r\n"
+" <strong>{0}</strong>를 클릭합니다. 이 토큰값은 JOSM이 OSM API에 대한 접근 권한을 얻기 위한 후속 요청에 "
+"사용됩니다.</html>"
msgid "Authorize now"
-msgstr ""
+msgstr "인증"
msgid "Click to redirect you to the authorization form on the JOSM web site"
-msgstr ""
+msgstr "JOSM 웹사이트의 인증 양식으로 이동하려면 클릭하세요."
msgid "Back"
msgstr "뒤로"
msgid "Run the automatic authorization steps again"
-msgstr ""
+msgstr "자동 인증 단계 다시 실행"
msgid "Test Access Token"
-msgstr ""
+msgstr "접근 토큰 테스트"
msgid "Please enter your OSM password"
-msgstr ""
+msgstr "OSM 비밀번호를 입력해 주세요"
msgid "The password cannot be empty. Please enter your OSM password"
-msgstr ""
+msgstr "비밀번호는 비워 둘 수 없습니다. OSM 비밀번호를 입력해 주세요"
msgid "Authorize JOSM to access the OSM API"
-msgstr ""
+msgstr "OSM API에 접근하기 위한 JOSM 인증"
msgid ""
"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
"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>OSM 서버에서 OAuth 접근 토큰을 검색하는 자동 프로세스가 실패하였습니다.<br><br>다시 시도하거나 다른 종류의 인증 "
+"프로세스를 선택하세요.<br>(반자동 또는 수동 인증)</html>"
msgid "OAuth authorization failed"
-msgstr ""
+msgstr "OAuth 인증 실패"
msgid ""
"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
@@ -10008,47 +10065,51 @@ msgstr ""
msgid ""
"Please enter an OAuth Access Token which is authorized to access the OSM "
"server ''{0}''."
-msgstr ""
+msgstr "OSM 서버 ''{0}''에 접근할 수 있는 권한이 부여된 OAuth 접근 토큰을 입력해 주세요."
msgid "Access Token"
-msgstr ""
+msgstr "접근 토큰"
msgid "Advanced OAuth parameters"
-msgstr ""
+msgstr "고급 OAuth 매개변수"
msgid "Enter the OAuth Access Token"
-msgstr ""
+msgstr "OAuth 접근 토큰 입력"
msgid "Enter advanced OAuth properties"
-msgstr ""
+msgstr "고급 OAuth 속성 입력"
msgid ""
"<html><body>Please enter an OAuth Access Token which is authorized to access "
"the OSM server ''{0}''.</body></html>"
msgstr ""
+"<html><body>OSM 서버 ''{0}''에 접근할 수 있는 권한이 부여된 OAuth 접근 토큰을 입력해 "
+"주세요.</body></html>"
msgid "Please enter an Access Token Key"
-msgstr ""
+msgstr "접근 토큰 키를 입력해 주세요"
msgid ""
"The Access Token Key must not be empty. Please enter an Access Token Key"
-msgstr ""
+msgstr "접근 토큰 키는 비워 둘 수 없습니다. 접근 토큰 키를 입력해 주세요"
msgid "Please enter an Access Token Secret"
-msgstr ""
+msgstr "접근 토큰 시크릿을 입력해 주세요"
msgid ""
"The Access Token Secret must not be empty. Please enter an Access Token "
"Secret"
-msgstr ""
+msgstr "접근 토큰 시크릿은 비워 둘 수 없습니다. 접근 토큰 시크릿을 입력해 주세요"
msgid "Click to test the Access Token"
-msgstr ""
+msgstr "접근 토큰을 테스트하려면 클릭"
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 ""
+"OAuth를 사용하면 지도 데이터와 GPS 경로를 업로드할 수 있는 권한을 부여받습니다. (<a href=\"{0}\">자세한 "
+"정보...</a>)."
msgid "Please select an authorization procedure: "
msgstr ""
@@ -10366,7 +10427,7 @@ msgid "Remove from toolbar"
msgstr ""
msgid "Configure toolbar"
-msgstr ""
+msgstr "툴바 구성"
msgid "Edit shortcut"
msgstr ""
@@ -11119,7 +11180,7 @@ msgstr ""
msgid ""
"{0} is replaced by {1} (OSGeo Tile Map Service Specification style Y "
"coordinate)"
-msgstr ""
+msgstr "{0}은 {1}에 의해 대체되었습니다 (OSGeo 타일 지도 서비스 사양 스타일 Y 좌표)"
msgid ""
"{0} is replaced by a random selection from the given comma separated list, "
@@ -11142,7 +11203,7 @@ msgid "Show bounds"
msgstr ""
msgid "1. Enter service URL"
-msgstr ""
+msgstr "1. 서비스 URL을 입력하세요"
msgid "Get layers"
msgstr ""
@@ -11180,15 +11241,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11237,6 +11289,9 @@ msgstr "사진 배경: 기본값"
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -11508,7 +11563,7 @@ msgid " (requires: {0})"
msgstr ""
msgid "Configure available plugins."
-msgstr ""
+msgstr "사용할 수 있는 플러그인을 구성합니다."
msgid ""
"The following plugin has been downloaded <strong>successfully</strong>:"
@@ -11545,7 +11600,7 @@ msgid "Accept the new plugin sites and close the dialog"
msgstr ""
msgid "Configure Plugin Sites"
-msgstr ""
+msgstr "플러그인 사이트 구성"
msgid "Download list"
msgstr ""
@@ -11565,7 +11620,7 @@ msgid "Plugins up to date"
msgstr ""
msgid "Configure sites..."
-msgstr ""
+msgstr "사이트 구성..."
msgid "Configure the list of sites where plugins are downloaded from"
msgstr ""
@@ -12416,6 +12471,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13000,7 +13058,7 @@ msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
msgstr ""
msgid "Undefined element ''{0}'' found in input stream. Aborting."
-msgstr ""
+msgstr "정의되지 않은 요소 ''{0}''가 입력 스트림에서 찾았습니다. 중단합니다."
msgid "Parsing list of changesets..."
msgstr ""
@@ -13560,6 +13618,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13758,9 +13819,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14116,12 +14174,14 @@ msgid ""
"Unexpected response from HTTP server. Got {0} response without ''Location'' "
"header. Can''t redirect. Aborting."
msgstr ""
+"HTTP 서버에서 예기치 않은 응답이 있습니다. {0} 응답을 ''Location'' 헤더 없이 얻었습니다. 넘겨줄 수 없습니다. "
+"중단합니다."
msgid "Download redirected to ''{0}''"
msgstr ""
msgid "Too many redirects to the download URL detected. Aborting."
-msgstr ""
+msgstr "다운로드 URL로 너무 많은 넘겨주기가 감지되었습니다. 중단합니다."
msgid "Unable to find translation for the locale {0}. Reverting to {1}."
msgstr ""
@@ -14464,6 +14524,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14475,6 +14543,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14487,6 +14567,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14594,10 +14698,10 @@ msgid "Attributes"
msgstr ""
msgid "Abort file chooser dialog"
-msgstr ""
+msgstr "파일 선택 대화 상자 중단"
msgid "Abort file chooser dialog."
-msgstr ""
+msgstr "파일 선택 대화 상자를 중단합니다."
msgid "Create New Folder"
msgstr ""
@@ -14842,6 +14946,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14944,6 +15056,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14995,10 +15110,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15031,6 +15146,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15083,6 +15273,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15229,6 +15425,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15268,6 +15470,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15292,6 +15502,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15336,34 +15549,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15504,6 +15726,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15532,7 +15762,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15681,6 +15911,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15756,6 +15994,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15861,33 +16102,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15897,12 +16181,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16221,8 +16518,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16363,9 +16660,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -16696,25 +16990,25 @@ msgid ""
msgstr ""
msgid "Surface"
-msgstr ""
+msgstr "노면"
msgid "paved"
-msgstr ""
+msgstr "포장"
msgid "unpaved"
-msgstr ""
+msgstr "비포장"
msgid "asphalt"
-msgstr ""
+msgstr "아스팔트"
msgid "concrete"
-msgstr ""
+msgstr "콘크리트"
msgid "concrete:plates"
msgstr ""
msgid "concrete:lanes"
-msgstr ""
+msgstr "콘크리트:차선"
msgid "paving_stones"
msgstr ""
@@ -16723,120 +17017,120 @@ msgid "sett"
msgstr ""
msgid "cobblestone"
-msgstr ""
+msgstr "자갈"
msgid "grass_paver"
-msgstr ""
+msgstr "잔디_포장"
msgid "compacted"
-msgstr ""
+msgstr "압축"
msgid "fine_gravel"
msgstr ""
msgid "gravel"
-msgstr ""
+msgstr "자갈"
msgid "pebblestone"
-msgstr ""
+msgstr "조약돌"
msgid "ground"
msgstr ""
msgid "mud"
-msgstr ""
+msgstr "진흙"
msgid "sand"
-msgstr ""
+msgstr "모래"
msgid "grass"
-msgstr ""
+msgstr "잔디"
msgid "wood"
-msgstr ""
+msgstr "나무"
msgid "metal"
-msgstr ""
+msgstr "금속"
msgid "Smoothness"
-msgstr ""
+msgstr "평활도"
msgid "excellent"
-msgstr ""
+msgstr "우수함"
msgid "Thin Rollers: rollerblade, skateboard"
-msgstr ""
+msgstr "얇은 롤러: 롤러브레이드, 스케이트보드"
msgid "good"
-msgstr ""
+msgstr "좋음"
msgid "Thin Wheels: racing bike"
-msgstr ""
+msgstr "얇은 바퀴: 경주용 자전거"
msgid "intermediate"
-msgstr ""
+msgstr "중급"
msgid "Wheels: city bike, wheelchair, scooter"
-msgstr ""
+msgstr "바퀴: 도시 자전거, 휠체어, 스쿠터"
msgid "bad"
-msgstr ""
+msgstr "나쁨"
msgid "Robust Wheels: trekking bike, car, rickshaw"
-msgstr ""
+msgstr "견고한 바퀴: 트래킹 자전거, 자동차, 인력거"
msgid "very_bad"
-msgstr ""
+msgstr "매우_나쁨"
msgid "High Clearance: light duty off-road vehicle"
-msgstr ""
+msgstr "하이 클리언스: 경형 오프로드 차종"
msgid "horrible"
-msgstr ""
+msgstr "끔찍함"
msgid "Off-Road: heavy duty off-road vehicle"
-msgstr ""
+msgstr "오프로드: 중형 오프로드 차종"
msgid "very_horrible"
-msgstr ""
+msgstr "매우_끔찍함"
msgid "Specialized off-road: tractor, ATV"
-msgstr ""
+msgstr "특수 오프로드: 트랙터, 모든 지형적 차량"
msgid "impassable"
-msgstr ""
+msgstr "지나갈_수_없음"
msgid "No wheeled vehicle"
-msgstr ""
+msgstr "안되는 바퀴가 있는 차종"
msgctxt "riding"
msgid "horse_riding"
-msgstr ""
+msgstr "승마"
msgctxt "riding"
msgid "pitch"
-msgstr ""
+msgstr "장"
msgctxt "riding"
msgid "sports_centre"
-msgstr ""
+msgstr "스포츠_센터"
msgctxt "riding"
msgid "stadium"
-msgstr ""
+msgstr "경기장"
msgctxt "riding"
msgid "track"
-msgstr ""
+msgstr "트랙"
msgid "clay"
-msgstr ""
+msgstr "점토"
msgid "dirt"
-msgstr ""
+msgstr "흙"
msgid "Lanes"
-msgstr ""
+msgstr "차선"
msgid "Lanes in way direction"
msgstr ""
@@ -16845,7 +17139,7 @@ msgid "Lanes opposed to way direction"
msgstr ""
msgid "Max. speed (km/h)"
-msgstr ""
+msgstr "최고 속도 (km/h)"
msgid "Max. speed in way direction"
msgstr ""
@@ -16854,19 +17148,19 @@ msgid "Max. speed opposed to way direction"
msgstr ""
msgid "Bridge"
-msgstr ""
+msgstr "다리"
msgid "Tunnel"
-msgstr ""
+msgstr "터널"
msgid "Cutting"
-msgstr ""
+msgstr "절토"
msgid "Embankment"
-msgstr ""
+msgstr "둑"
msgid "Incline"
-msgstr ""
+msgstr "경사"
msgid "10%"
msgstr ""
@@ -16881,72 +17175,72 @@ msgid "-10°"
msgstr ""
msgid "Oneway"
-msgstr ""
+msgstr "일방통행"
msgid "Lit"
-msgstr ""
+msgstr "조명"
msgid "Width (meters)"
-msgstr ""
+msgstr "폭 (미터)"
msgid "Sidewalk"
-msgstr ""
+msgstr "도보"
msgctxt "sidewalk"
msgid "both"
-msgstr ""
+msgstr "양쪽"
msgctxt "sidewalk"
msgid "left"
-msgstr ""
+msgstr "왼쪽"
msgctxt "sidewalk"
msgid "right"
-msgstr ""
+msgstr "오른쪽"
msgctxt "sidewalk"
msgid "no"
-msgstr ""
+msgstr "아니오"
msgid "Service type"
-msgstr ""
+msgstr "서비스 유형"
msgid "yard"
-msgstr ""
+msgstr "마당"
msgid "siding"
-msgstr ""
+msgstr "사이딩"
msgid "spur"
-msgstr ""
+msgstr "박차"
msgid "crossover"
-msgstr ""
+msgstr "교차"
msgid "Electrified"
-msgstr ""
+msgstr "제3/제4궤조"
msgctxt "electrified"
msgid "contact_line"
-msgstr ""
+msgstr "가공_전차선"
msgctxt "electrified"
msgid "no"
-msgstr ""
+msgstr "아니오"
msgctxt "electrified"
msgid "yes"
-msgstr ""
+msgstr "예"
msgctxt "electrified"
msgid "rail"
-msgstr ""
+msgstr "철로"
msgid "Voltage in Volts (V)"
-msgstr ""
+msgstr "볼트 (V)로 전압"
msgid "Frequency in Hertz (Hz)"
-msgstr ""
+msgstr "헤르츠 (Hz)로 주파수"
msgid "16.67"
msgstr ""
@@ -16956,7 +17250,7 @@ msgstr ""
msgctxt "railway"
msgid "Tracks"
-msgstr ""
+msgstr "트랙"
msgid "Gauge (mm)"
msgstr ""
@@ -16974,13 +17268,13 @@ msgid "Motorcar"
msgstr ""
msgid "Reference"
-msgstr ""
+msgstr "참조"
msgid "Operator"
msgstr ""
msgid "Service Times"
-msgstr ""
+msgstr "서비스 시간"
msgid "Opening Hours"
msgstr ""
@@ -16989,182 +17283,182 @@ msgid "Wheelchairs"
msgstr ""
msgid "yes"
-msgstr ""
+msgstr "예"
msgid "limited"
-msgstr ""
+msgstr "제한됨"
msgid "no"
-msgstr ""
+msgstr "아니오"
msgid "Brand"
-msgstr ""
+msgstr "상표"
msgid "Cuisine"
-msgstr ""
+msgstr "요리"
msgid "italian"
-msgstr ""
+msgstr "이탈리아식"
msgid "chinese"
-msgstr ""
+msgstr "중식"
msgid "pizza"
-msgstr ""
+msgstr "피자"
msgid "burger"
-msgstr ""
+msgstr "버거"
msgid "greek"
-msgstr ""
+msgstr "그리스식"
msgid "german"
-msgstr ""
+msgstr "독일식"
msgid "indian"
-msgstr ""
+msgstr "인도식"
msgid "regional"
msgstr ""
msgid "kebab"
-msgstr ""
+msgstr "케밥"
msgid "turkish"
-msgstr ""
+msgstr "터키식"
msgid "asian"
-msgstr ""
+msgstr "아시아식"
msgid "thai"
-msgstr ""
+msgstr "타이식"
msgid "mexican"
-msgstr ""
+msgstr "멕시코식"
msgid "japanese"
-msgstr ""
+msgstr "일식"
msgid "french"
-msgstr ""
+msgstr "프랑스식"
msgid "sandwich"
-msgstr ""
+msgstr "샌드위치"
msgid "coffee_shop"
-msgstr ""
+msgstr "커피_전문점"
msgid "sushi"
-msgstr ""
+msgstr "스시"
msgid "steak_house"
-msgstr ""
+msgstr "스테이크_하우스"
msgid "fish_and_chips"
-msgstr ""
+msgstr "피시_앤_칩스"
msgid "chicken"
-msgstr ""
+msgstr "치킨"
msgid "american"
-msgstr ""
+msgstr "미식"
msgid "ice_cream"
-msgstr ""
+msgstr "아이스_크림"
msgid "international"
msgstr ""
msgid "seafood"
-msgstr ""
+msgstr "해물"
msgid "spanish"
-msgstr ""
+msgstr "스페인식"
msgid "vietnamese"
-msgstr ""
+msgstr "베트남식"
msgid "fish"
-msgstr ""
+msgstr "생선"
msgid "noodle"
-msgstr ""
+msgstr "면"
msgid "barbecue"
-msgstr ""
+msgstr "바비큐"
msgid "vegetarian"
msgstr ""
msgid "korean"
-msgstr ""
+msgstr "한식"
msgid "Internet access"
-msgstr ""
+msgstr "인터넷 접속"
msgid "wlan"
-msgstr ""
+msgstr "무선랜"
msgid "wired"
-msgstr ""
+msgstr "유선"
msgid "terminal"
-msgstr ""
+msgstr "단말기"
msgid "Internet access fee"
-msgstr ""
+msgstr "인터넷 접속 요금"
msgid "Smoking"
-msgstr ""
+msgstr "흡연"
msgid "dedicated"
-msgstr ""
+msgstr "전용"
msgid "separated"
-msgstr ""
+msgstr "분리됨"
msgid "isolated"
-msgstr ""
+msgstr "격리됨"
msgid "outside"
-msgstr ""
+msgstr "밖"
msgid "Height (meters)"
-msgstr ""
+msgstr "높이 (미터)"
msgid "Max. width (meters)"
-msgstr ""
+msgstr "최대 폭 (미터)"
msgid "Max. height (meters)"
-msgstr ""
+msgstr "최대 높이 (미터)"
msgid "pitch"
-msgstr ""
+msgstr "장"
msgid "sports_centre"
-msgstr ""
+msgstr "스포츠_센터"
msgid "stadium"
-msgstr ""
+msgstr "경기장"
msgid "Sport"
-msgstr ""
+msgstr "스포츠"
msgctxt "sport"
msgid "multi"
-msgstr ""
+msgstr "멀티"
msgctxt "sport"
msgid "archery"
-msgstr ""
+msgstr "양궁"
msgctxt "sport"
msgid "athletics"
-msgstr ""
+msgstr "육상"
msgctxt "sport"
msgid "american_football"
-msgstr ""
+msgstr "미식_축구"
msgctxt "sport"
msgid "australian_football"
@@ -17172,19 +17466,19 @@ msgstr ""
msgctxt "sport"
msgid "baseball"
-msgstr ""
+msgstr "야구"
msgctxt "sport"
msgid "basketball"
-msgstr ""
+msgstr "농구"
msgctxt "sport"
msgid "beachvolleyball"
-msgstr ""
+msgstr "배구"
msgctxt "sport"
msgid "billiards"
-msgstr ""
+msgstr "당구"
msgctxt "sport"
msgid "boules"
@@ -17200,23 +17494,23 @@ msgstr ""
msgctxt "sport"
msgid "canoe"
-msgstr ""
+msgstr "카누"
msgctxt "sport"
msgid "climbing"
-msgstr ""
+msgstr "등반"
msgctxt "sport"
msgid "cricket"
-msgstr ""
+msgstr "크리켓"
msgctxt "sport"
msgid "croquet"
-msgstr ""
+msgstr "크로케"
msgctxt "sport"
msgid "cycling"
-msgstr ""
+msgstr "사이클"
msgctxt "sport"
msgid "dog_racing"
@@ -17224,11 +17518,11 @@ msgstr ""
msgctxt "sport"
msgid "equestrian"
-msgstr ""
+msgstr "승마"
msgctxt "sport"
msgid "field_hockey"
-msgstr ""
+msgstr "필드_하키"
msgctxt "sport"
msgid "gaelic_games"
@@ -17236,27 +17530,27 @@ msgstr ""
msgctxt "sport"
msgid "golf"
-msgstr ""
+msgstr "골프"
msgctxt "sport"
msgid "gymnastics"
-msgstr ""
+msgstr "체조"
msgctxt "sport"
msgid "handball"
-msgstr ""
+msgstr "핸드볼"
msgctxt "sport"
msgid "horse_racing"
-msgstr ""
+msgstr "경마"
msgctxt "sport"
msgid "ice_hockey"
-msgstr ""
+msgstr "아이스_하키"
msgctxt "sport"
msgid "karting"
-msgstr ""
+msgstr "카트"
msgctxt "sport"
msgid "model_aerodrome"
@@ -17292,7 +17586,7 @@ msgstr ""
msgctxt "sport"
msgid "running"
-msgstr ""
+msgstr "달리기"
msgctxt "sport"
msgid "safety_training"
@@ -17320,7 +17614,7 @@ msgstr ""
msgctxt "sport"
msgid "swimming"
-msgstr ""
+msgstr "수영"
msgctxt "sport"
msgid "table_tennis"
@@ -17889,7 +18183,7 @@ msgstr ""
msgctxt "Highway"
msgid "service"
-msgstr ""
+msgstr "이면"
msgctxt "Highway"
msgid "unclassified"
@@ -17919,10 +18213,10 @@ msgid "Area"
msgstr ""
msgid "Service"
-msgstr ""
+msgstr "이면"
msgid "Service way type"
-msgstr ""
+msgstr "이면 길 유형"
msgid "alley"
msgstr ""
@@ -18084,7 +18378,7 @@ msgid "High-occupancy vehicles (hov)"
msgstr ""
msgid "Public Service Vehicles (psv)"
-msgstr ""
+msgstr "공공 서비스 차 (psv)"
msgid "Tourist buses"
msgstr ""
@@ -18274,24 +18568,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -18394,7 +18695,7 @@ msgid "Number"
msgstr ""
msgid "Services"
-msgstr ""
+msgstr "서비스"
msgid "Toilets"
msgstr ""
@@ -19166,7 +19467,7 @@ msgid "Subway"
msgstr ""
msgid "Tram"
-msgstr ""
+msgstr "노면전차"
msgid "Funicular"
msgstr ""
@@ -19315,7 +19616,7 @@ msgid "train"
msgstr ""
msgid "tram"
-msgstr ""
+msgstr "노면전차"
msgid "metro"
msgstr ""
@@ -19464,6 +19765,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -19492,7 +19796,7 @@ msgid "Motorcycle Dealer"
msgstr ""
msgid "Services:"
-msgstr ""
+msgstr "서비스:"
msgid "Sale"
msgstr ""
@@ -19660,7 +19964,7 @@ msgid "Bus stop (legacy)"
msgstr ""
msgid "Tram stop (legacy)"
-msgstr ""
+msgstr "노면전차 정류소 (레거시)"
msgid "Train"
msgstr ""
@@ -19727,7 +20031,7 @@ msgid "Railway Halt"
msgstr ""
msgid "Tram Stop"
-msgstr ""
+msgstr "노면전차 정류소"
msgid "Railway Platform"
msgstr ""
@@ -20394,10 +20698,10 @@ msgid "School"
msgstr ""
msgid "University"
-msgstr ""
+msgstr "대학"
msgid "College"
-msgstr ""
+msgstr "단기대학·전문학교"
msgid "Driving School"
msgstr ""
@@ -21279,10 +21583,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -21292,7 +21592,7 @@ msgstr ""
msgctxt "building"
msgid "service"
-msgstr ""
+msgstr "서비스"
msgctxt "building"
msgid "train_station"
@@ -21328,11 +21628,11 @@ msgstr ""
msgctxt "building"
msgid "university"
-msgstr ""
+msgstr "대학"
msgctxt "building"
msgid "college"
-msgstr ""
+msgstr "단기대학·전문학교"
msgctxt "building"
msgid "hospital"
@@ -21492,7 +21792,7 @@ msgstr ""
msgctxt "entrance"
msgid "service"
-msgstr ""
+msgstr "서비스"
msgctxt "entrance"
msgid "exit"
@@ -22683,6 +22983,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24224,6 +24539,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -24609,7 +24939,7 @@ msgid "View %name% sheet of geodesic site"
msgstr ""
msgid "View UAI sheet of school/college"
-msgstr ""
+msgstr "학교/단기대학의 UAI 시트 보기"
msgid "View %name% sheet of hospital/home"
msgstr ""
@@ -25720,15 +26050,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25970,6 +26291,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26005,6 +26363,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26014,6 +26375,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26023,15 +26387,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26064,7 +26446,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26081,9 +26469,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26776,6 +27161,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27614,6 +28002,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27634,46 +28028,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27706,6 +28108,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28081,9 +28489,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28568,9 +28973,6 @@ msgstr "사진 오프셋을 불러오는 중..."
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr "사진 오프셋 데이터베이스"
@@ -28689,24 +29091,6 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr "사진 조절"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "선택된 사진 레이어의 위치를 조절합니다"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "조절할 사진 레이어를 선택해주세요."
-
-msgid "Start adjusting"
-msgstr ""
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "현재 조절할 사진 레이어가 없습니다."
-
-msgid "No layers to adjust"
-msgstr ""
-
msgid "Normal"
msgstr ""
@@ -28719,31 +29103,31 @@ msgstr ""
msgid "Rotate 270"
msgstr ""
-msgid "Previous image"
+msgid "WayPoint Image"
msgstr ""
-msgid "Next image"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate left"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate image left"
+msgid "Next image"
msgstr ""
-msgid "Rotate right"
+msgid "Previous image"
msgstr ""
-msgid "Rotate image right"
+msgid "Rotate left"
msgstr ""
-msgid "WayPoint Image"
+msgid "Rotate image left"
msgstr ""
-msgid "Display non-geotagged photos"
+msgid "Rotate right"
msgstr ""
-msgid "Imported Images"
+msgid "Rotate image right"
msgstr ""
msgid "Import vector graphics"
@@ -30838,9 +31222,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
@@ -31732,7 +32113,7 @@ msgid "JOSM Tag Editor Plugin"
msgstr ""
msgid "Abort tag editing and close dialog"
-msgstr ""
+msgstr "태그 편집을 중단하고 대화 상자를 닫습니다"
msgid "Apply edited tags and close dialog"
msgstr ""
@@ -32705,10 +33086,10 @@ msgid ""
msgstr ""
msgid "Public Service Vehicles"
-msgstr ""
+msgstr "공공 서비스 차"
msgid "Public service vehicles like buses, tramways, etc."
-msgstr ""
+msgstr "버스, 노면전차 등과 같은 공공 서비스 차"
msgid "Heavy Goods Vehicles"
msgstr ""
@@ -33584,7 +33965,7 @@ msgid "<html>Could not find a unique node to start downloading from.</html>"
msgstr ""
msgid "<html>There are no ways connected to node ''{0}''. Aborting.</html>"
-msgstr ""
+msgstr "<html>노드 ''{0}''으로 연결된 길이 없습니다. 중단합니다.</html>"
msgid ""
"Way downloader data inconsistency. Prior connected way ''{0}'' wasn''t "
diff --git a/i18n/po/ku.po b/i18n/po/ku.po
index 1a76c80..57b9ffb 100644
--- a/i18n/po/ku.po
+++ b/i18n/po/ku.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2017-01-31 19:32+0000\n"
"Last-Translator: Rokar ✌ <Unknown>\n"
"Language-Team: Kurdish <ku at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:57+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:55+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -3304,6 +3304,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3312,6 +3315,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3976,6 +3984,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4032,6 +4043,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9010,46 +9024,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9164,7 +9181,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9278,9 +9301,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9291,8 +9311,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9454,16 +9477,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9593,12 +9606,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9758,6 +9781,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11174,15 +11227,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11231,6 +11275,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12406,6 +12453,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13548,6 +13598,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13746,9 +13799,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14452,6 +14502,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14463,6 +14521,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14475,6 +14545,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14830,6 +14924,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14932,6 +15034,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14983,10 +15088,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15019,6 +15124,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15071,6 +15251,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15217,6 +15403,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15256,6 +15448,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15280,6 +15480,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15324,34 +15527,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15492,6 +15704,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15520,7 +15740,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15669,6 +15889,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15744,6 +15972,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15849,33 +16080,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15885,12 +16159,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16209,8 +16496,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16351,9 +16638,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18258,24 +18542,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19448,6 +19739,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21263,10 +21557,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22667,6 +22957,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24208,6 +24513,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25704,15 +26024,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25954,6 +26265,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25989,6 +26337,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25998,6 +26349,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26007,15 +26361,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26048,7 +26420,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26065,9 +26443,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26760,6 +27135,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27598,6 +27976,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27618,46 +28002,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27690,6 +28082,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28065,9 +28463,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28552,9 +28947,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28673,42 +29065,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28721,15 +29104,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30822,9 +31196,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/ky.po b/i18n/po/ky.po
index 5b9aa14..1ce09ea 100644
--- a/i18n/po/ky.po
+++ b/i18n/po/ky.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2012-12-18 02:36+0000\n"
"Last-Translator: SimpleLeon <Unknown>\n"
"Language-Team: Kirghiz <ky at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:56+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:54+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -3304,6 +3304,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3312,6 +3315,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3976,6 +3984,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4032,6 +4043,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9010,46 +9024,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9164,7 +9181,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9278,9 +9301,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9291,8 +9311,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9454,16 +9477,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9593,12 +9606,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9758,6 +9781,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11174,15 +11227,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11231,6 +11275,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12406,6 +12453,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13548,6 +13598,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13746,9 +13799,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14452,6 +14502,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14463,6 +14521,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14475,6 +14545,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14830,6 +14924,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14932,6 +15034,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14983,10 +15088,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15019,6 +15124,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15071,6 +15251,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15217,6 +15403,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15256,6 +15448,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15280,6 +15480,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15324,34 +15527,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15492,6 +15704,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15520,7 +15740,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15669,6 +15889,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15744,6 +15972,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15849,33 +16080,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15885,12 +16159,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16209,8 +16496,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16351,9 +16638,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18258,24 +18542,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19448,6 +19739,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21263,10 +21557,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22667,6 +22957,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24208,6 +24513,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25704,15 +26024,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25954,6 +26265,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25989,6 +26337,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25998,6 +26349,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26007,15 +26361,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26048,7 +26420,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26065,9 +26443,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26760,6 +27135,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27598,6 +27976,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27618,46 +28002,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27690,6 +28082,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28065,9 +28463,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28552,9 +28947,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28673,42 +29065,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28721,15 +29104,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30822,9 +31196,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/lb.po b/i18n/po/lb.po
index 370ffff..1020318 100644
--- a/i18n/po/lb.po
+++ b/i18n/po/lb.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2016-04-28 18:56+0000\n"
"Last-Translator: Charel <ceilenbecker at gmail.com>\n"
"Language-Team: Luxembourgish <lb at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:00+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:57+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}:D''Optioun \"{1}\" ass net eendeiteg"
@@ -3304,6 +3304,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3312,6 +3315,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3976,6 +3984,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4032,6 +4043,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9010,46 +9024,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9164,7 +9181,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9278,9 +9301,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9291,8 +9311,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9454,16 +9477,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9593,12 +9606,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9758,6 +9781,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11174,15 +11227,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11231,6 +11275,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12406,6 +12453,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13548,6 +13598,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13746,9 +13799,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14452,6 +14502,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14463,6 +14521,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14475,6 +14545,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14830,6 +14924,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14932,6 +15034,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14983,10 +15088,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15019,6 +15124,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15071,6 +15251,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15217,6 +15403,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15256,6 +15448,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15280,6 +15480,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15324,34 +15527,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15492,6 +15704,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15520,7 +15740,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15669,6 +15889,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15744,6 +15972,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15849,33 +16080,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15885,12 +16159,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16209,8 +16496,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16351,9 +16638,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18258,24 +18542,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19448,6 +19739,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21263,10 +21557,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22667,6 +22957,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24208,6 +24513,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25704,15 +26024,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25954,6 +26265,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25989,6 +26337,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25998,6 +26349,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26007,15 +26361,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26048,7 +26420,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26065,9 +26443,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26760,6 +27135,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27598,6 +27976,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27618,46 +28002,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27690,6 +28082,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28065,9 +28463,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28552,9 +28947,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28673,42 +29065,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28721,15 +29104,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30822,9 +31196,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/lo.po b/i18n/po/lo.po
index 8d46c8f..0541759 100644
--- a/i18n/po/lo.po
+++ b/i18n/po/lo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2009-09-15 10:06+0000\n"
"Last-Translator: Anousone <Unknown>\n"
"Language-Team: Lao <lo at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:58+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:56+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3305,6 +3305,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3313,6 +3316,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3977,6 +3985,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4033,6 +4044,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9011,46 +9025,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9165,7 +9182,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9279,9 +9302,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9292,8 +9312,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9455,16 +9478,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9594,12 +9607,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9759,6 +9782,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11175,15 +11228,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11232,6 +11276,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12407,6 +12454,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13549,6 +13599,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13747,9 +13800,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14453,6 +14503,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14464,6 +14522,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14476,6 +14546,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14831,6 +14925,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14933,6 +15035,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14984,10 +15089,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15020,6 +15125,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15072,6 +15252,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15218,6 +15404,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15257,6 +15449,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15281,6 +15481,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15325,34 +15528,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15493,6 +15705,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15521,7 +15741,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15670,6 +15890,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15745,6 +15973,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15850,33 +16081,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15886,12 +16160,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16210,8 +16497,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16352,9 +16639,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18259,24 +18543,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19449,6 +19740,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21264,10 +21558,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22668,6 +22958,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24209,6 +24514,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25705,15 +26025,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25955,6 +26266,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25990,6 +26338,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25999,6 +26350,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26008,15 +26362,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26049,7 +26421,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26066,9 +26444,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26761,6 +27136,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27599,6 +27977,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27619,46 +28003,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27691,6 +28083,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28066,9 +28464,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28553,9 +28948,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28674,42 +29066,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28722,15 +29105,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30823,9 +31197,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/lt.po b/i18n/po/lt.po
index 92a21e6..549ce8c 100644
--- a/i18n/po/lt.po
+++ b/i18n/po/lt.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
-"PO-Revision-Date: 2017-03-04 05:45+0000\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"PO-Revision-Date: 2017-04-30 11:41+0000\n"
"Last-Translator: Aurimas Fišeras <Unknown>\n"
"Language-Team: Lithuanian <lt at li.org>\n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"(n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:59+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:57+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: lt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3616,6 +3616,9 @@ msgstr "Projekcija"
msgid "Matrix set identifier"
msgstr "Matricos rinkinio identifikatorius"
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Jokie sluoksniai nebuvo apibrėžti getCapabilities dokumento: {0}"
@@ -3626,6 +3629,11 @@ msgstr ""
"pavadinimą, nei pabaigos elementas {2}"
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4146,7 +4154,7 @@ msgid "Self crossing"
msgstr ""
msgid "Self-crossing ways"
-msgstr ""
+msgstr "Save kertantys keliai"
msgid ""
"This test checks if two roads, railways, waterways or buildings crosses in "
@@ -4325,6 +4333,9 @@ msgstr "Šis testas tikrina, ar teisingi multipoligonai."
msgid "Area style way is not closed"
msgstr "Ploto tipo kelias neuždaras"
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "Multipoligonas neturi išorinio kelio"
@@ -4384,11 +4395,14 @@ msgid "Multipolygon ring contains segments twice"
msgstr ""
msgid "Multipolygon outer way shares segment(s) with other ring"
-msgstr ""
+msgstr "Multipoligono išorinis kelias dalinasi segmentu(-ais) su kitu žiedu"
msgid "No useful role for multipolygon member"
msgstr "Nėra naudingos multipoligono nario rolės"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "Ne kelias multipoligone"
@@ -7800,9 +7814,9 @@ msgstr[2] "{0} skirtingų"
msgid ", {0} unset"
msgid_plural ", {0} unset"
-msgstr[0] ", {0} nuimti"
-msgstr[1] ", {0} nuimti"
-msgstr[2] ", {0} nuimti"
+msgstr[0] ", {0} nenustatyta"
+msgstr[1] ", {0} nenustatytos"
+msgstr[2] ", {0} nenustatytų"
msgid "Select objects for which to change tags."
msgstr "Parinkite objektus, kuriems keisti žymas."
@@ -8572,10 +8586,10 @@ msgstr ""
"juostos.</html>"
msgid "Zoom to downloaded data"
-msgstr ""
+msgstr "Priartinti atsiųstus duomenis"
msgid "Select to zoom to entire newly downloaded data."
-msgstr ""
+msgstr "Pažymėkite visų atsiųstų duomenų priartinimui."
msgid ""
"Use left click&drag to select area, arrows or right mouse button to scroll "
@@ -9849,47 +9863,50 @@ msgstr[0] "{0} objektas šalinimui:"
msgstr[1] "{0} objektai šalinimui:"
msgstr[2] "{0} objektų šalinimui:"
-msgid "Show tile info"
-msgstr "Rodyti kaladėlės informaciją"
+msgid "Native projections"
+msgstr ""
-msgid "Tile Info"
-msgstr "Kaladėlės info"
+msgid "Offset"
+msgstr "Poslinkis"
-msgid "Metadata "
-msgstr "Metaduomenys "
+msgid "Tile download projection"
+msgstr ""
-msgid "Load tile"
-msgstr "Įkelti kaladėlę"
+msgid "Tile display projection"
+msgstr ""
-msgid "Auto zoom"
-msgstr "Auto artinimas"
+msgid "Current zoom"
+msgstr ""
-msgid "Auto load tiles"
-msgstr "Automatiškai įkelti kaladėles"
+msgid "Show tile info"
+msgstr "Rodyti kaladėlės informaciją"
-msgid "Show errors"
-msgstr "Rodyti klaidas"
+msgid "Tile Info"
+msgstr "Kaladėlės info"
-msgid "Load all tiles"
-msgstr "Įkelti visas kaladėles"
+msgid "Tile name"
+msgstr ""
-msgid "Load all error tiles"
-msgstr "Įkelti visas klaidingas kaladėles"
+msgid "Tile URL"
+msgstr ""
-msgid "Zoom to native resolution"
-msgstr "Keisti mastelį iki savosios skiriamosios gebos"
+msgid "Tile size"
+msgstr ""
-msgid "Change resolution"
-msgstr "Keisti skiriamąją gebą"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Didinti"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Mažinti"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
-msgstr "Išvalyti kaladėlių podėlį"
+msgid "Metadata "
+msgstr "Metaduomenys "
+
+msgid "Load tile"
+msgstr "Įkelti kaladėlę"
msgid "Failed to create tile source"
msgstr "Nepavyko sukurti kaladėlių šaltinio"
@@ -10009,8 +10026,14 @@ msgstr[2] "{0} pėdsakų, "
msgid "Save GPX file"
msgstr "Išsaugoti GPX failą"
-msgid "Imagery fade"
-msgstr "Vaizdų stelbimas"
+msgid "Id"
+msgstr "Id"
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
+msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr "Nepalaikomas vaizdo tipas: {0}"
@@ -10127,9 +10150,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Išsaugoti OSM failą"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "Palaikomos EPSG:4326 ir Merkatoriaus projekcijos"
-
msgid "Validation errors"
msgstr "Tikrinimo klaidos"
@@ -10140,11 +10160,12 @@ msgid "Set WMS Bookmark"
msgstr "Nustatyti WMS žymelę"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
-"JOSM naudos EPSG:4326, kad duoti užklausą serveriui, bet rezultatai gali "
-"skirtis priklausomai nuo WMS serverio"
msgid "Correlate to GPX"
msgstr "Koreliuoti su GPX"
@@ -10319,20 +10340,6 @@ msgstr "Jūs turite parinkti GPX pėdsaką"
msgid "No selected GPX track"
msgstr "Nėra parinkto GPX pėdsako"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Klaida nagrinėjant laiko juostą.\n"
-"Tikėtasi formato: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Klaida nagrinėjant poslinkį:\n"
-"Tikėtasi formato: {0}"
-
msgid "Geotagged Images"
msgstr "Geopažymėti vaizdai"
@@ -10477,12 +10484,26 @@ msgstr ""
"\n"
"GPS laikas: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Klaida nagrinėjant poslinkį:\n"
+"Tikėtasi formato: {0}"
+
msgid "Show thumbnails"
msgstr "Rodyti miniatiūras"
msgid "Show image thumbnails instead of icons."
msgstr "Rodyti paveikslų miniatiūras vietoje piktogramų."
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Klaida nagrinėjant laiko juostą.\n"
+"Tikėtasi formato: {0}"
+
msgid "Choose visible tracks"
msgstr "Parinkti matomus pėdsakus"
@@ -10656,6 +10677,36 @@ msgstr "Žymos iš pavadintų taškų"
msgid "Named Trackpoints from {0}"
msgstr "Pavadinti pėdsako taškai iš {0}"
+msgid "Auto load tiles"
+msgstr "Automatiškai įkelti kaladėles"
+
+msgid "Auto zoom"
+msgstr "Auto artinimas"
+
+msgid "Decrease zoom"
+msgstr "Mažinti"
+
+msgid "Flush tile cache"
+msgstr "Išvalyti kaladėlių podėlį"
+
+msgid "Increase zoom"
+msgstr "Didinti"
+
+msgid "Load all tiles"
+msgstr "Įkelti visas kaladėles"
+
+msgid "Load all error tiles"
+msgstr "Įkelti visas klaidingas kaladėles"
+
+msgid "Show errors"
+msgstr "Rodyti klaidas"
+
+msgid "Change resolution"
+msgstr "Keisti skiriamąją gebą"
+
+msgid "Zoom to native resolution"
+msgstr "Keisti mastelį iki savosios skiriamosios gebos"
+
msgid "gps marker"
msgstr "gps žyma"
@@ -12241,15 +12292,6 @@ msgstr "Podėlio pavadinimas"
msgid "Object Count"
msgstr "Objektų kiekis"
-msgid "imagery fade"
-msgstr "vaizdų stelbimas"
-
-msgid "Fade Color: "
-msgstr "Stelbimo spalva: "
-
-msgid "Fade amount: "
-msgstr "Stelbimo dydis: "
-
msgid "Soft"
msgstr "Švelnus"
@@ -12298,6 +12340,9 @@ msgstr "Vaizdų fonas: numatytasis"
msgid "Available default entries:"
msgstr "Prieinami numatytieji įrašai:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "Pasirinkti įrašai:"
@@ -13574,6 +13619,9 @@ msgstr "Pasirenkami atributai"
msgid "Unknown requisite: {0}"
msgstr "Nežinomas rekvizitas: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "Negalimas nario išreiškimas: {0}"
@@ -14788,6 +14836,9 @@ msgstr "pakeista nauju {0} papildiniu"
msgid "no longer required"
msgstr "nebereikalingas"
+msgid "Plugin information"
+msgstr "Papildinio informacija"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -15024,9 +15075,6 @@ msgstr ""
"Papildinys buvo pašalintas iš konfigūracijos. Paleiskite JOSM iš naujo "
"papildiniui iškelti."
-msgid "Plugin information"
-msgstr "Papildinio informacija"
-
msgid "no description available"
msgstr "nėra aprašo"
@@ -15905,6 +15953,14 @@ msgid "farmland"
msgstr "dirbama žemė"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "gyvenamasis"
@@ -15916,6 +15972,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr "karjeras"
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr "krūmai"
@@ -15928,6 +15996,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "industrinis"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "asocijuotaGatvė"
@@ -16283,6 +16375,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -16385,6 +16485,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -16436,10 +16539,10 @@ msgstr "SPW(allonie) 2012-2013 aeronuotraukos"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 aeronuotraukos"
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -16472,6 +16575,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Geobase hidrografija"
@@ -16524,6 +16702,12 @@ msgstr "Čekų RUIAN parcely"
msgid "Czech pLPIS"
msgstr "Čekų pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Danija)"
@@ -16672,6 +16856,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16713,6 +16903,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -16737,6 +16935,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -16781,34 +16982,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -16949,6 +17159,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -16977,8 +17195,8 @@ 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)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: Ortofotomapa (oro nuotrauka)"
@@ -17126,6 +17344,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk automobiliams"
@@ -17201,6 +17427,9 @@ msgstr "Argau kantonas 25cm (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Argau kantonas 25cm (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -17306,33 +17535,76 @@ msgstr "TIGER 2012 kelių perdanga"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 parceliai"
msgid "NC Latest Orthoimagery"
msgstr "NC Latest Orthoimagery"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr "JAV miškų aptarnaujamieji keliai"
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -17342,12 +17614,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -17666,8 +17951,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -17814,9 +18099,6 @@ msgstr ""
"Vaizdų poslinkių duomenų bazė: dalinkitės ir gaukite vaizdų poslinkius vienu "
"mygtuku."
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -19731,24 +20013,31 @@ msgstr "Dviračių juosta/takas"
msgid "Cycleway"
msgstr "Dviračių takas"
+msgctxt "cycleway"
msgid "lane"
-msgstr "juosta"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "takas"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "priešinga_juosta"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "priešingos_krypties_takas"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -20922,6 +21211,9 @@ msgstr ""
msgid "Wash"
msgstr "Plovykla"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Automobilių prekiautojas"
@@ -22737,10 +23029,6 @@ msgid "garages"
msgstr "garažai"
msgctxt "building"
-msgid "industrial"
-msgstr "industrinis"
-
-msgctxt "building"
msgid "school"
msgstr "mokykla"
@@ -23970,7 +24258,7 @@ msgstr ""
msgctxt "power"
msgid "asymmetric"
-msgstr ""
+msgstr "asimetrinis"
msgctxt "power"
msgid "triangle"
@@ -24141,6 +24429,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Archeologinė vieta"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Mūšio laukas"
@@ -25694,6 +25997,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -26114,16 +26432,16 @@ msgid "Same value of {0} and {1}"
msgstr ""
msgid "{0} without {1}"
-msgstr ""
+msgstr "{0} be {1}"
msgid "missing tag"
-msgstr ""
+msgstr "trūkstama žyma"
msgid "{0} without {1} or {2}"
-msgstr ""
+msgstr "{0} be {1} ar {2}"
msgid "{0} without {1}, {2} or {3}"
-msgstr ""
+msgstr "{0} be {1}, {2} ar {3}"
msgid "{0} together with {1}"
msgstr "{0} kartu su {1}"
@@ -26153,13 +26471,13 @@ msgid "natural water used for swimming pool"
msgstr ""
msgid "sport without physical feature"
-msgstr ""
+msgstr "sportas be fizinės savybės"
msgid "alternative name without {0}"
-msgstr ""
+msgstr "alternatyvus pavadinimas be {0}"
msgid "incomplete usage of {0} on a way without {1}"
-msgstr ""
+msgstr "nepilnas {0} naudojimas ant kelio be {1}"
msgid "Same value of {0}, {1} and {2}"
msgstr ""
@@ -26168,7 +26486,7 @@ msgid "{0} and {1} together with {2} and conflicting values"
msgstr ""
msgid "{0} on a relation without {1}"
-msgstr ""
+msgstr "{0} ant ryšio be {1}"
msgid ""
"Long waterway with {0} but without a tag which defines it as tunnel or "
@@ -26192,13 +26510,13 @@ msgid "possibly missing {0} tag"
msgstr ""
msgid "street with odd number of {0}, but without {1} and {2} or {3}"
-msgstr ""
+msgstr "gatvė su nelyginiu {0} skaičiumi, bet be {1} ir {2} arba {3}"
msgid "{0} is deprecated"
msgstr "{0} pasenusi"
msgid "deprecated tagging"
-msgstr ""
+msgstr "pasenęs žymėjimas"
msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
msgstr ""
@@ -26226,7 +26544,7 @@ msgid ""
msgstr ""
msgid "{0} is deprecated. Please use instead a multipolygon."
-msgstr ""
+msgstr "{0} yra pasenęs. Vietoje to naudokite multipoligoną."
msgid ""
"{0} is deprecated. Please specify interval by using opening_hours syntax"
@@ -26278,10 +26596,10 @@ msgid "{0} is inaccurate"
msgstr ""
msgid "{0} is deprecated for {1}"
-msgstr ""
+msgstr "{0} yra pasenusi naudojant su {1}"
msgid "{0} is deprecated. Use the {1}: key prefix instead."
-msgstr ""
+msgstr "{0} yra pasenusi. Naudokite {1}: „key“ prefiksą."
msgid "questionable key (ending with a number)"
msgstr ""
@@ -26402,6 +26720,7 @@ msgstr ""
msgid "{0} is deprecated, use {1} instead. Also check similar tags like {2}"
msgstr ""
+"{0} yra pasenusi, naudokite {1}. Taip pat žiūrėkite panašias žymas, kaip {2}"
msgid ""
"Value of ''{0}'' should either be ''{1}'' or ''{2}''. For sidewalks use "
@@ -26409,10 +26728,10 @@ msgid ""
msgstr ""
msgid "pedestrian railway crossing without {0}"
-msgstr ""
+msgstr "pėsčiųjų geležinkelio pervaža be {0}"
msgid "railway crossing without {0}"
-msgstr ""
+msgstr "geležinkelio pervaža be {0}"
msgid "{0} with multiple values"
msgstr "{0} su sudėtinėmis reikšmėmis"
@@ -26473,7 +26792,7 @@ msgid "relation without type"
msgstr ""
msgid "{0} relation without {0} tag"
-msgstr ""
+msgstr "{0} ryšys be {0} žymos"
msgid "religion without denomination"
msgstr "religija be denominacijos"
@@ -26517,7 +26836,7 @@ msgid "wikipedia tag has an unknown language prefix"
msgstr ""
msgid "wikipedia tag format is deprecated"
-msgstr ""
+msgstr "„wikipedia“ žymos formatas pasenęs"
msgid "''wikipedia''=''language:page title''"
msgstr ""
@@ -27202,15 +27521,6 @@ msgstr "Importuoti vietines nuotraukas"
msgid "Import pictures into Mapillary layer"
msgstr "Importuoti nuotraukas į Mapillary sluoksnį"
-msgid "Select pictures"
-msgstr "Pažymėkite nuotraukas"
-
-msgid "Import pictures into sequence"
-msgstr "Importuoti nuotraukas į seką"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importuoti nuotraukas į Mapillary sluoksnį kaip seką"
-
msgid "Join mode"
msgstr "Sujungimo veiksena"
@@ -27452,6 +27762,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -27487,6 +27834,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -27496,6 +27846,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -27505,15 +27858,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -27546,7 +27917,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -27563,9 +27940,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -28270,6 +28644,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -29120,6 +29497,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -29140,46 +29523,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
+msgstr "Pakeisti geometriją"
+
+msgid "Merge Tags"
msgstr ""
-msgid "<Please select data>"
+msgid "List of tags to merge"
msgstr ""
-msgid "Configure conflation settings"
+msgid "except"
msgstr ""
-msgid "Generate matches"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Reference:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Subject:"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Programming"
+msgid "Simple Example"
msgstr ""
-msgid "Merging"
+msgid "Advanced Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Pakeisti geometriją"
+msgid "<Please select data>"
+msgstr ""
-msgid "Merge Tags"
+msgid "Configure conflation settings"
msgstr ""
-msgid "List of tags to merge"
+msgid "Generate matches"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -29212,6 +29603,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -29589,9 +29986,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -30031,7 +30425,7 @@ msgid "Calibration Layer"
msgstr ""
msgid "A deprecated calibration geometry of {0} nodes by {1}"
-msgstr ""
+msgstr "Pasenusi {0} taškų kalibravimo geometrija {1}"
msgid "A calibration geometry of {0} nodes by {1}"
msgstr ""
@@ -30062,6 +30456,8 @@ msgstr ""
msgid ""
"Please enter the reason why you mark this calibration geometry as deprecated"
msgstr ""
+"Įveskite priežastį, kodėl pažymėjote šią kalibravimo geometriją kaip "
+"pasenusią"
msgid "Notifying the server of the deprecation..."
msgstr ""
@@ -30084,9 +30480,6 @@ msgstr "Įkeliami vaizdų poslinkiai..."
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr "Poslinkis"
-
msgid "Imagery Offset Database"
msgstr "Vaizdų poslinkių duomenų bazė"
@@ -30211,24 +30604,6 @@ msgstr "Išsiunčiamas naujas poslinkis..."
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr "Derinti vaizdus"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Derinkite pasirinkto vaizdų sluoksnio poziciją"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Pasirinkite vaizdų sluoksnį derinimui."
-
-msgid "Start adjusting"
-msgstr ""
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "Nėra vaizdų sluoksnio derinimui."
-
-msgid "No layers to adjust"
-msgstr ""
-
msgid "Normal"
msgstr ""
@@ -30241,12 +30616,21 @@ msgstr "Pasukti 180"
msgid "Rotate 270"
msgstr "Pasukti 270"
-msgid "Previous image"
+msgid "WayPoint Image"
+msgstr ""
+
+msgid "Display non-geotagged photos"
+msgstr ""
+
+msgid "Imported Images"
msgstr ""
msgid "Next image"
msgstr ""
+msgid "Previous image"
+msgstr ""
+
msgid "Rotate left"
msgstr "Pasukti kairėn"
@@ -30259,15 +30643,6 @@ msgstr "Pasukti dešinėn"
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -32379,9 +32754,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr "Viešasis transportas: bendros GTFS stotelės"
-msgid "Id"
-msgstr "Id"
-
msgid "State"
msgstr ""
@@ -34506,7 +34878,7 @@ msgid "Add missing tag"
msgstr "Pridėti trūkstamą žymą"
msgid "Add the missing tag {0}={1}"
-msgstr "Pridėti trūkstamą žymę {0}={1}"
+msgstr "Pridėti trūkstamą žymą {0}={1}"
msgid ""
"The way <span class=\"object-name\">{0}</span> with role <tt>from</tt> and "
diff --git a/i18n/po/lv.po b/i18n/po/lv.po
index 4e56a2f..46a1903 100644
--- a/i18n/po/lv.po
+++ b/i18n/po/lv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2012-10-03 22:16+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: Latvian <lv at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:59+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:56+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: lv\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3316,6 +3316,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3324,6 +3327,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3988,6 +3996,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4044,6 +4055,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9021,46 +9035,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9175,7 +9192,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr "Saglabāt GPX failu"
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9289,9 +9312,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Saglabāt OSM failu"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9302,8 +9322,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9465,16 +9488,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9604,12 +9617,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9769,6 +9792,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11185,15 +11238,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11242,6 +11286,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12417,6 +12464,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13563,6 +13613,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13761,9 +13814,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14467,6 +14517,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14478,6 +14536,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14490,6 +14560,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14845,6 +14939,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14947,6 +15049,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14998,10 +15103,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15034,6 +15139,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15086,6 +15266,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15232,6 +15418,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15271,6 +15463,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15295,6 +15495,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15339,34 +15542,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15507,6 +15719,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15535,7 +15755,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15684,6 +15904,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15759,6 +15987,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15864,33 +16095,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15900,12 +16174,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16224,8 +16511,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16366,9 +16653,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18273,24 +18557,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19463,6 +19754,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21278,10 +21572,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22682,6 +22972,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24223,6 +24528,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25719,15 +26039,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25969,6 +26280,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26004,6 +26352,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26013,6 +26364,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26022,15 +26376,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26063,7 +26435,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26080,9 +26458,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26775,6 +27150,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27613,6 +27991,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27633,46 +28017,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27705,6 +28097,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28080,9 +28478,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28567,9 +28962,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28688,42 +29080,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28736,15 +29119,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30837,9 +31211,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/mk.po b/i18n/po/mk.po
index 313f369..db8fb69 100644
--- a/i18n/po/mk.po
+++ b/i18n/po/mk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2013-05-11 04:37+0000\n"
"Last-Translator: Bojan Jankuloski <bojan.jankuloski at gmail.com>\n"
"Language-Team: Macedonian <mk at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:00+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:58+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: mk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3308,6 +3308,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3316,6 +3319,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3980,6 +3988,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4036,6 +4047,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9014,46 +9028,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9168,7 +9185,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9282,9 +9305,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9295,8 +9315,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9458,16 +9481,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9597,12 +9610,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9762,6 +9785,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11178,15 +11231,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11235,6 +11279,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12411,6 +12458,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13553,6 +13603,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13751,9 +13804,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14457,6 +14507,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14468,6 +14526,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14480,6 +14550,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14835,6 +14929,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14937,6 +15039,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14988,10 +15093,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15024,6 +15129,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15076,6 +15256,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15222,6 +15408,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15261,6 +15453,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15285,6 +15485,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15329,34 +15532,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15497,6 +15709,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15525,7 +15745,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15674,6 +15894,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15749,6 +15977,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15854,33 +16085,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15890,12 +16164,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16214,8 +16501,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16356,9 +16643,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18263,24 +18547,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19453,6 +19744,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21268,10 +21562,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22672,6 +22962,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24213,6 +24518,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25709,15 +26029,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25959,6 +26270,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25994,6 +26342,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26003,6 +26354,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26012,15 +26366,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26053,7 +26425,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26070,9 +26448,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26765,6 +27140,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27603,6 +27981,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27623,46 +28007,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27695,6 +28087,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28070,9 +28468,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28557,9 +28952,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28678,42 +29070,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28726,15 +29109,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30827,9 +31201,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/mr.po b/i18n/po/mr.po
index 4d27c21..b6f77fa 100644
--- a/i18n/po/mr.po
+++ b/i18n/po/mr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2015-05-24 23:45+0000\n"
"Last-Translator: Singleton <singleton47+ubuntuone at live.com>\n"
"Language-Team: Marathi <mr at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:01+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:58+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: mr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3333,6 +3333,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3341,6 +3344,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4005,6 +4013,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4061,6 +4072,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9039,46 +9053,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9193,7 +9210,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr "GPX संचिका साठवा"
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9307,9 +9330,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "OSM संचिका साठवा"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9320,8 +9340,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9483,16 +9506,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9632,12 +9645,22 @@ msgstr ""
"\n"
"GPS वेळ: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9797,6 +9820,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11214,15 +11267,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11271,6 +11315,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12446,6 +12493,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13588,6 +13638,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13786,9 +13839,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14492,6 +14542,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14503,6 +14561,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14515,6 +14585,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14870,6 +14964,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14972,6 +15074,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15023,10 +15128,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15059,6 +15164,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15111,6 +15291,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15257,6 +15443,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15296,6 +15488,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15320,6 +15520,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15364,34 +15567,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15532,6 +15744,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15560,7 +15780,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15709,6 +15929,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15784,6 +16012,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15889,33 +16120,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15925,12 +16199,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16249,8 +16536,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16391,9 +16678,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18298,24 +18582,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19488,6 +19779,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21303,10 +21597,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22707,6 +22997,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24248,6 +24553,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25744,15 +26064,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25994,6 +26305,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26029,6 +26377,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26038,6 +26389,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26047,15 +26401,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26088,7 +26460,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26105,9 +26483,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26800,6 +27175,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27638,6 +28016,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27658,46 +28042,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27730,6 +28122,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28105,9 +28503,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28592,9 +28987,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28713,42 +29105,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28761,15 +29144,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30862,9 +31236,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/ms.po b/i18n/po/ms.po
index d2874b1..80fe8eb 100644
--- a/i18n/po/ms.po
+++ b/i18n/po/ms.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2011-12-11 22:14+0000\n"
"Last-Translator: abuyop <Unknown>\n"
"Language-Team: Malay <ms at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:01+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:59+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: ms\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3305,6 +3305,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3313,6 +3316,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3977,6 +3985,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4033,6 +4044,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9011,46 +9025,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9165,7 +9182,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9279,9 +9302,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9292,8 +9312,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9455,16 +9478,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9594,12 +9607,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9759,6 +9782,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11175,15 +11228,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11232,6 +11276,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12407,6 +12454,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13549,6 +13599,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13747,9 +13800,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14453,6 +14503,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14464,6 +14522,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14476,6 +14546,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14831,6 +14925,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14933,6 +15035,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14984,10 +15089,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15020,6 +15125,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15072,6 +15252,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15218,6 +15404,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15257,6 +15449,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15281,6 +15481,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15325,34 +15528,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15493,6 +15705,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15521,7 +15741,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15670,6 +15890,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15745,6 +15973,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15850,33 +16081,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15886,12 +16160,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16210,8 +16497,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16352,9 +16639,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18259,24 +18543,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19449,6 +19740,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21264,10 +21558,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22668,6 +22958,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24209,6 +24514,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25705,15 +26025,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25955,6 +26266,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25990,6 +26338,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25999,6 +26350,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26008,15 +26362,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26049,7 +26421,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26066,9 +26444,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26761,6 +27136,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27599,6 +27977,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27619,46 +28003,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27691,6 +28083,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28066,9 +28464,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28553,9 +28948,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28674,42 +29066,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28722,15 +29105,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30823,9 +31197,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/nb.po b/i18n/po/nb.po
index 5ec6e85..af409f8 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: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2017-02-21 09:17+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: 2017-03-24 05:03+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:00+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: nb\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3396,6 +3396,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3404,6 +3407,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4070,6 +4078,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "Ingen ytre linje i multipolygon"
@@ -4126,6 +4137,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9168,46 +9182,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
-msgstr "Bytt oppløsning"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Zoom inn"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Zoom ut"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9322,7 +9339,13 @@ msgstr[1] "{0} spor, "
msgid "Save GPX file"
msgstr "Lagre GPX-fil"
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9438,9 +9461,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Lagre OSM-fil"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr "Valideringsfeil"
@@ -9451,8 +9471,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9620,20 +9643,6 @@ msgstr "Du bør velge et GPX-spor"
msgid "No selected GPX track"
msgstr "Intgen GPX-spor er valgt"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Feil ved tolking av tidssone.\n"
-"Forventet format: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Feil ved tolking av forskyvning.\n"
-"Forventet format: {0}"
-
msgid "Geotagged Images"
msgstr "Geotaggede bilder"
@@ -9765,12 +9774,26 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Feil ved tolking av forskyvning.\n"
+"Forventet format: {0}"
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Feil ved tolking av tidssone.\n"
+"Forventet format: {0}"
+
msgid "Choose visible tracks"
msgstr ""
@@ -9934,6 +9957,36 @@ msgstr "Markører fra navngitte punkt"
msgid "Named Trackpoints from {0}"
msgstr "Navngivne sporpunkt fra {0}"
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr "Zoom ut"
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr "Zoom inn"
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr "Bytt oppløsning"
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr "GPS-flagg"
@@ -11376,15 +11429,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11433,6 +11477,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12611,6 +12658,9 @@ msgstr "Valgfrie attributter:"
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13769,6 +13819,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13971,9 +14024,6 @@ msgstr ""
"Programtillegget er fjernet fra innstillingene. Start JOSM på nytt for å "
"lese programtillegg."
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr "ingen beskrivelse tilgjengelig"
@@ -14683,6 +14733,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14694,6 +14752,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14706,6 +14776,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "industriell"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -15061,6 +15155,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -15163,6 +15265,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15214,10 +15319,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15250,6 +15355,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15302,6 +15482,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15448,6 +15634,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15487,6 +15679,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15511,6 +15711,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15555,34 +15758,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15723,6 +15935,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15751,7 +15971,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15900,6 +16120,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15975,6 +16203,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -16080,33 +16311,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -16116,12 +16390,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16440,8 +16727,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16585,9 +16872,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18504,24 +18788,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19694,6 +19985,9 @@ msgstr ""
msgid "Wash"
msgstr "Bilvask"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Bilforretning"
@@ -21509,10 +21803,6 @@ msgid "garages"
msgstr "garasjer"
msgctxt "building"
-msgid "industrial"
-msgstr "industriell"
-
-msgctxt "building"
msgid "school"
msgstr "skole"
@@ -22913,6 +23203,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Arkeologisk plass"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Slagmark"
@@ -24458,6 +24763,21 @@ msgstr "Administrativt senter"
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25962,15 +26282,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -26212,6 +26523,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Importer"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26247,6 +26595,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26256,6 +26607,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26265,15 +26619,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26306,7 +26678,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26323,9 +26701,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -27018,6 +27393,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27877,6 +28255,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27897,46 +28281,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
+msgstr ""
+
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27969,6 +28361,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28347,9 +28745,6 @@ msgstr "Globalsat-import"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Import Data fra Globalsat Datalogger DG100 til GPX lag."
-msgid "Import"
-msgstr "Importer"
-
msgid "GPS Blams"
msgstr ""
@@ -28834,9 +29229,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28955,24 +29347,6 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
-msgstr ""
-
-msgid "Start adjusting"
-msgstr ""
-
-msgid "There are currently no imagery layer to adjust."
-msgstr ""
-
-msgid "No layers to adjust"
-msgstr ""
-
msgid "Normal"
msgstr "Normal"
@@ -28985,12 +29359,21 @@ msgstr "Roter 180"
msgid "Rotate 270"
msgstr "Roter 270"
-msgid "Previous image"
-msgstr "Forrige bilde"
+msgid "WayPoint Image"
+msgstr "WayPoint Bilde"
+
+msgid "Display non-geotagged photos"
+msgstr "Vis foto uten geotag posisjon"
+
+msgid "Imported Images"
+msgstr "Importerte bilder"
msgid "Next image"
msgstr "Neste bilde"
+msgid "Previous image"
+msgstr "Forrige bilde"
+
msgid "Rotate left"
msgstr "Roter mod klokken"
@@ -29003,15 +29386,6 @@ msgstr "Roter med klokken"
msgid "Rotate image right"
msgstr "Roter bildet med klokken"
-msgid "WayPoint Image"
-msgstr "WayPoint Bilde"
-
-msgid "Display non-geotagged photos"
-msgstr "Vis foto uten geotag posisjon"
-
-msgid "Imported Images"
-msgstr "Importerte bilder"
-
msgid "Import vector graphics"
msgstr ""
@@ -31115,9 +31489,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr "Delstat/provins"
diff --git a/i18n/po/nds.po b/i18n/po/nds.po
index 0f3f435..b312a32 100644
--- a/i18n/po/nds.po
+++ b/i18n/po/nds.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2009-11-29 09:01+0000\n"
"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\n"
"Language-Team: German, Low <nds at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:02+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:59+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3304,6 +3304,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3312,6 +3315,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3976,6 +3984,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4032,6 +4043,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9010,46 +9024,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9164,7 +9181,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9278,9 +9301,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9291,8 +9311,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9454,16 +9477,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9593,12 +9606,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9758,6 +9781,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11174,15 +11227,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11231,6 +11275,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12406,6 +12453,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13548,6 +13598,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13746,9 +13799,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14452,6 +14502,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14463,6 +14521,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14475,6 +14545,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14830,6 +14924,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14932,6 +15034,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14983,10 +15088,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15019,6 +15124,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15071,6 +15251,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15217,6 +15403,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15256,6 +15448,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15280,6 +15480,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15324,34 +15527,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15492,6 +15704,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15520,7 +15740,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15669,6 +15889,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15744,6 +15972,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15849,33 +16080,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15885,12 +16159,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16209,8 +16496,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16351,9 +16638,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18258,24 +18542,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19448,6 +19739,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21263,10 +21557,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22667,6 +22957,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24208,6 +24513,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25704,15 +26024,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25954,6 +26265,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25989,6 +26337,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25998,6 +26349,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26007,15 +26361,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26048,7 +26420,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26065,9 +26443,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26760,6 +27135,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27598,6 +27976,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27618,46 +28002,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27690,6 +28082,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28065,9 +28463,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28552,9 +28947,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28673,42 +29065,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28721,15 +29104,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30822,9 +31196,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/nl.po b/i18n/po/nl.po
index d9e6f1b..f3a74d5 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: 2017-03-23 03:37+0100\n"
-"PO-Revision-Date: 2017-02-27 19:58+0000\n"
-"Last-Translator: korst <Unknown>\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"PO-Revision-Date: 2017-04-28 06:42+0000\n"
+"Last-Translator: Dirk Stöcker <launchpad at dstoecker.de>\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: 2017-03-24 04:43+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:42+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: nl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1532,7 +1532,7 @@ msgid "Toggles the global setting ''{0}''."
msgstr "De algemene instelling \"{0}\" in-/uitschakelen."
msgid "Discourage upload"
-msgstr ""
+msgstr "Discourage uploaden"
msgid "UnGlue Ways"
msgstr "Wegen losmaken"
@@ -3598,16 +3598,18 @@ msgid "E"
msgstr "O"
msgid "Date of imagery: {0}"
-msgstr ""
+msgstr "Datum afbeelding: {0}"
msgid "This imagery is marked as best in this region in other editors."
msgstr ""
+"Deze afbeelding is gemarkeerd als beste in deze regio in andere "
+"bewerkingsprogramma’s."
msgid "{0} mirror server {1}"
-msgstr ""
+msgstr "{0} mirror server {1}"
msgid "{0} mirror server"
-msgstr ""
+msgstr "{0} mirror server"
msgid "Update default entries"
msgstr "Standaard items bijwerken"
@@ -3650,6 +3652,9 @@ msgstr "Projectie"
msgid "Matrix set identifier"
msgstr "Identificatie instellen matrix"
+msgid "No default layer selected, choosing first layer."
+msgstr "Geen standaarlaag geselecteerd, kies eerst de laag."
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Geen lagen gedefinieerd door document getCapabalities: {0}"
@@ -3660,6 +3665,13 @@ msgstr ""
"eindelement {2}"
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+"Kan laag {0} niet gebruiken omdat er geen ondersteunde indelingen werden "
+"gevonden. Laag is beschikbaar in de indelingen: {1}"
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4372,6 +4384,9 @@ msgstr "Deze test kijkt na of multipolygonen geldig zijn"
msgid "Area style way is not closed"
msgstr "Gebied is niet gesloten"
+msgid "No outer way for boundary"
+msgstr "Geen buitenste weg voor grens"
+
msgid "No outer way for multipolygon"
msgstr "Geen buitenste weg voor multipolygoon"
@@ -4437,6 +4452,9 @@ 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"
+msgid "Non-Way in boundary"
+msgstr "Geen weg in grens"
+
msgid "Non-Way in multipolygon"
msgstr "Multipolygoonrelatie bevat een lid dat geen ''weg'' is"
@@ -8712,10 +8730,10 @@ msgstr ""
"Bestand of via de werkbalk.</html>"
msgid "Zoom to downloaded data"
-msgstr ""
+msgstr "Zoomen naar gedownloade gegevens"
msgid "Select to zoom to entire newly downloaded data."
-msgstr ""
+msgstr "Selecteren om te zoomen naar de geheel nieuw gedownloade gegevens."
msgid ""
"Use left click&drag to select area, arrows or right mouse button to scroll "
@@ -10003,47 +10021,50 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} object te verwijderen:"
msgstr[1] "{0} objecten te verwijderen:"
-msgid "Show tile info"
-msgstr "Informatie over tegel weergeven"
+msgid "Native projections"
+msgstr "Eigen projecties"
-msgid "Tile Info"
-msgstr "Tegelinfo"
+msgid "Offset"
+msgstr "Verschuiving"
-msgid "Metadata "
-msgstr "Metadata "
+msgid "Tile download projection"
+msgstr "Projectie voor donwloaden van tegels"
-msgid "Load tile"
-msgstr "Tegel laden"
+msgid "Tile display projection"
+msgstr "Projectie voor weergave van tegels"
-msgid "Auto zoom"
-msgstr "Automatisch zoomen"
+msgid "Current zoom"
+msgstr "Huidig zoomniveau"
-msgid "Auto load tiles"
-msgstr "Automatisch tegels laden"
+msgid "Show tile info"
+msgstr "Informatie over tegel weergeven"
-msgid "Show errors"
-msgstr "Fouten weergeven"
+msgid "Tile Info"
+msgstr "Tegelinfo"
-msgid "Load all tiles"
-msgstr "Alle tegels laden"
+msgid "Tile name"
+msgstr "Naam tegel"
-msgid "Load all error tiles"
-msgstr "Alle tegels met fouten laden"
+msgid "Tile URL"
+msgstr "URL voor tegel"
-msgid "Zoom to native resolution"
-msgstr "Zoom naar eigen resolutie"
+msgid "Tile size"
+msgstr "Tegelgrootte"
-msgid "Change resolution"
-msgstr "Resolutie veranderen"
+msgid "Tile display size"
+msgstr "Grootte weergave tegel"
-msgid "Increase zoom"
-msgstr "Zoom vergroten"
+msgid "Reprojection"
+msgstr "Opnieuw projecteren"
-msgid "Decrease zoom"
-msgstr "Zoom verkleinen"
+msgid "Reprojected tile size"
+msgstr "Opnieuw geprojecteerde grootte van tegel"
-msgid "Flush tile cache"
-msgstr "Cache van tegels leegmaken"
+msgid "Metadata "
+msgstr "Metadata "
+
+msgid "Load tile"
+msgstr "Tegel laden"
msgid "Failed to create tile source"
msgstr "Maken van bron voor tegels mislukt"
@@ -10160,8 +10181,14 @@ msgstr[1] "{0} sporen, "
msgid "Save GPX file"
msgstr "GPX-bestand opslaan"
-msgid "Imagery fade"
-msgstr "Afbeelding vervagen"
+msgid "Id"
+msgstr "ID"
+
+msgid "Min. zoom"
+msgstr "Min. zoom"
+
+msgid "Max. zoom"
+msgstr "Max. zoom"
msgid "Unsupported imagery type: {0}"
msgstr "Niet ondersteund type afbeelding: {0}"
@@ -10234,7 +10261,7 @@ msgid "Upload is discouraged"
msgstr "Uploaden wordt afgeraden"
msgid "Upload is blocked"
-msgstr ""
+msgstr "Uploaden is geblokkeerd"
msgid "Convert to GPX layer"
msgstr "Naar GPX-laag omzetten"
@@ -10276,9 +10303,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "OSM-bestand opslaan"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "EPSG:4326- en Mercator-projectie worden ondersteund"
-
msgid "Validation errors"
msgstr "Fouten bij valideren"
@@ -10289,11 +10313,15 @@ msgid "Set WMS Bookmark"
msgstr "Stel WMS-bladwijzer in"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
msgstr ""
-"JOSM zal EPSG:4326 gebruiken om de server te bevragen, maar resultaten "
-"kunnen variëren, afhankelijk van de WMSserver"
+"Opnieuw projecteren van laag {0} van {1} naar {2}. Voor de beste kwaliteit "
+"en uitvoering van de afbeelding, schakel naar een van de ondersteunde "
+"projecties: {3}"
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
+msgstr "Kan geen ondersteunde projectie vinden voor laag {0}. Gebruik {1}."
msgid "Correlate to GPX"
msgstr "Met GPX relateren"
@@ -10466,20 +10494,6 @@ msgstr "U moet een GPX-spoor selecteren"
msgid "No selected GPX track"
msgstr "Geen GPX-spoor geselecteerd"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Fout tijdens parsen van tijdzone.\n"
-"Verwachtte indeling: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Fout tijdens parsen van verschuiving.\n"
-"Verwachtte indeling: {0}"
-
msgid "Geotagged Images"
msgstr "Afbeeldingen met geo-tags"
@@ -10621,12 +10635,26 @@ msgstr ""
"\n"
"GPS-tijd: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Fout tijdens parsen van verschuiving.\n"
+"Verwachtte indeling: {0}"
+
msgid "Show thumbnails"
msgstr "Miniaturen weergeven"
msgid "Show image thumbnails instead of icons."
msgstr "Miniaturen van afbeeldingen weergeven in plaats van pictogrammen"
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Fout tijdens parsen van tijdzone.\n"
+"Verwachtte indeling: {0}"
+
msgid "Choose visible tracks"
msgstr "Kies zichtbare sporen"
@@ -10803,6 +10831,36 @@ msgstr "Markeringen van benoemde punten"
msgid "Named Trackpoints from {0}"
msgstr "Benoemde spoorpunten van {0}"
+msgid "Auto load tiles"
+msgstr "Automatisch tegels laden"
+
+msgid "Auto zoom"
+msgstr "Automatisch zoomen"
+
+msgid "Decrease zoom"
+msgstr "Zoom verkleinen"
+
+msgid "Flush tile cache"
+msgstr "Cache van tegels leegmaken"
+
+msgid "Increase zoom"
+msgstr "Zoom vergroten"
+
+msgid "Load all tiles"
+msgstr "Alle tegels laden"
+
+msgid "Load all error tiles"
+msgstr "Alle tegels met fouten laden"
+
+msgid "Show errors"
+msgstr "Fouten weergeven"
+
+msgid "Change resolution"
+msgstr "Resolutie veranderen"
+
+msgid "Zoom to native resolution"
+msgstr "Zoom naar eigen resolutie"
+
msgid "gps marker"
msgstr "GPS-markering"
@@ -12063,15 +12121,15 @@ msgstr "Te voet"
msgctxt "Heat map"
msgid "User Normal"
-msgstr ""
+msgstr "Gebruiker Normaal"
msgctxt "Heat map"
msgid "User Light"
-msgstr ""
+msgstr "Lichte gebruiker"
msgctxt "Heat map"
msgid "Traffic Lights"
-msgstr ""
+msgstr "Verkeerslichten"
msgctxt "Heat map"
msgid "Inferno"
@@ -12090,7 +12148,7 @@ msgid "Heat"
msgstr "Hitte"
msgid "Use points instead of lines for heat map"
-msgstr ""
+msgstr "Punten gebruiken in plaats van lijnen voor Heatmap"
msgid "Create markers when reading GPX"
msgstr "Maak markeringen bij het lezen van GPX"
@@ -12226,20 +12284,21 @@ msgid "Track and Point Coloring"
msgstr "Kleuren van sporen en punten"
msgid "Overlay gain adjustment"
-msgstr ""
+msgstr "Overlay aanpassing winst"
msgid "Lower limit of visibility"
-msgstr ""
+msgstr "Ondergrens zichtbaarheid"
msgid "Adjust the gain of overlay blending."
-msgstr ""
+msgstr "Aanpassen van de winst bij het samenvoegen van de overlay."
msgid "Draw all GPX traces that exceed this threshold."
-msgstr ""
+msgstr "Alle GPX-sporen tekenen die groter zijn dan deze drempel."
msgid ""
"Render engine uses points with simulated position error instead of lines. "
msgstr ""
+"Renderen gebruikt punten met gesimuleerde positiefout in plaats van lijnen. "
msgid "Colors points and track segments by data limits."
msgstr ""
@@ -12440,15 +12499,6 @@ msgstr "Cache-naam"
msgid "Object Count"
msgstr "Aantal objecten"
-msgid "imagery fade"
-msgstr "Afbeelding vervagen"
-
-msgid "Fade Color: "
-msgstr "Kleur voor vervagen: "
-
-msgid "Fade amount: "
-msgstr "Hoeveelheid vervagen: "
-
msgid "Soft"
msgstr "Zacht"
@@ -12499,6 +12549,11 @@ msgstr "Achtergrondafbeelding: standaard"
msgid "Available default entries:"
msgstr "Beschikbare standaard items:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+"Nieuwe standaarditems kunnen worden toegevoegd in de <a "
+"href=\"{0}\">Wiki</a>."
+
msgid "Selected entries:"
msgstr "Geselecteerde items:"
@@ -13799,6 +13854,9 @@ msgstr "Optionele attributen:"
msgid "Unknown requisite: {0}"
msgstr "Onbekend vereiste: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "Ongeldige uitdrukking voor lid: {0}"
@@ -15081,6 +15139,9 @@ msgstr "vervangen door nieuwe {0} plug-in"
msgid "no longer required"
msgstr "niet langer vereist"
+msgid "Plugin information"
+msgstr "Informatie over plug-in"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -15322,9 +15383,6 @@ msgstr ""
"De plug-in is verwijderd uit de configuratie. Start JOSM opnieuw op om de "
"plug-in te ontladen."
-msgid "Plugin information"
-msgstr "Informatie over plug-in"
-
msgid "no description available"
msgstr "geen omschrijving beschikbaar"
@@ -16231,16 +16289,36 @@ msgid "farmland"
msgstr "landbouwgrond"
msgctxt "landuse"
+msgid "farmyard"
+msgstr "boerenerf"
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr "begraafplaats"
+
+msgctxt "landuse"
msgid "residential"
msgstr "woongebied"
msgctxt "landuse"
msgid "greenfield"
-msgstr ""
+msgstr "weiland"
msgctxt "landuse"
msgid "village_green"
-msgstr ""
+msgstr "meent"
+
+msgctxt "landuse"
+msgid "quarry"
+msgstr "groeve"
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr "bouwsels"
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr "wijngaard"
msgctxt "natural"
msgid "scrub"
@@ -16252,7 +16330,31 @@ msgstr "hout"
msgctxt "natural"
msgid "grassland"
-msgstr ""
+msgstr "grasland"
+
+msgctxt "natural"
+msgid "wetland"
+msgstr "nat land"
+
+msgctxt "natural"
+msgid "heath"
+msgstr "heide"
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr "brandweer"
+
+msgctxt "leisure"
+msgid "park"
+msgstr "park"
+
+msgctxt "leisure"
+msgid "track"
+msgstr "spoor"
+
+msgctxt "building"
+msgid "industrial"
+msgstr "industrieel"
msgctxt "Relation type"
msgid "associatedStreet"
@@ -16609,6 +16711,17 @@ 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 "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+"imagico.de OSM-afbeeldingen voor in kaart brengen: Enderby Land en Kemp Coast"
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+"Sentinel-2 afbeeldingen kanalen 234 (ware kleuren), Sentinel-2 afbeeldingen "
+"van Enderby Land en Kemp Coast begin 2017"
+
msgid "IGN Argentina (TMS)"
msgstr "IGN Argentinië (TMS)"
@@ -16700,16 +16813,19 @@ msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
msgstr "imagico.de OSM images for mapping: Rila and Pirin Mountains"
msgid "OpenStreetMap (Belgian Style)"
-msgstr ""
+msgstr "OpenStreetMap (Belgische stijl)"
msgid "OpenStreetMap (Belgian Style - French)"
-msgstr ""
+msgstr "OpenStreetMap (Belgische stijl - Frans)"
msgid "OpenStreetMap (Belgian Style - Dutch)"
-msgstr ""
+msgstr "OpenStreetMap (Belgische stijl - Nederlands)"
msgid "OpenStreetMap (Belgian Style - German)"
-msgstr ""
+msgstr "OpenStreetMap (Belgische stijl - Duits)"
+
+msgid "Orthophoto IGN-NGI"
+msgstr "Orthophoto IGN-NGI"
msgid "AGIV Flanders most recent aerial imagery"
msgstr "AGIV Vlaanderen meest recente luchtfoto''s"
@@ -16724,13 +16840,13 @@ msgid "URBISfr numerical imagery (2013)"
msgstr "URBISfr numerieke afbeeldingen (2013)"
msgid "URBISfr numerical imagery"
-msgstr ""
+msgstr "URBISfr numerieke afbeeldingen"
msgid "URBISnl numerical imagery (2013)"
msgstr "URBISnl numerieke afbeeldingen (2013)"
msgid "URBISnl numerical imagery"
-msgstr ""
+msgstr "URBISnl numerieke afbeeldingen"
msgid "URBIS 2009 aerial imagery"
msgstr "URBIS 2009 luchtfoto''s"
@@ -16745,13 +16861,13 @@ msgid "URBIS 2015 aerial imagery"
msgstr "URBIS 2015 luchtfoto''s"
msgid "URBIS 2016 aerial imagery"
-msgstr ""
+msgstr "URBIS 2016 luchtfoto’s"
msgid "SPW(allonie) PICC numerical imagery"
msgstr "SPW(allonie) PICC numerieke afbeeldingen"
msgid "SPW(allonie) most recent aerial imagery"
-msgstr ""
+msgstr "SPW(allonie) meest recente luchtfoto’s"
msgid "SPW(allonie) 2015 aerial imagery"
msgstr "SPW(allonie) 2015 luchtfoto’s"
@@ -16762,11 +16878,11 @@ msgstr "SPW(allonie) 2012-2013 luchtfoto’s"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 luchtfoto’s"
-msgid "TEC bus lines (2014)"
-msgstr "TEC buslijnen (2014)"
+msgid "TEC bus lines"
+msgstr "TEC buslijnen"
-msgid "TEC bus stops (2014)"
-msgstr "TEC bushaltes (2014)"
+msgid "TEC bus stops"
+msgstr "TEC bushaltes"
msgid "Benin: Cotonou Pleiade 2016"
msgstr "Benin: Cotonou Pleiade 2016"
@@ -16798,6 +16914,81 @@ msgstr "Londrina Ortofoto 2011"
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr "SIG Santa Catarina OrtoRGB 2012"
+msgid "Arapiraca AL"
+msgstr "Arapiraca AL"
+
+msgid "Branquinha AL"
+msgstr "Branquinha AL"
+
+msgid "Cajueiro AL"
+msgstr "Cajueiro AL"
+
+msgid "Campo Alegre AL"
+msgstr "Campo Alegre AL"
+
+msgid "Capela AL"
+msgstr "Capela AL"
+
+msgid "Delmiro Gouveia AL"
+msgstr "Delmiro Gouveia AL"
+
+msgid "Estrela de Alagoas"
+msgstr "Estrela de Alagoas"
+
+msgid "Girau do Ponciano"
+msgstr "Girau do Ponciano"
+
+msgid "Major Isidoro AL"
+msgstr "Major Isidoro AL"
+
+msgid "Mar Vermelho AL"
+msgstr "Mar Vermelho AL"
+
+msgid "Minador do Negrão"
+msgstr "Minador do Negrão"
+
+msgid "Olho d’Agua do Casado AL"
+msgstr "Olho d’Agua do Casado AL"
+
+msgid "Palestina AL"
+msgstr "Palestina AL"
+
+msgid "Palmeira dos Indios AL"
+msgstr "Palmeira dos Indios AL"
+
+msgid "Pão de Açucar AL"
+msgstr "Pão de Açucar AL"
+
+msgid "Piranhas AL"
+msgstr "Piranhas AL"
+
+msgid "Poço das Trincheiras AL"
+msgstr "Poço das Trincheiras AL"
+
+msgid "Santana do Ipanema AL"
+msgstr "Santana do Ipanema AL"
+
+msgid "São Miguel dos Campos AL"
+msgstr "São Miguel dos Campos AL"
+
+msgid "Teotonio Vilela AL"
+msgstr "Teotonio Vilela AL"
+
+msgid "União dos Palmares AL"
+msgstr "União dos Palmares AL"
+
+msgid "Viçosa AL"
+msgstr "Viçosa AL"
+
+msgid "Alagoas Litoral 2006"
+msgstr "Alagoas Litoral 2006"
+
+msgid "DER-ES"
+msgstr "DER-ES"
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr "IBGE-BC250-Trecho Rodoviario"
+
msgid "Geobase Hydrography"
msgstr "Geobase Hydrografie"
@@ -16852,6 +17043,12 @@ msgstr "Czech RUIAN parcely"
msgid "Czech pLPIS"
msgstr "Czech pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr "Praag IPR laatste luchtfoto’s"
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr "Praag IPR lage-vegetatie luchtfoto"
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Denemarken)"
@@ -17002,6 +17199,12 @@ msgstr "Berlijn luchtfoto''s 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Berlijn luchtfoto''s 2016"
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr "Deutsche Bahn VzG lijnen november 2013"
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr "Deutsche Bahn VzG lijnen november 2015"
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Erlangen luchtfoto''s (2016 5.0 cm)"
@@ -17045,29 +17248,43 @@ msgstr ""
"imagico.de OSM images for mapping: Northern German west coast tidalflats "
"(infrared)"
-msgid "Saxony latest aerial imagery"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
msgstr ""
+"imagico.de OSM-afbeeldingen voor in kaart brengen: North Sea Coast 2016"
-msgid "Saxony latest aerial imagery infrared"
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
msgstr ""
+"234 kanalen (ware kleuren), Bijgewerkte getijden afbeelding van de kust voor "
+"het bijwerken van het in kaart brengen van droogvallende plekken en platen"
+
+msgid "Saxony latest aerial imagery"
+msgstr "Saksen laatste luchtfoto’s"
+
+msgid "Saxony latest aerial imagery infrared"
+msgstr "Saksen laatste infrarode luchtfoto’s"
msgid "Saxony aerial imagery 2005"
-msgstr ""
+msgstr "Saksen luchtfoto’s 2005"
msgid "Saxony WebAtlasSN"
-msgstr ""
+msgstr "Saksen WebAtlasSN"
msgid "Saxony topographic map"
-msgstr ""
+msgstr "Saksen topografische kaart"
msgid "Saxony digital terrain model"
-msgstr ""
+msgstr "Saksen digitaal terreinmodel"
msgid "Mainz all aerial imageries"
-msgstr ""
+msgstr "Mainz alle luchtfoto’s"
msgid "Mainz latest aerial imagery"
-msgstr ""
+msgstr "Mainz laatste luchtfoto’s"
+
+msgid "Munich latest aerial imagery 60cm"
+msgstr "München laatste luchtfoto’s 60cm"
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr "imagico.de OSM images for mapping: Qasigiannguit"
@@ -17121,36 +17338,45 @@ msgstr "Drone-afbeeldingen Canaan(Haiti) november 2015"
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr "Drone Imagery Matthew(Haiti) oktober 2016"
-msgid "FÖMI ortophoto 2000"
-msgstr "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
+msgstr "FÖMI luchtfoto 2000"
-msgid "FÖMI ortophoto 2005"
-msgstr "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
+msgstr "FÖMI luchtfoto 2005"
-msgid "Szeged ortophoto 2011"
-msgstr "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
+msgstr "Szeged luchtfoto 2011"
msgid "Inner part of Szeged"
msgstr "Binnenste gedeelte van Szeged"
-msgid "Törökbálint ortophoto 2013"
-msgstr "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
+msgstr "Törökbálint luchtfoto 2013"
msgid "5 cm resolution bald image"
msgstr "5 cm resolutie bald afbeelding"
-msgid "Törökbálint ortophoto 2015"
-msgstr "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
+msgstr "Törökbálint luchtfoto 2015"
-msgid "Danube flood ortophoto 2013"
-msgstr "Danube overstroming ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
+msgstr "Danube overstroming luchtfoto 2013"
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Rivieroevers van Danube in Boedapest, Szentendre en Szigetmonostor"
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
msgstr "Boedapest district XI luchtfoto 2015"
+msgid "Budapest district XI orthophoto 2017"
+msgstr "Boedapest district XI luchtfoto 2017"
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr "Sóskút, Pusztazámor, Tárnok, Diósd luchtfoto 2017"
+
+msgid "5 cm resolution bald image of 4 settlement"
+msgstr "5 cm resolutie kale afbeelding van 4 nederzettingen"
+
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Hongarije (wandelroutes)"
@@ -17263,10 +17489,10 @@ msgid "ORT10LT (Lithuania)"
msgstr "ORT10LT (Litouwen)"
msgid "geoportail.lu all layers"
-msgstr ""
+msgstr "geoportail.lu alle lagen"
msgid "geoportail.lu ortho 2016"
-msgstr ""
+msgstr "geoportail.lu ortho 2016"
msgid "Luxembourg Inspire Railway"
msgstr "Luxemburg Inspire spoorwegen"
@@ -17281,14 +17507,24 @@ msgid "Niger Delta Oct 2012 Landsat"
msgstr "Niger Delta Oct 2012 Landsat"
msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
-msgstr ""
+msgstr "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
-msgstr ""
+msgstr "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard -Orthophoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr "imagico.de OSM-afbeeldingen voor in kaart brengen: Svalbard mozaïek"
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+"Meest Sentinel-2 2016 kanalen 234 (ware kleuren), Sentinel-2 mozaïek van "
+"Svalbard"
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr "imagico.de OSM images for mapping: Western Karakoram"
@@ -17320,8 +17556,8 @@ msgid ""
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)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: Ortofotomapa (luchtfoto)"
@@ -17473,6 +17709,16 @@ msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
"imagico.de OSM-afbeeldingen voor in kaart brengen: Vostochny Cosmodrome"
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr "imagico.de OSM-afbeeldingen voor in kaart brengen: Pechora Sea Coast"
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+"234 kanalen (ware kleuren), Sentinel-2afbeldding van de kust van de Pechora "
+"Sea in herfst 2016"
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Car"
@@ -17548,6 +17794,9 @@ msgstr "Kanton Aargau 25cm (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Kanton Aargau 25cm (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr "Kanton Aargau 25cm (AGIS 2016)"
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr "Kanton Zürich Orthophotos 2014/2015 10cm"
@@ -17564,10 +17813,10 @@ msgid "Stadt Zürich Luftbild 2011"
msgstr "Stad Zürich Luchtfoto 2011"
msgid "Canton Solothurn latest aerial imagery SOGIS RGB"
-msgstr ""
+msgstr "Kanton Solothurn laatste luchtofot’s SOGIS RGB"
msgid "Canton Solothurn latest aerial imagery SOGIS Infrared"
-msgstr ""
+msgstr "Kanton Solothurn laatste luchtfoto’s SOGIS Infrarood"
msgid "Canton de Génève 5cm (SITG 2011)"
msgstr "Kanton Génève 5cm (SITG 2011)"
@@ -17656,33 +17905,78 @@ msgstr "TIGER 2012 Roads Overlay"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr "New & Misaligned TIGER Roads (2015)"
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
msgid "NC Latest Orthoimagery"
msgstr "NC Laatste luchtfoto''s"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
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 ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr "NJ 2015 Aerial Imagery (Infrared)"
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr "NJ 2015 Aerial Imagery (Natural Color)"
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
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 ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr "WA 2016 luchtfoto voor San Juan County"
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+"Luchtfoto’s voor het publieke domein, genomen in mei, juni en juli van San "
+"Juan County, WA. Resolutie is 6 inch countybreed."
+
msgid "WA Vector Streetmap for San Juan County"
msgstr "WA Vector Streetmap for San Juan County"
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr "Texas Orthophoto"
@@ -17690,14 +17984,27 @@ msgid "Philadelphia 2015 Imagery"
msgstr "Philadelphia 2015 Imagery"
msgid "MD Latest 6 Inch Aerial Imagery"
+msgstr "MD Laatste 6 Inch luchtfoto’s"
+
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
msgstr ""
msgid "MD Three Inch Aerial Imagery"
msgstr "MD Three Inch Aerial Imagery"
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr "MD Transportation Basemap"
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr "Delaware 2012 Orthophotography"
@@ -18031,9 +18338,11 @@ msgstr ""
"achtergrondlagen te vereenvoudigen. Geoptimaliseerd voor basemap.at."
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
+"Wijst automatisch het adres toe aan een geselecteerd object in Oostenrijk. "
+"Data © Österreichisches Adressregister 2017, N 23806/2017."
msgid ""
"Allows the user to correct angle of buildings to 90 degrees, and aligns all "
@@ -18085,6 +18394,7 @@ msgstr ""
msgid "Tool for conflating data (matching and merging)."
msgstr ""
+"programma voor samenvoegen van gegevens (overeenkomsten en samenvoegen)."
msgid "Downloads new data when you pan/zoom"
msgstr "Nieuwe gegevens downloaden als u pant/zoomt"
@@ -18216,9 +18526,6 @@ msgstr ""
"Database van verschuivingen in afbeeldingen: deel en verkrijg verschuivingen "
"van afbeeldingen met één knop."
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "WMSPlugin-stijl afbeeldingen aanpassen van kaartmodus"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18240,6 +18547,8 @@ msgid ""
"Extends ImproveWayAccuracy mode with helpers to place nodes at accurate "
"distances and angles."
msgstr ""
+"Breidt modus ImproveWayAccuracy uit met helpers om knopen op nauwkeurige "
+"afstanden en hoeken te plaatsen."
msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
@@ -18472,6 +18781,9 @@ msgid ""
"Expand a simple intersection to a roundabout in gradual steps. Select an "
"intersection node or a roundabout and press Crtl-Shift-R"
msgstr ""
+"Breidt een eenvoudige kruising uit tot een rotonde in graduele stappen. "
+"Selecteer een knoop van een kruising node of een rotonde en druk op Crtl-"
+"Shift-R"
msgid ""
"Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -20264,26 +20576,33 @@ msgstr "Fietsstrook/-pad"
msgid "Cycleway"
msgstr "Fietspad"
+msgctxt "cycleway"
msgid "lane"
msgstr "rijstrook"
+msgctxt "cycleway"
msgid "track"
-msgstr "baan"
+msgstr "spoor"
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "tweerichtingsverkeer"
+msgstr "tegemoetkomende_rijstrook"
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "tweerichtingsverkeer"
+msgstr "tegemoetkomend_spoor"
+msgctxt "cycleway"
msgid "opposite"
-msgstr "twee richtingen"
+msgstr "tegemoetkomend"
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "gedeelde busstrook"
+msgstr "gedeelde busbaan"
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "gedeelde rijstrook"
+msgstr "gedeelde_rijstrook"
msgid "Cycleway left"
msgstr "Fietspad aan de linkerkant"
@@ -21462,6 +21781,9 @@ msgstr "Lidmaatschapskaart"
msgid "Wash"
msgstr "Autowasstraat"
+msgid "Self Service"
+msgstr "Zelfbediening"
+
msgid "Car Dealer"
msgstr "Autodealer"
@@ -22595,7 +22917,7 @@ msgid "Assisted Living"
msgstr "Begeleid wonen"
msgid "Outreach"
-msgstr ""
+msgstr "Opvang"
msgctxt "social_facility"
msgid "Shelter"
@@ -22692,7 +23014,7 @@ msgid "Telephone cards"
msgstr "Telefoonkaarten"
msgid "Internet Cafe"
-msgstr ""
+msgstr "Internetcafé"
msgid "Internet Access"
msgstr "Internettoegang"
@@ -22740,7 +23062,7 @@ msgid "Shows humidity"
msgstr "Toont luchtvochtigheid"
msgid "Photo booth"
-msgstr ""
+msgstr "Fotobox"
msgid "Recycling Container"
msgstr "Recyclecontainer"
@@ -23280,10 +23602,6 @@ msgid "garages"
msgstr "garages"
msgctxt "building"
-msgid "industrial"
-msgstr "industrieel"
-
-msgctxt "building"
msgid "school"
msgstr "school"
@@ -24678,14 +24996,29 @@ msgid "fortress"
msgstr "fort"
msgid "manor"
-msgstr ""
+msgstr "landhuis"
msgid "palace"
-msgstr ""
+msgstr "paleis"
msgid "Archaeological Site"
msgstr "Archeologische opgraving"
+msgid "tumulus"
+msgstr "grafheuvel"
+
+msgid "megalith"
+msgstr "megaliet"
+
+msgid "fortification"
+msgstr "fortificatie"
+
+msgid "settlement"
+msgstr "nederzetting"
+
+msgid "necropolis"
+msgstr "dode stad"
+
msgid "Battlefield"
msgstr "Historisch slagveld"
@@ -24766,7 +25099,7 @@ msgid "Seafood"
msgstr "Viswinkel"
msgid "Dairy"
-msgstr ""
+msgstr "Zuivel"
msgid "Deli (Fine Food)"
msgstr "Delicatessen (fijne kost)"
@@ -25039,7 +25372,7 @@ msgid "cigarettes"
msgstr "sigaretten"
msgid "coffee"
-msgstr ""
+msgstr "koffie"
msgid "condoms"
msgstr "condooms"
@@ -25565,7 +25898,7 @@ msgid "coral"
msgstr "koraal"
msgid "oyster"
-msgstr ""
+msgstr "oester"
msgid "rock"
msgstr "steen"
@@ -26243,6 +26576,21 @@ msgstr "Administratief centrum"
msgid "Label point"
msgstr "Punt labellen"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "Locatie"
@@ -26559,91 +26907,91 @@ msgid "View URL"
msgstr ""
msgid "Send Email"
-msgstr ""
+msgstr "E-mail verzenden"
msgid "View image"
-msgstr ""
+msgstr "Afbeelding bekijken"
msgid "View %name% article"
-msgstr ""
+msgstr "Bekijk artikel %name%"
msgid "View Wikidata page"
-msgstr ""
+msgstr "Pagina van Wikidata bekijken"
msgid "View UNESCO sheet"
-msgstr ""
+msgstr "Blad van UNESCO bekijken"
msgid "View %name% image"
-msgstr ""
+msgstr "Afbeelding %name% bekijken"
msgid "View %name% sheet of river"
-msgstr ""
+msgstr "Blad van rivier %name% bekijken"
msgid "View %name% municipality sheet"
-msgstr ""
+msgstr "Blad van gemeente %name% bekijken"
msgid "View %name% sheet on osm.fr"
-msgstr ""
+msgstr "Blad %name% bekijken op OSM.fr"
msgid "View %name% map of municipalities"
-msgstr ""
+msgstr "Kaart van gemeenten %name% bekijken"
msgid "View %name% list of municipalities"
-msgstr ""
+msgstr "Lijst van gemeenten %name% bekijken"
msgid "View %name% map of cantons"
-msgstr ""
+msgstr "Kaart van kantons %name% bekijken"
msgid "View %name% list of cantons"
-msgstr ""
+msgstr "Lijst van kantons %name% bekijken"
msgid "View %name% map of arrondissements"
-msgstr ""
+msgstr "Kaart van arrondissementen %name% bekijken"
msgid "View %name% list of arrondissements"
-msgstr ""
+msgstr "Lijst van arrondissementen %name% bekijken"
msgid "View %name% map of departments"
-msgstr ""
+msgstr "Kaart van departementen %name% bekijken"
msgid "View %name% list of departments"
-msgstr ""
+msgstr "Lijst van departementen %name% bekijken"
msgid "View %name% map of regions"
-msgstr ""
+msgstr "Kaart van regio’s %name% bekijken"
msgid "View %name% list of regions"
-msgstr ""
+msgstr "Lijst van regio’s %name% bekijken"
msgid "View %name% sheet of church"
-msgstr ""
+msgstr "Blad van kerk %name% bekijken"
msgid "View Mérimée sheet of monument"
-msgstr ""
+msgstr "Mériméeblad van monument bekijken"
msgid "View Mérimée list for this municipality"
-msgstr ""
+msgstr "Mériméelijst voor deze gemeente bekijken"
msgid "View %name% sheet of geodesic site"
-msgstr ""
+msgstr "Blad %name% van geodesische site bekijken"
msgid "View UAI sheet of school/college"
-msgstr ""
+msgstr "Blad UAI van school/college bekijken"
msgid "View %name% sheet of hospital/home"
-msgstr ""
+msgstr "Blad %name% va ziekenhuis/verzorgingshuis bekijken"
msgid "View explanation of %name% code"
-msgstr ""
+msgstr "Uitleg van code %name% bekijken"
msgid "Get identification card (pdf) for this establishment"
-msgstr ""
+msgstr "Haal identificatiekaart (pdf) voor dit etablissement op"
msgid "View %name% page of this post office"
-msgstr ""
+msgstr "Pagina %name% van dit postkantoor bekijken"
msgid "View %name% sheet of memorial"
-msgstr ""
+msgstr "Blad %name% voor dit monument bekijken"
msgid "Even housenumber in odd address interpolation."
msgstr "Even huisnummer in interpolatie voor oneven adressen."
@@ -26749,7 +27097,7 @@ 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 ""
+msgstr "straat met oneven nummer {0}, maar zonder {1} en {2} of {3}"
msgid "{0} is deprecated"
msgstr "{0} is vervallen"
@@ -27124,32 +27472,42 @@ msgstr ""
msgid "wikipedia title should not start with a space after language code"
msgstr ""
+"Titel voor Wikipedia zou niet moeten beginnen met een spatie na de taalcode"
msgid "wikipedia title should not have ''{0}'' prefix"
-msgstr ""
+msgstr "Titel voor Wikipedia zou geen voorvoegsel ''{0}'' moeten hebben"
msgid "wikipedia page title should have first letter capitalized"
msgstr ""
+"Paginatitel voor Wikipedia zou een hoofdletter als eerste letter moeten "
+"hebben"
msgid ""
"wikipedia page title should have spaces instead of underscores (''_''→'' '')"
msgstr ""
+"Paginatitel voor Wikipedia zou spaties in plaats van underscores (''_''→'' "
+"'') moeten hebben"
msgid "wikipedia language seems to be duplicated, e.g. en:en:Foo"
-msgstr ""
+msgstr "Taal voor Wikipedia lijkt te zijn gedupliceerd, bijv. en:en:Foo"
msgid "wikidata tag must be in Qnnnn format, where n is a digit"
msgstr ""
+"Tag voor wikidata moet in de indeling Qnnnn zijn, waar n een cijfer is"
msgid ""
"wikipedia tag is set, but there is no wikidata tag. Wikipedia plugin might "
"help with wikidata id lookups"
msgstr ""
+"Tag voor Wikipedia is ingesteld, maar er is geen tag voor wikidata. Plug-in "
+"Wikipedia zou kunnen helpen met opzoeken van ID’s voor wikidata"
msgid ""
"wikipedia tag is not set, but a ''{0}'' tag is. Make sure to use "
"wikipedia=language:value together with wikidata tag."
msgstr ""
+"Tag voor Wikipedia is niet ingesteld, maar een tag ''{0}'' wel. Zorg er "
+"voor wikipedia=language:value te gebruiken samen met de tag voor wikidata."
msgid "Hide icons at low zoom"
msgstr "Pictogrammen bij laag zoomen verbergen"
@@ -27786,10 +28144,12 @@ msgid "images"
msgstr "afbeeldingen"
msgid "Mapillary object layer"
-msgstr ""
+msgstr "Mapillary objectenlaag"
msgid "Displays the layer displaying the map objects detected by Mapillary"
msgstr ""
+"Geeft de laag weer die de kaartobjecten weergeeft die zijn gedetecteerd door "
+"Mapillary"
msgid "Mapillary"
msgstr "Mapillary"
@@ -27821,15 +28181,6 @@ msgstr "Lokale afbeeldingen importeren"
msgid "Import pictures into Mapillary layer"
msgstr "Afbeeldingen naar laag van Mapillary importeren"
-msgid "Select pictures"
-msgstr "Afbeeldingen selecteren"
-
-msgid "Import pictures into sequence"
-msgstr "Afbeeldingen in reeks importeren"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Afbeeldingen in een reeks naar een laag van Mapillary importeren"
-
msgid "Join mode"
msgstr "Modus Samenvoegen"
@@ -27981,7 +28332,7 @@ msgid "No image selected"
msgstr "Geen afbeelding geselecteerd"
msgid "Press \"{0}\" to download images"
-msgstr ""
+msgstr "Druk op \"{0}\" om afbeeldingen te downloaden"
msgid "Mapillary picture"
msgstr "afbeelding van Mapillary"
@@ -28042,7 +28393,7 @@ msgid "Preview images when hovering its icon"
msgstr "Voorbeeld van afbeeldingen bij bevinden boven pictogram"
msgid "Cut off sequences at download bounds"
-msgstr ""
+msgstr "Snijd reeksen af op de randen van de download"
msgid "Download mode"
msgstr "Modus Downloaden"
@@ -28077,17 +28428,58 @@ msgstr "Geselecteerde afbeelding volgen"
msgid "Go forward"
msgstr "Naar voren gaan"
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Importeren"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
+"Een tag met de sleutel <i>{0}</i> is al aanwezig op het geselecteerde object "
+"van OSM."
msgid ""
"Do you really want to replace the current value <i>{0}</i> with the new "
"value <i>{1}</i>?"
msgstr ""
+"Wilt u echt de huidige waarde <i>{0}</i> vervangen door de nieuwe waarde "
+"<i>{1}</i>?"
msgid "Tag conflict"
-msgstr ""
+msgstr "Tagconflict"
msgid "Key copied to clipboard"
msgstr "Sleutel gekopieerd naar klembord"
@@ -28121,15 +28513,21 @@ msgstr ""
"Geeft gedetailleerde informatie weer over de momenteel geselecteerde "
"afbeelding in Mapillary"
+msgid "Show detections on top of image"
+msgstr "Detecties bovenop afbeelding weergeven"
+
msgid "View in browser"
-msgstr ""
+msgstr "Weergeven in browser"
msgid "Copy key"
-msgstr ""
+msgstr "Sleutel kopiëren"
msgid "Add Mapillary tag"
msgstr "Tag voor Mapillary toevoegen"
+msgid "Image detections"
+msgstr "Detecties in afbeelding"
+
msgid "Image actions"
msgstr "Acties voor afbeelding"
@@ -28139,20 +28537,40 @@ msgstr "Sleutel voor afbeelding"
msgid "Sequence key"
msgstr "Sleutel voor reeks"
+msgid "{0} detections"
+msgstr "{0} detecties"
+
msgid "image has no key"
msgstr "afbeelding heeft geen sleutel"
+msgid "unknown user"
+msgstr "onbekende gebruiker"
+
msgid "sequence has no key"
msgstr "reeks heeft geen sleutel"
msgid "Could not open the URL {0} in a browser"
msgstr "Kon de URL {0} niet openen in een browser"
+msgid "Downloading map objects…"
+msgstr "Kaartobjecten downloaden…"
+
+msgid "All map objects loaded."
+msgstr "Alle kaartobjecten geladen."
+
+msgid "Too many map objects, zoom in to see all."
+msgstr "Teveel kaartobjecten, zoom in om ze allemaal te zien."
+
+msgid "Downloading map objects failed!"
+msgstr "Downloaden van kaartobjecten is mislukt!"
+
msgid "Mapillary objects"
-msgstr ""
+msgstr "Objecten van Mapillary"
msgid "Displays objects detected by Mapillary from their street view imagery"
msgstr ""
+"Laat objecten zien die zijn gedetecteerd door Mapillary vanuit hun "
+"straatweergaven"
msgid "Deleted {0} image"
msgid_plural "Deleted {0} images"
@@ -28180,8 +28598,17 @@ msgstr[1] "{0} afbeeldingen gedraaid"
msgid "2 images unjoined"
msgstr "2 afbeeldingen van elkaar losgemaakt"
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr "Kon niet lezen vanuit de URL {0}!"
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
+"{0}\n"
+"Kon geen kaartobjecten lezen vanuit URL\n"
+"{1}!"
msgid "everything in the visible area"
msgstr "alles in het zichtbare gebied"
@@ -28199,9 +28626,6 @@ msgstr ""
"Het gedownloade gebied van OSM is te groot. Modus Downloaden is gewijzigd "
"naar het gebied van OSM totdat de laag opnieuw wordt gestart."
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr "Downloaden"
@@ -28855,7 +29279,7 @@ msgid "Tags:"
msgstr "Tags:"
msgid "Source:"
-msgstr ""
+msgstr "Bron:"
msgid "Name:"
msgstr "Naam:"
@@ -28893,8 +29317,8 @@ msgstr "Gemaakt gebied"
msgid "Add address"
msgid_plural "Add addresses"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Adres toevoegen"
+msgstr[1] "Adressen toevoegen"
msgid "Unable to detect a polygon where you clicked."
msgstr "Niet in staat een polygoon te detecteren waar u heeft geklikt."
@@ -29000,12 +29424,14 @@ msgid "Merge nodes with existing nodes"
msgstr "Knopen smaenvoegen met bestaande knopen"
msgid "use austria address helper"
-msgstr ""
+msgstr "Oostenrijkse hulp voor adressen gebruiken"
msgid ""
"Automatically try to find the correct address via Austria Address Helper "
"plugin"
msgstr ""
+"Probeer automatisch het juiste adres te vinden met de plug-in Austria "
+"Address Helper"
msgid "Debug"
msgstr "Foutopsporing"
@@ -29014,22 +29440,26 @@ msgid "Debugging mode will write images for each processing step."
msgstr "Modus Foutopsporing zal afbeeldingen schrijven voor elke processtap"
msgid "Fetch Address"
-msgstr ""
+msgstr "Adres ophalen"
msgid "Austria Address Helper<br>Please select exactly one object."
-msgstr ""
+msgstr "Austria Address Helper<br>Selecteer exact één object."
msgid "Austria Address Helper"
-msgstr ""
+msgstr "Austria Address Helper"
msgid "Successfully added address to selected object:"
+msgstr "Met succes adres toegevoegd aan het geselecteerde object:"
+
+msgid "Distance between building center and address coordinates:"
msgstr ""
+"Afstand tussen het midden van het gebouw en de coördinaten voor het adres:"
msgid "No address was found for this object."
-msgstr ""
+msgstr "Voor dit object werd geen adres gevonden."
msgid "An unexpected exception occurred:"
-msgstr ""
+msgstr "Er trad een onverwachte fout op:"
msgid "Building Generalization"
msgstr "Veralgemeniseren van gebouwen"
@@ -29813,7 +30243,7 @@ msgid "Remove selected matches"
msgstr "Geselecteerde overeenkomsten verwijderen"
msgid "Remove ({0})"
-msgstr ""
+msgstr "Verwijder ({0})"
msgid "Conflate"
msgstr "Samenvoegen"
@@ -29825,10 +30255,10 @@ msgid "Conflation: {0}"
msgstr "Samenvoeging: {0}"
msgid "Conflate {0} objects"
-msgstr ""
+msgstr "{0} objecten samenvoegen"
msgid "Conflate ({0})"
-msgstr ""
+msgstr "Samenvoegen ({0})"
msgid "Zoom to selected primitive(s)"
msgstr "Zoom naar geselecteerde primitief(ven)"
@@ -29840,16 +30270,16 @@ msgid "Select the primitives currently selected in the list"
msgstr "Selecteer de momenteel geselecteerde primitieven in de lijst"
msgid "Generating matches"
-msgstr ""
+msgstr "Overeenkomsten genereren"
msgid "Finding matches"
-msgstr ""
+msgstr "Overeenkomsten vinden"
msgid "Sorting scores"
-msgstr ""
+msgstr "Scores sorteren"
msgid "Discarding inferior matches"
-msgstr ""
+msgstr "Onjuiste overeenkomsten negeren"
msgid "Subject"
msgstr "Onderwerp"
@@ -29868,101 +30298,143 @@ msgstr[1] "{0} objecten toegevoegd aan onderwerplaag"
msgid "Moved {0} conflation match to unmatched list"
msgid_plural "Moved {0} conflation matches to unmatched list"
msgstr[0] ""
+"{0} samengevoegde overeenkomst verplaatst naar lijst die niet overeenkomen"
msgstr[1] ""
+"{0} samengevoegde overeenkomsten verplaatst naar lijst die niet overeenkomen"
msgid "Delete {0} conflation match"
msgid_plural "Delete {0} conflation matches"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} samengevoegde overeenkomst verwijderd"
+msgstr[1] "{0} samengevoegde overeenkomsten verwijderd"
msgid "Remove {0} unmatched objects"
msgstr "Verwijder {0} niet overeenkomende objecten"
msgid "Interrupted Sequence ({0}/{1}): {2}"
-msgstr ""
+msgstr "Onderbroken reeks ({0}/{1}): {2}"
msgid " Max: "
-msgstr ""
+msgstr " Max: "
msgid "Filter by area. Min: "
-msgstr ""
+msgstr "Filter op gebied. Min: "
msgid "Filter by window. Buffer: "
-msgstr ""
+msgstr "Filter op venster. Buffer: "
msgid "Union up to "
-msgstr ""
+msgstr "Verenig tot maximaal "
msgid " adjacent Reference features"
-msgstr ""
+msgstr " aanliggende Verwijzingsobjecten"
msgid "Weight"
msgstr "Gewicht"
msgid "Standard Distance"
-msgstr ""
+msgstr "Standaard afstand"
msgid "below"
-msgstr ""
+msgstr "onder"
msgid "Maximum Distance"
-msgstr ""
+msgstr "Maximale afstand"
msgid "Centroid Distance"
-msgstr ""
+msgstr "Afstand tot middelpunt"
msgid "Hausdorff Distance (Centroids Aligned)"
-msgstr ""
+msgstr "Hausdorff-afstand (Uitgelijnde middelpunten)"
msgid "Symmetric Difference"
-msgstr ""
+msgstr "Symmetrisch verschil"
msgid "Symmetric Difference (Centroids Aligned)"
-msgstr ""
+msgstr "Symmetrisch verschil (uitgelijnde middelpunten)"
msgid "Compactness"
-msgstr ""
+msgstr "Dichtheid"
msgid "Angle Histogram. Bins: "
-msgstr ""
+msgstr "Histogram voor hoeken. Aantal bins: "
msgid "Tags (Exact Match): "
-msgstr ""
+msgstr "Tags (Exacte overeenkomst): "
msgid "Tags (Levenshtein Distance): "
-msgstr ""
+msgstr "Tags (Levenshtein-afstand): "
msgid "List of tags to match"
-msgstr ""
+msgstr "Lijst van overeen te komen tags"
+
+msgid "Identical Elements Filter"
+msgstr "Filter Identieke elementen"
+
+msgid "Avoid matching an element with itself"
+msgstr "Voorkom het overeenkomen van een object met zichzelf"
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
"used to weed out very small and very large features."
msgstr ""
+"Filteren zal het proces voor overeenkomsten versnellen. Filter Op venster "
+"sluit overeenkomsten uit van objecten waarvan enveloppen elkaar niet "
+"overlappen. Filter Op gebied wordt gebruikt om zeer kleine en zeer grote "
+"objecten uit te sluiten."
msgid ""
"Better matches may be found by creating temporary unions of features sharing "
"a common edge."
msgstr ""
+"Betere overeenkomsten zouden kunnen worden gevonden door tijdelijke "
+"verenigde objecten te maken door een gemeenschappelijke rand te delen."
msgid "Matching"
-msgstr ""
+msgstr "Overeenkomend"
msgid "Filtering"
-msgstr ""
+msgstr "Filteren"
msgid "Unioning"
+msgstr "Verenigen"
+
+msgid "Programming"
+msgstr "Programmeren"
+
+msgid "Replace Geometry"
+msgstr "Geometrie vervangen"
+
+msgid "Merge Tags"
+msgstr "Tags samenvoegen"
+
+msgid "List of tags to merge"
+msgstr "Lijst van samen te voegen tags"
+
+msgid "except"
+msgstr "uitgezonderd"
+
+msgid "List of tags to NOT merge (they will be ignored)"
+msgstr "Lijst van NIET samen te voegen tags (zij zullen genegeerd worden)"
+
+msgid "Overwrite tags without confirmation"
+msgstr "Tags zonder bevestiging overschrijven"
+
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
+"Lijst van tags die zonder bevestiging mogen worden overschreven bij een "
+"conflict met behulp van verwijzingslaag"
msgid "Simple Example"
-msgstr ""
+msgstr "Eenvoudig voorbeeld"
msgid "Advanced Example"
-msgstr ""
+msgstr "Gevorderd voorbeeld"
msgid "<Please select data>"
-msgstr ""
+msgstr "<Selecteer gegevens>"
msgid "Configure conflation settings"
msgstr "Instellingen voor samenvoegen configureren"
@@ -29970,32 +30442,14 @@ msgstr "Instellingen voor samenvoegen configureren"
msgid "Generate matches"
msgstr "Overeenkomsten genereren"
-msgid "Reference:"
-msgstr ""
-
-msgid "Subject:"
-msgstr ""
-
-msgid "Programming"
-msgstr ""
-
msgid "Merging"
-msgstr ""
-
-msgid "Replace Geometry"
-msgstr "Geometrie vervangen"
-
-msgid "Merge Tags"
-msgstr ""
-
-msgid "List of tags to merge"
-msgstr ""
+msgstr "Samenvoegen"
-msgid "Overwrite tags without confirmation"
-msgstr ""
+msgid "Reference:"
+msgstr "Verwijzing:"
-msgid "List of tags to overwrite without confirmation"
-msgstr ""
+msgid "Subject:"
+msgstr "Onderwerp:"
msgid "Selections must be made for both reference and subject."
msgstr ""
@@ -30028,26 +30482,33 @@ msgstr "Lege selectie"
msgid "Freeze reference selection"
msgstr "Selectie van verwijzing bevriezen"
-msgid "Disambiguating"
+msgid "Reference and subject sets should better be different."
msgstr ""
+"Instellingen voor verwijzing en onderwerp zouden beter verschillend zijn."
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr "Relaties worden nog niet ondersteund, selecteer ze dus niet."
+
+msgid "Disambiguating"
+msgstr "Uniek maken"
msgid "One to One"
-msgstr ""
+msgstr "Eén op één"
msgid "Distance"
-msgstr ""
+msgstr "Afstand"
msgid "Standard"
-msgstr ""
+msgstr "Standaard"
msgid "Centroid"
-msgstr ""
+msgstr "Middelpunt"
msgid "Hausdorff"
-msgstr ""
+msgstr "Hausdorff"
msgid "List of tags to match (default: none)"
-msgstr ""
+msgstr "Lijst van overeen te komen tags (standaard: geen)"
msgid "Download OSM data continuously"
msgstr "Doorlopend gegevens van OSM downloaden"
@@ -30428,9 +30889,6 @@ msgstr "Globalsat importeren"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Gegevens van Globalsat Datalogger DG100 in GPX-laag importeren."
-msgid "Import"
-msgstr "Importeren"
-
msgid "GPS Blams"
msgstr "GPS Blams"
@@ -30959,9 +31417,6 @@ msgstr "Verschuivngen voor afbeeldingen laden..."
msgid "Error processing XML response: {0}"
msgstr "Fout tijdens verwerken van XML-antwoord: {0}"
-msgid "Offset"
-msgstr "Verschuiving"
-
msgid "Imagery Offset Database"
msgstr "Database verschuivingen afbeeldingen"
@@ -31105,24 +31560,6 @@ msgid "This string should be 3 to 200 letters long."
msgstr ""
"Deze tekenreeks zou tussen 3 tot en met 200 letters lang moeten zijn."
-msgid "Adjust imagery"
-msgstr "Afbeelding aanpassen"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Aanpassen van de positie van de geselecteerde laag met afbeeldingen"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Selecteer de laag met afbeeldingen die moet worden aangepast."
-
-msgid "Start adjusting"
-msgstr "Start aanpassen"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "Er is momenteel geen laag met afbeeldingen om aan te passen."
-
-msgid "No layers to adjust"
-msgstr "Geen lagen om aan te passen"
-
msgid "Normal"
msgstr "Normaal"
@@ -31135,12 +31572,21 @@ msgstr "180° roteren"
msgid "Rotate 270"
msgstr "270° roteren"
-msgid "Previous image"
-msgstr "Vorige afbeelding"
+msgid "WayPoint Image"
+msgstr "Afbeelding wegpunt"
+
+msgid "Display non-geotagged photos"
+msgstr "Foto''s zonder geo-tags weergeven"
+
+msgid "Imported Images"
+msgstr "Geïmporteerde afbeeldingen"
msgid "Next image"
msgstr "Volgende afbeelding"
+msgid "Previous image"
+msgstr "Vorige afbeelding"
+
msgid "Rotate left"
msgstr "Linksom roteren"
@@ -31153,15 +31599,6 @@ msgstr "Rechtsom roteren"
msgid "Rotate image right"
msgstr "Afbeelding rechtsom roteren"
-msgid "WayPoint Image"
-msgstr "Afbeelding wegpunt"
-
-msgid "Display non-geotagged photos"
-msgstr "Foto''s zonder geo-tags weergeven"
-
-msgid "Imported Images"
-msgstr "Geïmporteerde afbeeldingen"
-
msgid "Import vector graphics"
msgstr "Vectorafbeeldingen importeren"
@@ -31169,31 +31606,31 @@ msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr "SVG-bestanden [ImportVec plugin] (*.svg)"
msgid "Improve Way"
-msgstr ""
+msgstr "Nauwkeurigheid weg verbeteren"
msgid "Improve Way mode"
-msgstr ""
+msgstr "modus Nauwkeurigheid weg verbeteren"
msgid "Mode: Enable way accuracy helpers"
-msgstr ""
+msgstr "Modus: Inschakelen helpers voor Nauwkeurigheid weg verbeteren"
msgid "improve way accuracy helper turn angle text"
-msgstr ""
+msgstr "Nauwkeurigheid weg verbeteren helper afslaan hoek tekst"
msgid "improve way accuracy helper distance text"
-msgstr ""
+msgstr "Nauwkeurigheid weg verbeteren helper afstand tekst"
msgid "improve way accuracy helper arc fill"
-msgstr ""
+msgstr "Nauwkeurigheid weg verbeteren helper boog vullen"
msgid "improve way accuracy helper arc stroke"
-msgstr ""
+msgstr "Nauwkeurigheid weg verbeteren helper boogschaduw"
msgid "improve way accuracy helper perpendicular line"
-msgstr ""
+msgstr "Nauwkeurigheid weg verbeteren helper loodrechte lijn"
msgid "improve way accuracy helper equal angle circle"
-msgstr ""
+msgstr "Nauwkeurigheid weg verbeteren helper cirkel met gelijke hoeken"
msgid "Concourse wizard ..."
msgstr "Assistent wachtruimte ..."
@@ -32875,7 +33312,7 @@ msgid "Problem occurred"
msgstr "Er trad een probleem op"
msgid "Import World File Calibration..."
-msgstr ""
+msgstr "World File Calibration importeren..."
msgid "Loads calibration data from a world file"
msgstr "Laadt kalibratie-gegevens uit een wereldbestand"
@@ -32900,10 +33337,10 @@ msgid "Saving file failed: {0}"
msgstr "Opslaan van bestand mislukt: {0}"
msgid "Export World file Calibration..."
-msgstr ""
+msgstr "World file Calibration exporteren..."
msgid "Saves calibration data to a world file"
-msgstr ""
+msgstr "Slaat een bestand voor calibreren op in een worldfile"
msgid "New picture layer from clipboard"
msgstr "Nieuwe afbeeldingslaag vanaf klembord"
@@ -33398,9 +33835,6 @@ msgstr "Verbinden"
msgid "Public Transport: Join GTFS stops"
msgstr "Openbaar vervoer: GTFS-haltes verbinden"
-msgid "Id"
-msgstr "ID"
-
msgid "State"
msgstr "Staat"
@@ -33827,10 +34261,10 @@ msgstr ""
"op positie ({1},{2}). Overslaan."
msgid "Create Roundabout"
-msgstr ""
+msgstr "Rotonde maken"
msgid "Roundabout Expander"
-msgstr ""
+msgstr "Rotonde uitbreiden"
msgid "Road Sign Plugin"
msgstr "Plug-in Road Sign"
diff --git a/i18n/po/nn.po b/i18n/po/nn.po
index a0e15e5..3c5cd81 100644
--- a/i18n/po/nn.po
+++ b/i18n/po/nn.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2009-07-15 12:49+0000\n"
"Last-Translator: Skippern <Unknown>\n"
"Language-Team: Norwegian Nynorsk <nn at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:02+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:00+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: nn\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3305,6 +3305,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3313,6 +3316,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3977,6 +3985,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4033,6 +4044,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9011,46 +9025,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9165,7 +9182,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9279,9 +9302,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9292,8 +9312,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9455,16 +9478,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9594,12 +9607,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9759,6 +9782,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11175,15 +11228,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11232,6 +11276,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12407,6 +12454,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13549,6 +13599,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13747,9 +13800,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14453,6 +14503,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14464,6 +14522,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14476,6 +14546,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14831,6 +14925,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14933,6 +15035,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14984,10 +15089,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15020,6 +15125,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15072,6 +15252,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15218,6 +15404,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15257,6 +15449,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15281,6 +15481,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15325,34 +15528,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15493,6 +15705,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15521,7 +15741,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15670,6 +15890,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15745,6 +15973,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15850,33 +16081,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15886,12 +16160,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16210,8 +16497,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16352,9 +16639,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18259,24 +18543,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19449,6 +19740,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21264,10 +21558,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22668,6 +22958,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24209,6 +24514,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25705,15 +26025,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25955,6 +26266,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25990,6 +26338,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25999,6 +26350,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26008,15 +26362,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26049,7 +26421,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26066,9 +26444,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26761,6 +27136,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27599,6 +27977,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27619,46 +28003,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27691,6 +28083,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28066,9 +28464,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28553,9 +28948,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28674,42 +29066,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28722,15 +29105,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30823,9 +31197,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/oc.po b/i18n/po/oc.po
index b784791..62449da 100644
--- a/i18n/po/oc.po
+++ b/i18n/po/oc.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2012-10-03 22:14+0000\n"
"Last-Translator: Cédric VALMARY (Tot en òc) <cvalmary at yahoo.fr>\n"
"Language-Team: Occitan (post 1500) <oc at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:04+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:01+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3312,6 +3312,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3320,6 +3323,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3984,6 +3992,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4040,6 +4051,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9018,46 +9032,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9172,7 +9189,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr "Salvar lo fichièr GPX"
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9286,9 +9309,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Salvar lo fichièr OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9299,8 +9319,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9462,16 +9485,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9603,12 +9616,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9768,6 +9791,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11184,15 +11237,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11241,6 +11285,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12416,6 +12463,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13558,6 +13608,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13756,9 +13809,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14462,6 +14512,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14473,6 +14531,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14485,6 +14555,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14840,6 +14934,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14942,6 +15044,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14993,10 +15098,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15029,6 +15134,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15081,6 +15261,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15227,6 +15413,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15266,6 +15458,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15290,6 +15490,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15334,34 +15537,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15502,6 +15714,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15530,7 +15750,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15679,6 +15899,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15754,6 +15982,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15859,33 +16090,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15895,12 +16169,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16219,8 +16506,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16361,9 +16648,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18268,24 +18552,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19458,6 +19749,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21273,10 +21567,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22677,6 +22967,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24218,6 +24523,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25714,15 +26034,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25964,6 +26275,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25999,6 +26347,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26008,6 +26359,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26017,15 +26371,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26058,7 +26430,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26075,9 +26453,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26770,6 +27145,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27608,6 +27986,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27628,46 +28012,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27700,6 +28092,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28075,9 +28473,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28562,9 +28957,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28683,42 +29075,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28731,15 +29114,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30832,9 +31206,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/pa.po b/i18n/po/pa.po
index bf30c1a..c777702 100644
--- a/i18n/po/pa.po
+++ b/i18n/po/pa.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2011-05-06 15:52+0000\n"
"Last-Translator: A S Alam <aalam at users.sf.net>\n"
"Language-Team: Punjabi <pa at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:04+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:02+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: pa\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3305,6 +3305,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3313,6 +3316,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3977,6 +3985,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4033,6 +4044,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9011,46 +9025,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9165,7 +9182,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9279,9 +9302,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9292,8 +9312,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9455,16 +9478,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9594,12 +9607,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9759,6 +9782,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11175,15 +11228,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11232,6 +11276,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12407,6 +12454,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13549,6 +13599,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13747,9 +13800,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14453,6 +14503,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14464,6 +14522,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14476,6 +14546,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14831,6 +14925,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14933,6 +15035,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14984,10 +15089,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15020,6 +15125,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15072,6 +15252,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15218,6 +15404,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15257,6 +15449,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15281,6 +15481,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15325,34 +15528,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15493,6 +15705,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15521,7 +15741,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15670,6 +15890,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15745,6 +15973,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15850,33 +16081,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15886,12 +16160,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16210,8 +16497,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16352,9 +16639,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18259,24 +18543,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19449,6 +19740,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21264,10 +21558,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22668,6 +22958,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24209,6 +24514,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25705,15 +26025,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25955,6 +26266,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25990,6 +26338,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25999,6 +26350,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26008,15 +26362,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26049,7 +26421,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26066,9 +26444,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26761,6 +27136,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27599,6 +27977,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27619,46 +28003,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27691,6 +28083,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28066,9 +28464,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28553,9 +28948,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28674,42 +29066,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28722,15 +29105,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30823,9 +31197,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/pl.po b/i18n/po/pl.po
index b18ab64..b599588 100644
--- a/i18n/po/pl.po
+++ b/i18n/po/pl.po
@@ -8,17 +8,17 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
-"PO-Revision-Date: 2017-03-20 14:32+0000\n"
-"Last-Translator: Władysław Komorek <Unknown>\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"PO-Revision-Date: 2017-04-30 13:24+0000\n"
+"Last-Translator: Piotr Sokół <Unknown>\n"
"Language-Team: polski <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:05+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:03+0000\n"
+"X-Generator: Launchpad (build 18366)\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"
@@ -43,7 +43,7 @@ msgid "{0}: option ''--{1}'' does not allow an argument"
msgstr "{0}: opcja „--{1}” nie zezwala na parametr"
msgid "{0}: option ''{1}{2}'' does not allow an argument"
-msgstr "{0}: opcja „{1}{2}'' nie zezwala na parametr"
+msgstr "{0}: opcja „{1}{2}” nie zezwala na parametr"
msgid "{0}: option ''{1}'' requires an argument"
msgstr "{0}: opcja „{1}” wymaga użycia parametru"
@@ -169,7 +169,7 @@ msgid "Report bug"
msgstr "Zgłoś błąd"
msgid "Failed to locate resource ''{0}''."
-msgstr "Nie udało się zlokalizować zasobu „{0}”."
+msgstr "Nie udało się odnaleźć zasobu „{0}”."
msgid "Failed to load resource ''{0}'', error is {1}."
msgstr "Nie udało się wczytać zasobu „{0}”, błąd: {1}."
@@ -228,7 +228,7 @@ msgid "No target layers"
msgstr "Brak warstw docelowych."
msgid "Select"
-msgstr "Zaznacz"
+msgstr "Zaznaczanie"
msgid ""
"Set the selected elements on the map to the selected items in the list above."
@@ -1444,8 +1444,7 @@ msgid "Split a way at the selected node."
msgstr "Przecina linię w zaznaczonym węźle"
msgid "Cannot split since another split operation is already in progress"
-msgstr ""
-"Nie można rozdzielić, ponieważ kolejna operacja podziału jest już w toku"
+msgstr "Nie można rozdzielić, ponieważ już trwa kolejna operacja podziału"
msgid ""
"The current selection cannot be used for splitting - no node is selected."
@@ -1527,7 +1526,7 @@ msgid "Toggles the global setting ''{0}''."
msgstr "Przełącza ustawienie globalne „{0}”."
msgid "Discourage upload"
-msgstr "Odrzuć przesyłanie"
+msgstr "Zapobieganie wysyłaniu"
msgid "UnGlue Ways"
msgstr "Rozdziel linie"
@@ -1726,7 +1725,7 @@ msgstr ""
"Aktualizuje obecnie zaznaczone obiekty z serwerem (pobiera ponownie dane)"
msgid "There are no selected objects to update."
-msgstr "Nie wybrano obiektów do pobrania"
+msgstr "Nie wybrano obiektów do uaktualnienia"
msgid "Selection empty"
msgstr "Wybrano zbiór pusty."
@@ -2140,7 +2139,7 @@ msgid "You must enter a comment to create a new note"
msgstr "Należy wprowadzić opis, aby utworzyć nową uwagę"
msgid "Delete Mode"
-msgstr "Tryb usuwania"
+msgstr "Usuwanie"
msgid "Delete nodes or ways."
msgstr "Usuwa węzły lub linie"
@@ -2180,7 +2179,7 @@ msgid "Cannot add a node outside of the world."
msgstr "Nie można dodać węzła poza granicami świata."
msgid "Add node"
-msgstr "Dodaj węzeł"
+msgstr "Dodanie węzła"
msgid "Add node into way"
msgstr "Dodaj węzeł do linii"
@@ -2189,7 +2188,7 @@ msgid "Connect existing way to node"
msgstr "Połącz istniejącą linię z węzłem"
msgid "Add a new node to an existing way"
-msgstr "Dodaj nowy węzeł do istniejącej linii"
+msgstr "Dodanie nowego węzła do istniejącej linii"
msgid "Add node into way and connect"
msgstr "Dodaj węzeł do linii i połącz"
@@ -2202,9 +2201,9 @@ msgstr "Zaznacz węzeł pod kursorem."
msgid "Insert new node into way."
msgid_plural "Insert new node into {0} ways."
-msgstr[0] "Wstaw w linię nowy węzeł."
-msgstr[1] "Wstaw w linię nowe węzły {0}"
-msgstr[2] "Wstaw w linię nowe węzły {0}"
+msgstr[0] "Wstaw nowy węzeł w linię."
+msgstr[1] "Wstaw {0} nowe węzły w linię."
+msgstr[2] "Wstaw {0} nowych węzłów w linię."
msgid "Start new way from last node."
msgstr "Zacznij nową linię od ostatniego węzła"
@@ -3346,20 +3345,20 @@ msgid_plural ""
"of these tags are defined by its direction:<br/>{1}Do you really want to "
"change the way direction, thus its semantic meaning?</html>"
msgstr[0] ""
-"<html>Zamierzasz odwrócić drogę „{0}'',<br/> dla której znaczenie znacznika "
-"„{1}” zależy od kierunku.<br/>Czy na pewno chcesz zmienić jej kierunek, a "
-"więc także jej znaczenie?</html>"
+"<html>Zostanie odwrócona linia „{0}” o znaczniku<br/>{1}, którego znaczenie "
+"zależy od jej kierunku.<br/>Zmienić jej kierunek, a więc także jej "
+"znaczenie?</html>"
msgstr[1] ""
-"<html>Zamierzasz odwrócić drogę''{0}'',<br/> dla której znaczenie poniższych "
-"tagów zależy od kierunku.<br/>{1} Czy na pewno chcesz zmienić jej kierunek, "
-"a więc także jej znaczenie?</html>"
+"<html>Zostanie odwrócona linia „{0}” o znacznikach<br/>{1}, których "
+"znaczenie zależy od jej kierunku.<br/>Zmienić jej kierunek, a więc także jej "
+"znaczenie?</html>"
msgstr[2] ""
-"<html>Zamierzasz odwrócić drogę''{0}'',<br/> dla której znaczenie poniższych "
-"tagów zależy od kierunku.<br/>{1} Czy na pewno chcesz zmienić jej kierunek, "
-"a więc także jej znaczenie?</html>"
+"<html>Zostanie odwrócona linia „{0}” o znacznikach<br/>{1}, których "
+"znaczenie zależy od jej kierunku.<br/>Zmienić jej kierunek, a więc także jej "
+"znaczenie?</html>"
msgid "Reverse directional way."
-msgstr "Odwróć linię kierunkową."
+msgstr "Odwracanie linii kierunkowej"
msgid ""
"When reversing this way, the following changes are suggested in order to "
@@ -3576,7 +3575,7 @@ msgid "The revision file ''/REVISION'' is missing."
msgstr "Brak pliku wersji „/REVISION”."
msgid "Already registered a conflict for primitive ''{0}''."
-msgstr "Konflikt dla elementu „{0}'' jest juz zarejestrowany."
+msgstr "Konflikt dla elementu „{0}” jest już zarejestrowany."
msgid "Decimal Degrees"
msgstr "Stopnie dziesiętne"
@@ -3607,24 +3606,24 @@ msgid "E"
msgstr "E"
msgid "Date of imagery: {0}"
-msgstr "Data obrazu: {0}"
+msgstr "Data wykonania zdjęć: {0}"
msgid "This imagery is marked as best in this region in other editors."
msgstr ""
-"Ta obrazowość jest oznaczona jako najlepsza w tym regionie w innych "
+"Ten podkład został oznaczony jako najlepszy dla tego obszaru w innych "
"edytorach."
msgid "{0} mirror server {1}"
-msgstr "{0} podobny serwer {1}"
+msgstr "{0} serwer lustrzany {1}"
msgid "{0} mirror server"
-msgstr "{0} podobny serwer"
+msgstr "{0} serwer lustrzany"
msgid "Update default entries"
msgstr "Uaktualnia domyślne wpisy"
msgid "Update imagery ''{0}''"
-msgstr "Aktualizacja obrazu ''{0}''"
+msgstr "Uaktualnij podkład „{0}”"
msgid "Drop old imagery ''{0}''"
msgstr "Wżuć stary obraz ''{0}''"
@@ -3662,6 +3661,9 @@ msgstr "Odwzorowanie"
msgid "Matrix set identifier"
msgstr "Identyfikator zestawu macierzy"
+msgid "No default layer selected, choosing first layer."
+msgstr "Nie wybrano domyślnej warstwy; wybieranie pierwszej warstwy."
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Brak zdefiniowanych warstw w dokumencie getCapabilities: {0}"
@@ -3672,6 +3674,11 @@ msgstr ""
"{2}"
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3805,7 +3812,7 @@ msgstr "Uzupełnij węzeł {0} z pustymi współrzędnymi na linii {1}"
msgid ""
"Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-msgstr "Nie można porównać elementu z ID „{0}'' do elementu z ID „{1}”."
+msgstr "Nie można porównać elementu z ID „{0}” do elementu z ID „{1}”."
msgid "Parameter {0} not in range 0..{1}. Got ''{2}''."
msgstr "Parametr {0} nie jest w zakresie 0..{1}. Obecnie „{2}”."
@@ -3897,7 +3904,7 @@ msgstr "Projekcja UTM (''+proj=utm'') wymaga parametru „+zone=...”."
msgid "Expected integer value in range 1-60 for ''+zone=...'' parameter."
msgstr ""
-"Dla parametru „+zone=...'' spodziewana jest wartość całkowita z zakresu 1-60"
+"Dla parametru „+zone=...” spodziewana jest wartość całkowita z zakresu 1-60"
msgid "No unit found for: {0}"
msgstr "Żadna jednostka nie została znaleziona dla: {0}"
@@ -3941,7 +3948,7 @@ msgstr ""
"Nieoczekiwana liczba argumentów dla parametru „towgs84” (musi być 3 lub 7)"
msgid "Unable to parse value of parameter ''towgs84'' (''{0}'')"
-msgstr "Nie można zanalizować wartości parametru „towgs84'' (''{0}'')"
+msgstr "Nie można zanalizować wartości parametru „towgs84” (''{0}'')"
msgid "Projection required (+proj=*)"
msgstr "Wymagana projekcja (+proj=*)"
@@ -3978,7 +3985,7 @@ msgid "Albers Equal Area"
msgstr "Równopowierzchniowe Albersa"
msgid "Parameter ''{0}'' required."
-msgstr "Parametr „{0}'' jest wymagany."
+msgstr "Parametr „{0}” jest wymagany."
msgid "standard parallels are opposite"
msgstr "standardowe paralele są przeciwne"
@@ -4005,8 +4012,7 @@ msgid "Oblique Mercator"
msgstr "Ukośny Mercator"
msgid "Unsuitable parameters ''{0}'' and ''{1}'' for two point method."
-msgstr ""
-"Niewłaściwe parametry '' {0} '' i '' {1} '' dla metody dwu punktowej."
+msgstr "Niewłaściwe parametry „{0}” i „{1}” dla metody dwupunktowej."
msgid "Illegal value for parameter ''{0}'': {1}"
msgstr "Niedozwolona wartość parametru „{0}'': {1}"
@@ -4019,7 +4025,7 @@ 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."
+"Biegunowe stereograficzne: Parametr ''{0}” musi być równy 90 lub -90."
msgid "Sinusoidal"
msgstr "Sinusoidalne"
@@ -4098,7 +4104,7 @@ msgid "Duplicate house numbers"
msgstr "Zduplikowane numery domów"
msgid "House number ''{0}'' duplicated"
-msgstr "Numer domu „{0}'' zduplikowany"
+msgstr "Powielony numer domu „{0}''"
msgid "Multiple street names in relation"
msgstr "Wiele nazw ulic w relacji"
@@ -4372,6 +4378,9 @@ msgstr "Ten test sprawdza czy wielokąty złożone są poprawne."
msgid "Area style way is not closed"
msgstr "Niezamknięty obszar"
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "Brak zewnętrznej linii wielokąta złożonego"
@@ -4423,7 +4432,7 @@ msgid "Multipolygon rings are equal"
msgstr ""
msgid "Role for ''{0}'' should be ''{1}''"
-msgstr "Rola dla „{0}'' powinna być „{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"
@@ -4437,6 +4446,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr "Składnik wielokąta złożonego nie ma przypisanej roli"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "Wielokąt złożony zawiera obiekt niebędący linią"
@@ -4454,8 +4466,8 @@ msgid ""
"to some ''name:*'' attribute and not a composition of ''name:*'' attributes, "
"e.g., Italia - Italien - Italy."
msgstr ""
-"Ten test wyszukuje obiekty wielojęzyczne, których atrybut „name'' nie jest "
-"równy innym atrybutom „name:*'' i zbiorom atrybutów „name:*'', na przykład, "
+"Ten test wyszukuje obiekty wielojęzyczne, których atrybut „name” nie jest "
+"równy innym atrybutom „name:*” i zbiorom atrybutów „name:*'', na przykład, "
"Italia - Italien - Włochy."
msgid "Missing name:*={0}. Add tag with correct language key."
@@ -4543,7 +4555,7 @@ msgid "Public Transport Route"
msgstr "Trasa pojazdów transportu publicznego"
msgid "Route relation contains a ''{0}'' role"
-msgstr "Relacja trasy zawiera ''{0}'' role"
+msgstr "Relacja trasy zawiera „{0}” role"
msgid "Route relation contains a gap"
msgstr "Relacja trasy posiada luki"
@@ -4579,14 +4591,14 @@ msgid ""
"Type ''{0}'' of relation member with role ''{1}'' does not match accepted "
"types ''{2}'' in template {3}"
msgstr ""
-"Typ '' {0} '' członu relacji z rolą '' {1} '' nie pasuje do akceptowanych "
-"typów '' {2} '' w szablonie {3}"
+"Typ „{0}” członu relacji z rolą „{1}” nie pasuje do akceptowanych typów "
+"„{2}” w szablonie {3}"
msgid "<empty>"
msgstr "<pusta>"
msgid "Role ''{0}'' unknown in templates ''{1}''"
-msgstr "Rola '' {0} '' nieznana w szablonach '' {1} ''"
+msgstr "Rola „{0}” nieznana w szablonach „{1}”"
msgid "Empty role type found when expecting one of ''{0}''"
msgstr ""
@@ -4642,7 +4654,7 @@ msgid "Suspicious tag/value combinations"
msgstr "Podejrzana kombinacja znacznik/wartość"
msgid "Key ''{0}'' invalid."
-msgstr "Klucz „{0}'' jest nieprawidłowy."
+msgstr "Klucz „{0}” jest nieprawidłowy."
msgid "Tag value contains character with code less than 0x20"
msgstr "Wartość znacznika zawiera znaki o kodzie mniejszym niż 0x20"
@@ -4675,7 +4687,7 @@ msgid "Misspelled property key"
msgstr "Błędny klucz podmiotu"
msgid "Key ''{0}'' looks like ''{1}''."
-msgstr "Klucz „{0}'' wygląda jak „{1}”."
+msgstr "Klucz „{0}” wygląda jak „{1}”."
msgid "Presets do not contain property key"
msgstr "Szablony nie zawierają danego klucza"
@@ -4687,7 +4699,7 @@ msgid "Misspelled property value"
msgstr "Literówka w podanej wartości"
msgid "Value ''{0}'' for key ''{1}'' looks like ''{2}''."
-msgstr "Wartość „{0}'' dla klucza „{1}” przypomina „{2}”."
+msgstr "Wartość „{0}” dla klucza „{1}” przypomina „{2}”."
msgid "Presets do not contain property value"
msgstr "Szablony nie zawierają danej wartości"
@@ -5214,7 +5226,7 @@ msgid "Make sure you load some data if you use --selection."
msgstr "Upewnij się że ładujesz jakieś dane jeśli używasz --selection"
msgid "Log level is at {0} ({1}, {2})"
-msgstr ""
+msgstr "Poziom zapisu dziennika jest na {0} ({1}, {2})"
msgid "Plugin loading skipped"
msgstr "Pominięto wczytywanie wtyczki"
@@ -6035,7 +6047,7 @@ msgid "Undecide"
msgstr "Brak decyzji"
msgid "Mark the selected tags as undecided"
-msgstr "Zaznacz wybrane tagi jako niezdecydowne"
+msgstr "Zaznacz wybrane znaczniki jako niezdecydowne"
msgid "Their dataset does not include a tag with key {0}"
msgstr "Ich zestaw nie zawiera znacznika z kluczem {0}"
@@ -6141,7 +6153,7 @@ msgstr "Klucz „{0}” i wszystkie jego wartości zostaną usunięte"
msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
msgstr ""
-"Wszystkie wartości połączone jako „{0}'' będą stosowane dla klucza „{1}”"
+"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 znaczników nie zawiera wybranej wartości „{0}”."
@@ -6393,11 +6405,11 @@ msgid "Toggle: {0}"
msgstr "Przełącz: {0}"
msgid "Command Stack: Undo: {0} / Redo: {1}"
-msgstr "Komenda Stack: Cofnij: {0} / Przywróć: {1}"
+msgstr "Stos poleceń: Cofnij: {0} / Ponów: {1}"
msgid ""
"Selects the objects that take part in this command (unless currently deleted)"
-msgstr "Zaznacza obiekty które brały udział w poleceniu (poza usuniętymi)"
+msgstr "Zaznacza obiekty które, brały udział w poleceniu (poza usuniętymi)"
msgid "Select and zoom"
msgstr "Wybierz i przybliż"
@@ -6410,10 +6422,10 @@ msgstr ""
"usunięte), a następnie powiększa"
msgid "Undo the selected and all later commands"
-msgstr "Cofnij wybraną i wszystkie późniejsze komendy"
+msgstr "Cofa wybrane polecenie i wszystkie późniejsze"
msgid "Redo the selected and all earlier commands"
-msgstr "Powtórz wybraną i wszystkie wcześniejsze komendy"
+msgstr "Ponawia wybrane polecenie i wszystkie wcześniejsze"
msgid "Resolve conflicts."
msgstr "Otwiera listę konfliktów do rozwiązania."
@@ -6836,6 +6848,8 @@ msgid ""
"You can also use the syntax <tt>lat=\"...\" lon=\"...\"</tt> or "
"<tt>lat=''...'' lon=''...''</tt>."
msgstr ""
+"Możesz także używać składni <tt>lat=\"...\" lon=\"...\"</tt> lub "
+"<tt>lat=''...'' lon=''...''</tt>."
msgid "Some examples:"
msgstr "Kilka przykładów:"
@@ -6911,7 +6925,7 @@ msgid "Turn selected styles on or off"
msgstr "Włącz/wyłącz wybrane style"
msgid "Move the selected entry one row down."
-msgstr "Przenieś zaznaczony wpis o jeden wiersz w dół."
+msgstr "Przenosi zaznaczony wpis o jeden wiersz w dół."
msgid "Move the selected entry one row up."
msgstr "Przenieś zaznaczony wpis o jeden wiersz do góry."
@@ -6935,10 +6949,10 @@ msgid "Map paint style file (*.xml, *.zip)"
msgstr "Style rysowania mapy (*.xml, *.zip)"
msgid "Reloading style sources"
-msgstr "Odświeżanie źródeł stylów"
+msgstr "Ponowne wczytywanie źródeł stylów"
msgid "Save style ''{0}'' as ''{1}''"
-msgstr "Zapisz styl „{0}'' jako „{1}”"
+msgstr "Zapisz styl „{0}” jako „{1}”"
msgid "view meta information, error log and source definition"
msgstr "zobacz meta informacje, log błędu i źródło definicji"
@@ -7321,7 +7335,7 @@ msgid "Closed"
msgstr "Zamknięty"
msgid "ID"
-msgstr "ID"
+msgstr "Identyfikator"
msgid "Open"
msgstr "Otwórz"
@@ -7979,7 +7993,7 @@ msgid "An empty value deletes the tag."
msgstr "Pusta wartość usunie znacznik."
msgid "You changed the key from ''{0}'' to ''{1}''."
-msgstr "Zmieniono klucz z „{0}'' na „{1}”."
+msgstr "Zmieniono klucz z „{0}” na „{1}”."
msgid "Change properties of up to {0} object"
msgid_plural "Change properties of up to {0} objects"
@@ -8072,7 +8086,7 @@ msgid "Edit ignore list"
msgstr "Edytuj listę ignorowanych"
msgid "You changed the value of ''{0}'' from ''{1}'' to ''{2}''."
-msgstr "Zmieniono wartość „{0}'' z „{1}” na „{2}''."
+msgstr "Zmieniono wartość „{0}” z „{1}” na „{2}''."
msgid "Edit the relation the currently selected relation member refers to."
msgstr ""
@@ -8606,17 +8620,18 @@ msgstr ""
"polecenie z menu Plik lub ikonę paska narzędziowego.</html>"
msgid "Zoom to downloaded data"
-msgstr ""
+msgstr "Przybliżenie do pobranych danych"
msgid "Select to zoom to entire newly downloaded data."
-msgstr ""
+msgstr "Przybliża widok do wszystkich nowo pobranych danych"
msgid ""
"Use left click&drag to select area, arrows or right mouse button to scroll "
"map, wheel or +/- to zoom."
msgstr ""
-"Używaj lewego kliknij i przesuń by wybrać obszar, strzałek i prawego "
-"przyciku myszy by przesuwać mapę, kółka lub +/- by przybliżać/oddalać."
+"Kliknięcie i przeciągnięcie wybiera obszar, klawisze strzałek i prawy "
+"przycisk myszy przesuwa mapę a kółko myszy i klawisze +/- przybliżają i "
+"oddalają widok."
msgid "No area selected yet"
msgstr "Nie zaznaczono obszaru"
@@ -9585,7 +9600,7 @@ msgid ""
"Object ''{0}'' is already deleted on the server. Skipping this object and "
"retrying to upload."
msgstr ""
-"Obiekt „{0}'' został już wcześniej usunięty na serwerze. Pomijanie tego "
+"Obiekt „{0}” został już wcześniej usunięty na serwerze. Pomijanie tego "
"obiektu i ponowienie próby wysyłania."
msgid "Preparing objects to upload ..."
@@ -9708,9 +9723,9 @@ msgid ""
"dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return to "
"map editing.<br>"
msgstr ""
-"Kliknij „<strong>{0}</strong>'' aby kontynuować przesyłanie do dodatkowych "
-"zestawów zmian.<br>Kliknij „<strong>{1}</strong>'' aby powrócić do okna "
-"przesyłania.<br>Kliknij „<strong>{2}</strong>'' aby przerwać przesyłanie i "
+"Kliknij „<strong>{0}</strong>” aby kontynuować przesyłanie do dodatkowych "
+"zestawów zmian.<br>Kliknij „<strong>{1}</strong>” aby powrócić do okna "
+"przesyłania.<br>Kliknij „<strong>{2}</strong>” aby przerwać przesyłanie i "
"powrócić do edytowania mapy.<br>"
msgid "Changeset is full"
@@ -9727,7 +9742,7 @@ msgstr "Relacja „{0}''została już usunięta. Pomijanie wysyłania obiektu."
msgid "Object ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
-"Obiekt „{0}'' jest już skasowany i będzie pominięty przy wysyłaniu zmian."
+"Obiekt „{0}” jest już skasowany i będzie pominięty przy wysyłaniu zmian."
msgid "Uploading {0} object..."
msgid_plural "Uploading {0} objects..."
@@ -9765,7 +9780,7 @@ msgid "Cancel uploading"
msgstr "Anuluj przesyłanie"
msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
-msgstr "Nieoczekiwana wartość klucza „{0}'' w preferencjach, otrzymano „{1}”"
+msgstr "Nieoczekiwana wartość klucza „{0}” w preferencjach, otrzymano „{1}”"
msgid "Fill up one changeset and return to the Upload Dialog"
msgstr "Wypełnij jeden zestaw zmian i powróć do dialogu wysyłki."
@@ -9861,56 +9876,59 @@ msgstr[0] "{0} obiekt do usunięcia:"
msgstr[1] "{0} obiekty do usunięcia:"
msgstr[2] "{0} obiektów do usunięcia:"
-msgid "Show tile info"
-msgstr "Wyświetl informację o kafelku"
+msgid "Native projections"
+msgstr ""
-msgid "Tile Info"
-msgstr "Informacja o kafelkach"
+msgid "Offset"
+msgstr "Przesunięcie"
-msgid "Metadata "
-msgstr "Metadane "
+msgid "Tile download projection"
+msgstr ""
-msgid "Load tile"
-msgstr "Wczytaj kafelek"
+msgid "Tile display projection"
+msgstr ""
-msgid "Auto zoom"
-msgstr "Automatyczne przybliżanie"
+msgid "Current zoom"
+msgstr ""
-msgid "Auto load tiles"
-msgstr "Automatyczne wczytywanie kafelków"
+msgid "Show tile info"
+msgstr "Wyświetl informację o kafelku"
-msgid "Show errors"
-msgstr "Błędy"
+msgid "Tile Info"
+msgstr "Informacja o kafelkach"
-msgid "Load all tiles"
-msgstr "Wczytaj wszystkie kafelki"
+msgid "Tile name"
+msgstr "Nazwa kafelka"
-msgid "Load all error tiles"
-msgstr "Wczytaj błędne kafelki"
+msgid "Tile URL"
+msgstr "Adres URL kafelka"
-msgid "Zoom to native resolution"
-msgstr "Przybliż do natywnej rozdzielczości"
+msgid "Tile size"
+msgstr "Rozmiar kafelka"
-msgid "Change resolution"
-msgstr "Zmień rozdzielczość"
+msgid "Tile display size"
+msgstr "Rozmiar wyświetlania kafelka"
-msgid "Increase zoom"
-msgstr "Przybliż"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Oddal"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
-msgstr "Usuń pamięć podręczną kafelka"
+msgid "Metadata "
+msgstr "Metadane "
+
+msgid "Load tile"
+msgstr "Wczytaj kafelek"
msgid "Failed to create tile source"
msgstr "Nie udało się utworzyć źródła kafelków"
msgid "zoom in to load any tiles"
-msgstr "przybliż by wczytać kafelki"
+msgstr "proszę przybliżyć, aby wczytać kafelki"
msgid "zoom in to load more tiles"
-msgstr "przybliż by wczytać więcej kafelków"
+msgstr "proszę przybliżyć, aby wczytać więcej kafelków"
msgid "increase tiles zoom level (change resolution) to see more detail"
msgstr ""
@@ -9922,7 +9940,7 @@ msgid "Current zoom: {0}"
msgstr "Obecne przybliżenie: {0}"
msgid "Display zoom: {0}"
-msgstr "Poziom przybliżenia: {0}"
+msgstr "Stopień przybliżenia: {0}"
msgid "Pixel scale: {0}"
msgstr "Skala pikselowa: {0}"
@@ -9937,10 +9955,10 @@ msgid "Cache stats: {0}"
msgstr "Statystyki pamięci podręcznej: {0}"
msgid "{0} ({1}), automatically downloading in zoom {2}"
-msgstr ""
+msgstr "{0} ({1}), automatyczne pobieranie w stopniu przybliżenia {2}"
msgid "{0} ({1}), downloading in zoom {2}"
-msgstr ""
+msgstr "{0} ({1}), pobieranie w stopniu przybliżenia {2}"
msgid "Downloaded {0}/{1} tiles"
msgstr "Pobrano {0}/{1} kafelków"
@@ -10021,8 +10039,14 @@ msgstr[2] "{0} śladów, "
msgid "Save GPX file"
msgstr "Zapisywanie pliku GPX"
-msgid "Imagery fade"
-msgstr "Przezroczystość podkładu"
+msgid "Id"
+msgstr "Id"
+
+msgid "Min. zoom"
+msgstr "Minimalne przybliżenie"
+
+msgid "Max. zoom"
+msgstr "Maksymalne przybliżenie"
msgid "Unsupported imagery type: {0}"
msgstr "Nieobsługiwany rodzaj podkładu: {0}"
@@ -10097,7 +10121,7 @@ msgid "Upload is discouraged"
msgstr "Wysyłanie odradzane"
msgid "Upload is blocked"
-msgstr ""
+msgstr "Wysyłanie jest zablokowane"
msgid "Convert to GPX layer"
msgstr "Skonwertuj na warstwę GPX"
@@ -10139,9 +10163,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Zapisywanie pliku OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "Odwzorowania EPSG:4326 i Mercator są obsługiwane"
-
msgid "Validation errors"
msgstr "Błędy"
@@ -10152,11 +10173,12 @@ msgid "Set WMS Bookmark"
msgstr "Ustaw zakładkę WMS"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
-"JOSM użyje EPSG:4326 do odpytania serwera, jednak rezultaty mogą różnic się "
-"w zależności od serwera WMS"
msgid "Correlate to GPX"
msgstr "Koreluj do GPX"
@@ -10331,20 +10353,6 @@ msgstr "Wybierz ślad GPX"
msgid "No selected GPX track"
msgstr "Brak wybranego śladu GPX"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Błąd parsowania strefy czasowej.\n"
-"Spodziewany format: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Błąd parsowania offsetu.\n"
-"Oczekiwany format: {0}"
-
msgid "Geotagged Images"
msgstr "Geolokalizowane obrazy"
@@ -10489,12 +10497,26 @@ msgstr ""
"\n"
"Czas GPS: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Błąd parsowania offsetu.\n"
+"Oczekiwany format: {0}"
+
msgid "Show thumbnails"
msgstr "Pokaż miniaturki"
msgid "Show image thumbnails instead of icons."
msgstr "Pokaż miniaturki zamiast ikon"
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Błąd parsowania strefy czasowej.\n"
+"Spodziewany format: {0}"
+
msgid "Choose visible tracks"
msgstr "Wybierz widoczne ślady"
@@ -10506,10 +10528,10 @@ msgid ""
"range of tracks or use CTRL+Click to select specific ones. The map is "
"updated live in the background. Open the URLs by double clicking them.</html>"
msgstr ""
-"<html>Wybierz wszystkie ścieżki, które chcesz wyświetlić. Możesz zaznaczyć "
-"wiele ścieżek przeciągając myszkę lub użyć CTRL i kliknąć wybrane. Mapa "
-"zostanie na bieżąco uaktualniona w tle. Otwórz adresy URL poprzez podwójne "
-"kliknięcie.</html>"
+"<html>Proszę wybrać ślady do wyświetlenia. Można zaznaczyć wiele śladów "
+"przeciągając wskaźnik myszy lub kliknąć na wybrane z przytrzymanym klawiszem "
+"CTRL. Mapa zostanie na bieżąco uaktualniona w tle. Adresy URL można otworzyć "
+"dwukrotnym kliknięciem.</html>"
msgid "Set track visibility for {0}"
msgstr "Wybieranie widoczności śladu {0}"
@@ -10534,7 +10556,7 @@ msgid "Customize track drawing"
msgstr "Dostosuj rysowanie śladu"
msgid "From"
-msgstr "Z"
+msgstr "Od"
msgid "To"
msgstr "Do"
@@ -10603,7 +10625,7 @@ msgid "gps point"
msgstr "punkt GPS"
msgid "HDOP"
-msgstr ""
+msgstr "HDOP"
msgid "Time"
msgstr "Czas"
@@ -10625,7 +10647,7 @@ msgid ""
"server.<br>Because its way points do not include a timestamp we cannot "
"correlate them with audio data.</html>"
msgstr ""
-"<html>Dane z warstwy GPX „{0}'' zostały pobrane z serwera.<br>Z tego powodu "
+"<html>Dane z warstwy GPX „{0}” zostały pobrane z serwera.<br>Z tego powodu "
"punkty linii nie zawierają znaczników czasu i niemożliwe jest zestawienie z "
"nimi dźwięku.</html>"
@@ -10662,7 +10684,7 @@ msgid ""
"server.<br>Because its way points do not include a timestamp we cannot "
"correlate them with images.</html>"
msgstr ""
-"<html>Dane z warstwy GPX „{0}'' zostały pobrane z serwera.<br>Z tego powodu "
+"<html>Dane z warstwy GPX „{0}” zostały pobrane z serwera.<br>Z tego powodu "
"punkty linii nie zawierają znaczników czasu i niemożliwe jest zestawienie z "
"nimi obrazków.</html>"
@@ -10672,6 +10694,36 @@ msgstr "Znaczniki nazwanych punktów"
msgid "Named Trackpoints from {0}"
msgstr "Nazwane punkty GPS z {0}"
+msgid "Auto load tiles"
+msgstr "Automatyczne wczytywanie kafelków"
+
+msgid "Auto zoom"
+msgstr "Automatyczne przybliżanie"
+
+msgid "Decrease zoom"
+msgstr "Oddal"
+
+msgid "Flush tile cache"
+msgstr "Usuń pamięć podręczną kafelka"
+
+msgid "Increase zoom"
+msgstr "Przybliż"
+
+msgid "Load all tiles"
+msgstr "Wczytaj wszystkie kafelki"
+
+msgid "Load all error tiles"
+msgstr "Wczytaj błędne kafelki"
+
+msgid "Show errors"
+msgstr "Błędy"
+
+msgid "Change resolution"
+msgstr "Zmień rozdzielczość"
+
+msgid "Zoom to native resolution"
+msgstr "Przybliż do natywnej rozdzielczości"
+
msgid "gps marker"
msgstr "znacznik GPS"
@@ -10895,9 +10947,9 @@ msgid ""
"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>Pomyślnie pobrano Klucz Dostępu OAuth z witryny OSM. Kliknij "
-"<strong>{0}</strong> by go zaakceptować. JOSM użyje go w dalszej komunikacji "
-"by uzyskać dostęp do OSM API.</html>"
+"<html>Pobrano klucz dostępu OAuth z witryny OSM. Proszę kliknąć "
+"<strong>{0}</strong>, aby go zaakceptować. JOSM użyje go w dalszej "
+"komunikacji, aby uzyskać dostęp do API OSM.</html>"
msgid "Authorize now"
msgstr "Uwierzytelnij"
@@ -11030,14 +11082,14 @@ msgstr "Witryna OSM nie zwróciła sesyjnego ciasteczka w odpowiedzi na „{0}''
msgid ""
"Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
msgstr ""
-"Nie powiodło się uwierzytelnienie użytkownika „{0}'' z hasłem „***'' jako "
+"Nie powiodło się uwierzytelnienie użytkownika „{0}” z hasłem „***” jako "
"użytkownika OAuth."
msgid "Failed to authorize OAuth request ''{0}''"
msgstr "Nie udało się uwierzytelnić żądania OAuth „{0}''"
msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr "Uwierzytelniam Żeton Żądania OAuth „{0}'' na witrynie OSM..."
+msgstr "Uwierzytelniam Żeton Żądania OAuth „{0}” na witrynie OSM..."
msgid "Initializing a session at the OSM website..."
msgstr "Inicjowanie sesji na witrynie OSM..."
@@ -11784,7 +11836,7 @@ msgid "Custom"
msgstr "Własne"
msgid "Use global settings"
-msgstr "Użyj globalnych ustawień"
+msgstr "Użycie globalnych ustawień"
msgid "All"
msgstr "Wszystkie"
@@ -11823,7 +11875,7 @@ msgid "Single Color (can be customized for named layers)"
msgstr "Jeden kolor (moze być zmieniony dla nazwanej warstwy)"
msgid "Car"
-msgstr "Samochód"
+msgstr "Samochody"
msgid "Bicycle"
msgstr "Rowery"
@@ -11860,7 +11912,7 @@ msgid "Heat"
msgstr "Ciepło"
msgid "Use points instead of lines for heat map"
-msgstr ""
+msgstr "Używanie punktów zamiast linii dla mapy termicznej"
msgid "Create markers when reading GPX"
msgstr "Tworzenie znaczników podczas wczytywania GPX"
@@ -11891,7 +11943,7 @@ msgid ""
"Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
"draw all lines."
msgstr ""
-"Maksymalna długość (w metrach) rysowanych linii. Ustaw „-1'' aby zawsze "
+"Maksymalna długość (w metrach) rysowanych linii. Ustaw „-1” aby zawsze "
"rysować linie."
msgid "Maximum length for local files (meters)"
@@ -11900,8 +11952,8 @@ msgstr "Maksymalna długość dla plików lokalnych (w metrach)"
msgid ""
"Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
msgstr ""
-"Maksymalna długość (w metrach) rysowanych linii. Ustaw „-1'' aby zawsze "
-"rysować linie."
+"Określa maksymalną długość (w metrach) rysowanych linii. Wartość „-1” rysuje "
+"wszystkie linie."
msgid "Maximum length (meters)"
msgstr "Maksymalna długość (w metrach)"
@@ -11978,6 +12030,7 @@ 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 ""
+"Wyświetla zebrane punkty i segmenty śladu położenia jako mapę termiczną."
msgid "Allows to tune the track coloring for different average speeds."
msgstr ""
@@ -11990,20 +12043,20 @@ msgid "Track and Point Coloring"
msgstr "Kolorowanie śladów i punktów"
msgid "Overlay gain adjustment"
-msgstr ""
+msgstr "Dostosowanie wzmocnienia nakładania"
msgid "Lower limit of visibility"
-msgstr ""
+msgstr "Ograniczenie widoczności"
msgid "Adjust the gain of overlay blending."
msgstr ""
msgid "Draw all GPX traces that exceed this threshold."
-msgstr ""
+msgstr "Ustala wartość graniczą wyświetlania wszystkich śladów GPX"
msgid ""
"Render engine uses points with simulated position error instead of lines. "
-msgstr ""
+msgstr "Używa punktów zamiast linii dla symulowanego błędu położenia. "
msgid "Colors points and track segments by data limits."
msgstr "Koloruje punkty i segmenty ślady według ograniczeń danych"
@@ -12080,7 +12133,7 @@ msgstr ""
"ale nie obsługuje niektórych funkcji, takich jak filtrowanie plików."
msgid "Check if you feel opposite direction more convenient"
-msgstr "Zaznacz jeśli uważasz że przeciwny kierunek jest bardziej wygodny"
+msgstr "Zmienia kierunek przybliżania na przeciwny"
msgid ""
"Divide intervals between native resolution levels to smaller steps if they "
@@ -12090,13 +12143,13 @@ msgstr ""
"mniejszych stopni jeśli współczynnik powiększenia jest za duży"
msgid "Zoom steps to get double scale"
-msgstr "Stopnie przybliżenia do podwojenia skali"
+msgstr "Liczba stopni przybliżenia do podwojenia skali"
msgid ""
"Higher value means more steps needed, therefore zoom steps will be smaller"
msgstr ""
-"Wyższa wartość oznacza że więcej stopni jest potrzebnych aby stopień "
-"powiększania był mniejszy"
+"Zmniejsza zakres przybliżenia pojedynczego stopnia wraz ze zwiększaniem "
+"wartości"
msgid "Look and Feel"
msgstr "Wygląd i zachowanie"
@@ -12200,15 +12253,6 @@ msgstr "Nazwa"
msgid "Object Count"
msgstr "Liczba obiektów"
-msgid "imagery fade"
-msgstr "przyciemnienia podkładu mapy"
-
-msgid "Fade Color: "
-msgstr "Kolor przyciemnienia: "
-
-msgid "Fade amount: "
-msgstr "Siła przyciemnienia: "
-
msgid "Soft"
msgstr "Słabe"
@@ -12257,6 +12301,9 @@ msgstr "Podkład: domyślny"
msgid "Available default entries:"
msgstr "Wpisy dostępne domyślnie:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "Wybrane wpisy:"
@@ -12368,7 +12415,7 @@ msgid ""
"the file name and saves it in the same folder.)</i>"
msgstr ""
"<i>(JOSM może zatrzymać kopie zapasowe przy zapisywaniu warstw danych. Do "
-"nazwy piku dodaje „~'' i zapisuje w tym samym folderze.)</i>"
+"nazwy piku dodaje „~” i zapisuje w tym samym folderze.)</i>"
msgid "Notification at each save"
msgstr "Powiadamianie o każdym zapisie"
@@ -12380,7 +12427,7 @@ msgid "File backup"
msgstr "Kopia zapasowa"
msgid "Configure whether to create backup files"
-msgstr "Konfiguruj kiedy tworzyć plik kopii zapasowej"
+msgstr "Konfiguruje kiedy tworzyć pliki kopii zapasowej"
msgid "Enable built-in icon defaults"
msgstr "Pozwól na wbudowane domyślne ikony"
@@ -12392,16 +12439,16 @@ msgid "Active styles:"
msgstr "Aktywne style:"
msgid "Add a new style by entering filename or URL"
-msgstr "Dodaj nowy styl poprzez podanie nazwy pliku lub URL"
+msgstr "Dodaje nowy styl wprowadzając nazwę pliku lub adres URL"
msgid "New style entry:"
msgstr "Nowy styl:"
msgid "Remove the selected styles from the list of active styles"
-msgstr "Usuń wybrane style z listy aktywnych styli"
+msgstr "Usuwa wybrane style z listy aktywnych styli"
msgid "Edit the filename or URL for the selected active style"
-msgstr "Edytuj nazwę pliku lub URL wybranych aktywnych styli"
+msgstr "Modyfikuje nazwę pliku lub adres URL wybranych aktywnych styli"
msgid "Add the selected available styles to the list of active styles"
msgstr "Dodaje zaznaczone dostępne style do listy aktywnych stylów"
@@ -12416,8 +12463,8 @@ msgid ""
"<html>Failed to load the list of style sources "
"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
msgstr ""
-"<html>Nie udało się wczytać listy źródeł stylu z "
-"<br>''{0}”.<br><br>Szczegóły (nieprzetłumaczone):<br>{1}</html>"
+"<html>Nie udało się wczytać listy źródeł stylu z <br>„{0}”.<br><br>Szczegóły "
+"(nieprzetłumaczone):<br>{1}</html>"
msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
msgstr ""
@@ -12442,51 +12489,52 @@ msgid "Map Settings"
msgstr "Ustawienia mapy"
msgid "Settings for the map projection and data interpretation."
-msgstr "Ustawienia odwzorowania kartograficznego oraz interpretacji danych."
+msgstr ""
+"Konfiguruje ustawienia odwzorowania kartograficznego oraz interpretacji "
+"danych."
msgid "Could not read tagging preset source: {0}"
-msgstr "Nie mogłem odczytać źródła szablonu tagowania: {0}"
+msgstr "Nie udało się odczytać źródła szablonu znaczników: {0}"
msgid ""
"Could not read tagging preset source: {0}\n"
"Do you want to keep it?"
msgstr ""
-"Nie można odczytać źródła szablonu tagowania: {0}\n"
+"Nie udało się odczytać źródła szablonu znaczników: {0}\n"
"Zatrzymać go?"
msgid "Could not read tagging preset source {0}"
-msgstr "Nie mogłem odczytać źródła szablonu tagowania {0}"
+msgstr "Nie udało się odczytać źródła szablonu znaczników {0}"
msgid ""
"<html>Tagging preset source {0} can be loaded but it contains errors. Do you "
"really want to use it?<br><br><table width=600>Error is: [{1}:{2}] "
"{3}</table></html>"
msgstr ""
-"<html>Źródło szablonu tagowania {0} może być wczytane, ale zawiera błędy. "
-"Czy naprawdę chcesz go użyć?<br><br><table width=600>Szczegóły błędu: "
-"[{1}:{2}] {3}</table></html>"
+"<html>Można wczytać źródło szablonu znaczników {0}, ale zawiera ono błędy. "
+"Użyć go?<br><br><table width=600>Szczegóły błędu: [{1}:{2}] "
+"{3}</table></html>"
msgid ""
"<html>Unable to parse tagging preset source: {0}. Do you really want to use "
"it?<br><br><table width=400>Error is: [{1}:{2}] {3}</table></html>"
msgstr ""
-"<html>Nie można przetworzyć źródła szablonu parsowania: {0}. Czy naprawdę "
-"chcesz go użyć?<br><br><table width=400>Szczegóły błędu: [{1}:{2}] "
-"{3}</table></html>"
+"<html>Nie można przetworzyć źródła szablonu znaczników: {0}. Użyć "
+"go?<br><br><table width=400>Szczegóły błędu: [{1}:{2}] {3}</table></html>"
msgid ""
"<html>Tagging preset source {0} can be loaded but it contains errors. Do you "
"really want to use it?<br><br><table width=600>Error is: {1}</table></html>"
msgstr ""
-"<html>Źródło szablonu tagowania {0} może być wczytane, ale zawiera błędy. "
-"Czy naprawdę chcesz go użyć?<br><br><table width=600>Błąd: {1}</table></html>"
+"<html>Można wczytać źródło szablonu znaczników {0}, ale zawiera ono błędy. "
+"Użyć go?<br><br><table width=600>Błąd: {1}</table></html>"
msgid ""
"<html>Unable to parse tagging preset source: {0}. Do you really want to use "
"it?<br><br><table width=600>Error is: {1}</table></html>"
msgstr ""
-"<html>Nie można przetworzyć źródła szablonu tagowania: {0}. Czy naprawdę "
-"chcesz go użyć?<br><br><table width=600>Błąd: {1}</table></html>"
+"<html>Nie można przetworzyć źródła szablonu znaczników: {0}. Użyć "
+"go?<br><br><table width=600>Błąd: {1}</table></html>"
msgid "Sort presets menu alphabetically"
msgstr "Sortowanie alfabetyczne menu szablonów"
@@ -12526,7 +12574,7 @@ msgid ""
"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
msgstr ""
"<html>Nie udało się wczytać listy źródeł szablonów "
-"z<br>''{0}”.<br><br>Szczegóły (nieprzetłumaczone):<br>{1}</html>"
+"z<br>„{0}”.<br><br>Szczegóły (nieprzetłumaczone):<br>{1}</html>"
msgid "Warning: illegal format of entry in preset list ''{0}''. Got ''{1}''"
msgstr ""
@@ -12552,7 +12600,7 @@ msgid ""
"Please click on <strong>Download list</strong> to download and display a "
"list of available plugins."
msgstr ""
-"Proszę kliknąć <strong>Pobierz listę</strong> aby pobrać i wyświetlić listę "
+"Proszę kliknąć <strong>Pobierz listę</strong>, aby pobrać i wyświetlić listę "
"dostępnych wtyczek."
msgid "{0}: Version {1} (local: {2})"
@@ -12955,8 +13003,8 @@ msgid ""
"<html>''{0}'' is not a valid OSM API URL.<br>Please check the spelling and "
"validate again.</html>"
msgstr ""
-"<html>''{0}'' nie jest prawidłowym adresem URL z API OSM.<br>Proszę "
-"sprawdzić literówki i spróbować ponownie.</html>"
+"<html>„{0}” nie jest prawidłowym adresem URL z API OSM.<br>Proszę sprawdzić "
+"literówki i spróbować ponownie.</html>"
msgid "Invalid API URL"
msgstr "Nieprawidłowy adres URL API"
@@ -13409,9 +13457,9 @@ msgstr ""
msgid "Change {0} object"
msgid_plural "Change {0} objects"
-msgstr[0] "Zmień {0} obiekt"
-msgstr[1] "Zmień {0} obiekty"
-msgstr[2] "Zmień {0} obiektów"
+msgstr[0] "Zmienianie {0} obiektu"
+msgstr[1] "Zmienianie {0} obiektów"
+msgstr[2] "Zmienianie {0} obiektów"
msgid "Nothing selected!"
msgstr "Nic nie wybrano!"
@@ -13511,7 +13559,7 @@ msgid "This corresponds to the key ''{0}''"
msgstr "Odpowiada kluczowi „{0}”"
msgid "More information about this feature"
-msgstr "Więcej informacji na temat tego elementu"
+msgstr "Więcej informacji na temat tego obiektu"
msgid "Optional Attributes:"
msgstr "Dodatkowe atrybuty:"
@@ -13519,6 +13567,9 @@ msgstr "Dodatkowe atrybuty:"
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13660,7 +13711,7 @@ msgid ""
"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
"''{1}''."
msgstr ""
-"Niewłaściwa wartość wymaganego atrybutu „{0}'' typu OsmPrimitiveType. Jest "
+"Niewłaściwa wartość wymaganego atrybutu „{0}” typu OsmPrimitiveType. Jest "
"„{1}”."
msgid ""
@@ -13749,7 +13800,7 @@ msgid ""
"and ''display_name''"
msgstr ""
"Nie można utworzyć zapytania o zestaw zmian gdy zapytanie zawiera "
-"jednocześnie parametry ''uid'' i ''display_name''"
+"jednocześnie parametry „uid” i „display_name”"
msgid "Unsupported parameter ''{0}'' in changeset query string"
msgstr ""
@@ -13786,7 +13837,7 @@ msgid ""
"not use a proxy."
msgstr ""
"JVM nie jest skonfigurowany aby pobierać ustawienia proxy z ustawień "
-"systemowych. Parametr „java.net.useSystemProxies'' nie został wprowadzony "
+"systemowych. Parametr „java.net.useSystemProxies” nie został wprowadzony "
"podczas uruchamiania. Proxy nie będzie użyte."
msgid "Parsing response from server..."
@@ -13814,7 +13865,7 @@ msgid "GeoJSON Files"
msgstr "Pliki GeoJSON"
msgid "Layer ''{0}'' not supported"
-msgstr "Warstwa „{0}'' nie jest obsługiwana"
+msgstr "Warstwa „{0}” nie jest obsługiwana"
msgid ""
"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
@@ -14089,7 +14140,7 @@ msgid "OsmChange File"
msgstr "Plik OsmChange"
msgid "File ''{0}'' does not exist."
-msgstr "Plik „{0}'' nie istnieje."
+msgstr "Plik „{0}” nie istnieje."
msgid "No data found in file {0}."
msgstr "Nie znaleziono danych w pliku {0}."
@@ -14196,7 +14247,7 @@ msgid "Deleted relation {0} contains members"
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}."
+msgstr "Brakujący atrybut „ref” członka relacji {0}."
msgid ""
"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
@@ -14225,7 +14276,7 @@ msgid ""
"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
"{1}."
msgstr ""
-"Niewłaściwa wartość atrybutu „version'' na elemencie z ID {0}. Jest {1}."
+"Niewłaściwa wartość atrybutu „version” na elemencie z ID {0}. Jest {1}."
msgid ""
"Normalizing value of attribute ''version'' of element {0} to {2}, API "
@@ -14236,7 +14287,7 @@ msgid "Unknown or unsupported API version. Got {0}."
msgstr "Nieznana lub nie obsługiwana wersja API. Otrzymano: {0}."
msgid "Missing attribute ''version'' on OSM primitive with ID {0}."
-msgstr "Brakujący atrybut „version'' na elemencie z ID {0}."
+msgstr "Brakujący atrybut „version” na elemencie z ID {0}."
msgid ""
"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. "
@@ -14327,13 +14378,13 @@ msgid "Starting to upload with one request per primitive ..."
msgstr "Rozpoczęcie wysyłania, jedno żadanie na element ..."
msgid "{0}% ({1}/{2}), {3} left. Uploading node ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), {3} zostało. Przesyłanie węzła „{4}'' (id: {5})"
+msgstr "{0}% ({1}/{2}), {3} zostało. Przesyłanie węzła „{4}” (id: {5})"
msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), {3} zostało. Przesyłanie linii „{4}'' (id: {5})"
+msgstr "{0}% ({1}/{2}), {3} zostało. Przesyłanie linii „{4}” (id: {5})"
msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2}), {3} zostało. Przesyłanie relacji „{4}'' (id: {5})"
+msgstr "{0}% ({1}/{2}), {3} zostało. Przesyłanie relacji „{4}” (id: {5})"
msgid "Starting to upload in one request ..."
msgstr "Rozpoczynanie przesyłania w jednym zapytaniu..."
@@ -14714,6 +14765,9 @@ msgstr "zastąpiona przez nową wtyczkę {0}"
msgid "no longer required"
msgstr "dłużej nie wymagany"
+msgid "Plugin information"
+msgstr "Informacje o wtyczce"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -14958,9 +15012,6 @@ msgstr ""
"Usunięto wtyczkę z konfiguracji. Proszę ponownie uruchomić program JOSM, aby "
"wyłączyć wtyczkę."
-msgid "Plugin information"
-msgstr "Informacje o wtyczce"
-
msgid "no description available"
msgstr "brak opisu"
@@ -15565,7 +15616,7 @@ msgid "Silent shortcut conflict: ''{0}'' moved by ''{1}'' to ''{2}''."
msgstr ""
msgid "Unknown territory id: {0}"
-msgstr ""
+msgstr "Nieznany identyfikator obszaru: {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!"
@@ -15792,6 +15843,8 @@ msgstr ""
msgid "could not get audio input stream from input URL"
msgstr ""
+"nie udało się uzyskać wejściowego strumienia dźwiękowego z wejściowego "
+"adresu URL"
msgid "Audio Device Unavailable"
msgstr "Niedostępne urządzenie dźwiękowe"
@@ -15815,15 +15868,35 @@ msgid "farmland"
msgstr "pola uprawne"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "zabudowa"
msgctxt "landuse"
msgid "greenfield"
-msgstr ""
+msgstr "teren pod zabudowę"
msgctxt "landuse"
msgid "village_green"
+msgstr "nawsie"
+
+msgctxt "landuse"
+msgid "quarry"
+msgstr "kamieniołom"
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
msgstr ""
msgctxt "natural"
@@ -15836,8 +15909,32 @@ msgstr "drzewa"
msgctxt "natural"
msgid "grassland"
+msgstr "teren trawiasty"
+
+msgctxt "natural"
+msgid "wetland"
msgstr ""
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "budynek przemysłowy"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "skojarzone ulice"
@@ -16089,13 +16186,13 @@ msgid "OpenSeaMap"
msgstr "OpenSeaMap"
msgid "OpenStreetMap Carto (Standard)"
-msgstr ""
+msgstr "OpenStreetMap Carto (Podstawowa)"
msgid "OpenStreetMap (Standard Black & White)"
-msgstr "OpenStreetMap (Czarno-biała warstwa poodstawowa)"
+msgstr "OpenStreetMap (Czarno-biała, podstawowa)"
msgid "OpenStreetMap (Mapnik, no labels)"
-msgstr "OpenStreetMap (Mapnik, bez podpisów)"
+msgstr "OpenStreetMap (Mapnik, bez etykiet)"
msgid "OpenStreetMap (French Style)"
msgstr "OpenStreetMap (styl francuski)"
@@ -16193,6 +16290,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -16295,6 +16400,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -16346,10 +16454,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -16382,6 +16490,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -16434,6 +16617,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -16580,6 +16769,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16619,6 +16814,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -16643,6 +16846,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -16687,34 +16893,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -16855,6 +17070,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -16883,7 +17106,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -17032,6 +17255,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -17107,6 +17338,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -17212,33 +17446,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -17248,12 +17525,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -17572,8 +17862,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -17719,9 +18009,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18112,7 +18399,7 @@ msgid "gravel"
msgstr "żwir"
msgid "pebblestone"
-msgstr "kamienie"
+msgstr "kamyki"
msgid "ground"
msgstr "grunt"
@@ -19058,19 +19345,19 @@ msgid "Water access rules:"
msgstr "Dostęp dla żeglugi:"
msgid "Ship"
-msgstr "Statek"
+msgstr "Statki"
msgid "designated"
msgstr "dla wyznaczonych pojazdów"
msgid "Boat"
-msgstr "Łódź"
+msgstr "Łodzie"
msgid "Motorboat"
-msgstr "Motorówka"
+msgstr "Łodzie motorowe"
msgid "Canoe"
-msgstr "Kajak"
+msgstr "Kajaki"
msgid "Substance"
msgstr "Substancja"
@@ -19657,26 +19944,33 @@ msgstr "Pas rowerowy/ścieżka rowerowa"
msgid "Cycleway"
msgstr "Droga rowerowa"
+msgctxt "cycleway"
msgid "lane"
-msgstr "pas drogowy"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "ścieżka"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "droga pod prąd"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "ścieżka pod prąd"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
-msgstr "pod prąd"
+msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "współdzielone z transportem miejskim"
+msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "współdzielone"
+msgstr ""
msgid "Cycleway left"
msgstr "Ścieżka rowerowa (po lewej)"
@@ -20253,14 +20547,14 @@ msgid "Salt Water"
msgstr "Słona woda"
msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr "Czy to woda okresowa (sezonowo zanikająca)?"
+msgstr "Woda okresowa (sezonowo zanikająca)"
msgid "Coastline"
msgstr "Wybrzeże"
msgid ""
"Line between the sea and land (with the water on the right side of the way)."
-msgstr ""
+msgstr "Linia pomiędzy morzem a lądem (z wodą po prawej stronie linii)."
msgid "Riverbank"
msgstr "Koryto rzeczne"
@@ -20269,7 +20563,7 @@ msgid "Wetland"
msgstr "Mokradło"
msgid "Waterlogged area, either permanently or seasonally with vegetation."
-msgstr ""
+msgstr "Obszar stale lub okresowo podmokły, zawierający roślinność."
msgid "swamp"
msgstr "bagno"
@@ -20312,6 +20606,7 @@ msgstr "Plaża"
msgid "A flat area of sand, gravel or pebble next to water."
msgstr ""
+"Płaski obszar sąsiadujący z wodą, pokryty piachem, żwirem lub kamykami."
msgid "swimming"
msgstr "pływanie"
@@ -20324,7 +20619,7 @@ msgstr "Zatoka"
msgid ""
"A large body of water partially enclosed by land but with a wide mouth."
-msgstr ""
+msgstr "Duży obszar wodny częściowo ograniczony lądem ale o szerokim wlocie."
msgid "Shipping"
msgstr "Żegluga"
@@ -20389,7 +20684,7 @@ msgid "Citgo"
msgstr "Citgo"
msgid "Eni"
-msgstr ""
+msgstr "Eni"
msgid "Esso"
msgstr "Esso"
@@ -20422,7 +20717,7 @@ msgid "Shell"
msgstr "Shell"
msgid "Socar"
-msgstr ""
+msgstr "Socar"
msgid "Statoil"
msgstr "Statoil"
@@ -20849,6 +21144,9 @@ msgstr ""
msgid "Wash"
msgstr "Myjnia samochodowa"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Dealer samochodowy"
@@ -22657,10 +22955,6 @@ msgid "garages"
msgstr "garaże"
msgctxt "building"
-msgid "industrial"
-msgstr "budynek przemysłowy"
-
-msgctxt "building"
msgid "school"
msgstr "szkoła"
@@ -22837,7 +23131,7 @@ msgstr "internat/akademik"
msgctxt "building"
msgid "terrace"
-msgstr "szeregówka"
+msgstr "szeregowiec"
msgctxt "building"
msgid "detached"
@@ -22929,11 +23223,11 @@ msgstr "paliwo"
msgctxt "content"
msgid "manure"
-msgstr ""
+msgstr "gnojówka"
msgctxt "content"
msgid "oil"
-msgstr ""
+msgstr "ropa"
msgctxt "content"
msgid "sewage"
@@ -22941,11 +23235,11 @@ msgstr "ścieki"
msgctxt "content"
msgid "silage"
-msgstr ""
+msgstr "kiszonka"
msgctxt "content"
msgid "slurry"
-msgstr ""
+msgstr "zawiesina"
msgctxt "content"
msgid "water"
@@ -24063,6 +24357,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Wykopalisko archeologiczne"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Pole bitwy"
@@ -25610,6 +25919,21 @@ msgstr "Centrum administracyjne"
msgid "Label point"
msgstr "Miejsce napisu"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "Teren"
@@ -26046,7 +26370,7 @@ msgid "{0} together with {1}"
msgstr "{0} razem z {1}"
msgid "suspicious tag combination"
-msgstr "Podejrzane połączenie znaczników"
+msgstr "podejrzane połączenie znaczników"
msgid "two objects, one with {0} and one with {1} + {2} + {3}"
msgstr ""
@@ -26193,7 +26517,7 @@ msgid "uncommon short key"
msgstr ""
msgid "{0} is inaccurate"
-msgstr ""
+msgstr "{0} jest niedokładne"
msgid "{0} is deprecated for {1}"
msgstr "{0} jest przestarzały na rzecz {1}"
@@ -26202,19 +26526,19 @@ msgid "{0} is deprecated. Use the {1}: key prefix instead."
msgstr ""
msgid "questionable key (ending with a number)"
-msgstr ""
+msgstr "wątpliwy klucz (zakończony liczbą)"
msgid "The key {0} has an uncommon value."
msgstr "Klucz {0} ma nietypową wartość."
msgid "misspelled value"
-msgstr ""
+msgstr "literówka w wartości"
msgid "wrong value: {0}"
msgstr "niewłaściwa wartość: {0}"
msgid "{0} on a node. Should be used on a way."
-msgstr ""
+msgstr "{0} na węźle. Powinno być użyte na linii."
msgid "{0} on a node. Should be drawn as an area."
msgstr ""
@@ -26232,7 +26556,7 @@ msgid "{0} together with {1} on a node. Remove {0}."
msgstr ""
msgid "{0} on a node"
-msgstr ""
+msgstr "{0} na węźle"
msgid "Building inside building"
msgstr "Budynek wewnątrz budynku"
@@ -26265,10 +26589,10 @@ msgid "suspicious roundabout direction"
msgstr "Podejrzany kierunek ronda"
msgid "{0} on a large area"
-msgstr ""
+msgstr "{0} na dużym obszarze"
msgid "{0} on a small area"
-msgstr ""
+msgstr "{0} na małym obszarze"
msgid "Too large building"
msgstr "Zbyt duży budynek"
@@ -26295,7 +26619,7 @@ msgid ""
msgstr ""
msgid "node connects highway and building"
-msgstr ""
+msgstr "węzeł łączy drogę i budynek"
msgid "abbreviated street name"
msgstr ""
@@ -26304,7 +26628,7 @@ msgid "wrong highway tag on a node"
msgstr "niewłaściwy znacznik drogi na węźle"
msgid "wrong crossing tag on a way"
-msgstr ""
+msgstr "niewłaściwy znacznik skrzyżowania na linii"
msgid "Unnamed unclassified highway"
msgstr "Droga czwartorzędna bez nazwy"
@@ -26313,7 +26637,7 @@ msgid "highway without a reference"
msgstr ""
msgid "temporary highway type"
-msgstr ""
+msgstr "tymczasowy typ drogi"
msgid "{0} used with {1}"
msgstr "{0} użyte z {1}"
@@ -26327,25 +26651,25 @@ msgid ""
msgstr ""
msgid "pedestrian railway crossing without {0}"
-msgstr ""
+msgstr "przejście przez tory be {0}"
msgid "railway crossing without {0}"
-msgstr ""
+msgstr "przejazd kolejowy bez {0}"
msgid "{0} with multiple values"
-msgstr ""
+msgstr "{0} z wieloma wartościami"
msgid "empty value in semicolon-separated ''{0}''"
msgstr ""
msgid "numerical key"
-msgstr ""
+msgstr "klucz w postaci wartości liczbowej"
msgid "layer tag with + sign"
-msgstr ""
+msgstr "znacznik warstwy ze znakiem +"
msgid "layer should be between -5 and 5"
-msgstr "wprowadzona warstwa powinna być pomiędzy -5 a 5"
+msgstr "warstwa powinna być pomiędzy -5 a 5"
msgid "{0} should have numbers only with optional .5 increments"
msgstr ""
@@ -26359,7 +26683,7 @@ msgid ""
msgstr ""
msgid "unusual {0} format"
-msgstr "Niespotykany format {0}"
+msgstr "niespotykany format {0}"
msgid ""
"{0}: kilometers is default; period is separator; if units, put space then "
@@ -26368,15 +26692,17 @@ msgstr ""
msgid "voltage should be in volts with no units/delimiter/spaces"
msgstr ""
+"napięcie powinno być wyrażone w woltach bez jednostki/separatora/odstępów"
msgid "unusual {0} specification"
-msgstr "Niespotykana specyfikacja {0}"
+msgstr "niespotykana specyfikacja {0}"
msgid "unusual train track gauge; use mm with no separator"
-msgstr ""
+msgstr "niespotykany rozstaw szyn kolejowych; proszę użyć mm bez separatora"
msgid "unusual incline; use percentages/degrees or up/down"
-msgstr "Niespotykane nachylenie; użyj procentów/stopni lub do góry/w dół"
+msgstr ""
+"niespotykane nachylenie; proszę użyć procentów/stopni lub do góry/w dół"
msgid "{0} must be a numeric value"
msgstr "{0} musi być wartością liczbową"
@@ -26388,7 +26714,7 @@ msgid "unusual value of {0}"
msgstr "Niespotykana wartość {0}"
msgid "relation without type"
-msgstr ""
+msgstr "relacja bez typu"
msgid "{0} relation without {0} tag"
msgstr "{0} relacji bez znacznika {0}"
@@ -26412,19 +26738,19 @@ msgid "street name contains ß"
msgstr ""
msgid "{0} is unnecessary"
-msgstr "{0} jest zbyteczne"
+msgstr "{0} jest zbędny"
msgid "unnecessary tag"
-msgstr ""
+msgstr "zbędny znacznik"
msgid "{0} is unnecessary for {1}"
msgstr "{0} jest zbyteczne dla {1}"
msgid "{0} makes no sense"
-msgstr ""
+msgstr "{0} jest bez sensu"
msgid "Nodes duplicating parent way tags"
-msgstr "Węzły powtarzają tagi linii rodzica."
+msgstr "Węzły powtarzają znaczniki linii nadrzędnej"
msgid ""
"wikipedia tag has no language given, use ''wikipedia''=''language:page "
@@ -26500,7 +26826,7 @@ msgid "Columbus V-900 CSV Files"
msgstr ""
msgid "Importing CSV file ''%s''..."
-msgstr ""
+msgstr "Importowanie pliku CSV „%s”..."
msgid "Markers of "
msgstr ""
@@ -26521,10 +26847,10 @@ msgid "Warn on conversion errors"
msgstr ""
msgid "Error in line "
-msgstr "Błąd w linii "
+msgstr "Błąd w wierszu "
msgid "Missing audio file"
-msgstr "Brakujący plik audio"
+msgstr "Brakujący plik dźwiękowy"
msgid "Commands"
msgstr "Polecenia"
@@ -27038,7 +27364,7 @@ msgid "House Number Editor"
msgstr "Edytor numerów domów"
msgid "House number increment:"
-msgstr ""
+msgstr "Zwiększenie wartości numeru domu:"
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
@@ -27125,15 +27451,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -27375,6 +27692,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Import"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -27410,6 +27764,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -27419,6 +27776,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -27428,15 +27788,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -27469,7 +27847,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -27486,9 +27870,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr "Pobieranie"
@@ -28181,6 +28562,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -28248,13 +28632,13 @@ msgid "Draw buildings"
msgstr "Rysowanie budynków"
msgid "Point on the corner of the building to start drawing"
-msgstr "Proszę postawić punkt naroża budynku, aby rozpocząć rysowanie"
+msgstr "Proszę wskazać naroże budynku, aby rozpocząć rysowanie"
msgid "Point on opposite end of the building"
-msgstr ""
+msgstr "Proszę wskazać przeciwległy koniec budynku"
msgid "Set width of the building"
-msgstr "Ustal szerokość budynku"
+msgstr "Proszę ustalić szerokość budynku"
msgid "Merge address points"
msgstr "Połącz punkty adresowe"
@@ -28265,24 +28649,28 @@ msgstr ""
"budynku"
msgid "Select both address nodes and building ways to merge"
-msgstr ""
+msgstr "Proszę zaznaczyć węzły adresowe i budynki, aby je połączyć"
msgid "No address nodes found in the selection"
-msgstr "Nie odnaleziono węzłów adresowych w zaznaczonym obszarze"
+msgstr "Nie odnaleziono węzłów adresowych na zaznaczonym obszarze"
msgid "No building ways found in the selection"
msgstr "Nie odnaleziono linii budynków w zaznaczonym obszarze"
msgid "There is {0} building with multiple address nodes inside"
msgid_plural "There are {0} buildings with multiple address nodes inside"
-msgstr[0] "Jest {0} budynek (budynków) z wieloma węzłami adresowymi wewnątrz"
+msgstr[0] "Jest {0} budynek z wieloma węzłami adresowymi wewnątrz"
+msgstr[1] "Są {0} budynki z wieloma węzłami adresowymi wewnątrz"
+msgstr[2] "Jest {0} budynków z wieloma węzłami adresowymi wewnątrz"
msgid "There is {0} building with address conflicts"
msgid_plural "There are {0} buildings with address conflicts"
-msgstr[0] "Jest {0} budynek (budynków) z konfliktem adresowym"
+msgstr[0] "Jest {0} budynek z konfliktem adresowym"
+msgstr[1] "Są {0} budynki z konfliktem adresowym"
+msgstr[2] "Jest {0} budynków z konfliktem adresowym"
msgid "No address nodes inside buildings found"
-msgstr "Nie znaleziono węzłów z adresem wewnątrz budynków"
+msgstr "Nie odnaleziono węzłów adresowych wewnątrz budynków"
msgid "on polygon"
msgstr ""
@@ -29023,6 +29411,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -29043,46 +29437,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
+msgstr "Zastąp geometrię"
+
+msgid "Merge Tags"
msgstr ""
-msgid "<Please select data>"
+msgid "List of tags to merge"
msgstr ""
-msgid "Configure conflation settings"
+msgid "except"
msgstr ""
-msgid "Generate matches"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Reference:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Subject:"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Programming"
+msgid "Simple Example"
msgstr ""
-msgid "Merging"
+msgid "Advanced Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Zastąp geometrię"
+msgid "<Please select data>"
+msgstr ""
-msgid "Merge Tags"
+msgid "Configure conflation settings"
msgstr ""
-msgid "List of tags to merge"
+msgid "Generate matches"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -29115,6 +29517,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -29494,9 +29902,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr "Import"
-
msgid "GPS Blams"
msgstr ""
@@ -29985,9 +30390,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr "Przesunięcie"
-
msgid "Imagery Offset Database"
msgstr "Baza danych przesunięć podkładów"
@@ -30106,24 +30508,6 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
-msgstr ""
-
-msgid "Start adjusting"
-msgstr ""
-
-msgid "There are currently no imagery layer to adjust."
-msgstr ""
-
-msgid "No layers to adjust"
-msgstr ""
-
msgid "Normal"
msgstr "Normalna"
@@ -30136,12 +30520,21 @@ msgstr "Obrót o 180 stopni"
msgid "Rotate 270"
msgstr "Obrót o 270 stopni"
-msgid "Previous image"
-msgstr "Poprzedni obraz"
+msgid "WayPoint Image"
+msgstr ""
+
+msgid "Display non-geotagged photos"
+msgstr "Wyświetl niezgeolokalizowane obrazy"
+
+msgid "Imported Images"
+msgstr "Wczytane obrazy"
msgid "Next image"
msgstr "Następny obraz"
+msgid "Previous image"
+msgstr "Poprzedni obraz"
+
msgid "Rotate left"
msgstr "Obróć w lewo"
@@ -30154,15 +30547,6 @@ msgstr "Obróć w prawo"
msgid "Rotate image right"
msgstr "Obraca obraz w prawo"
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr "Wyświetl niezgeolokalizowane obrazy"
-
-msgid "Imported Images"
-msgstr "Wczytane obrazy"
-
msgid "Import vector graphics"
msgstr "Importuje grafikę wektorową"
@@ -30320,7 +30704,7 @@ msgid "Converting OSM graph into Channel Digraph"
msgstr ""
msgid "filtering ways"
-msgstr ""
+msgstr "filtrowanie dróg"
msgid "creating Channel-Digraph"
msgstr ""
@@ -31754,46 +32138,46 @@ msgid "Undo changes made in this dialog"
msgstr ""
msgid "Reload GPS data from image file"
-msgstr ""
+msgstr "Wczytaj ponownie dane GPS z pliku obrazu"
msgid "New layer for untagged images"
-msgstr ""
+msgstr "Nowa warstwa dla nieoznakowanych obrazów"
msgid "Untagged Images"
-msgstr ""
+msgstr "Obrazy bez znaczników"
msgid "Do you want to save current calibration of layer {0}?"
msgstr "Zapisać aktualną kalibrację warstwy {0}?"
msgid "Select an option"
-msgstr ""
+msgstr "Wybieranie opcji"
msgid "Load Picture Calibration..."
-msgstr "Wczytaj kalibrację"
+msgstr "Wczytaj kalibrację..."
msgid "Loads calibration data from a file"
msgstr "Wczytuje dane kalibracji z pliku"
msgid "Loading file failed: {0}"
-msgstr "Wczytywanie pliku zakończone niepowodzeniem: {0}"
+msgstr "Nie udało się wczytać pliku: {0}"
msgid "Problem occurred"
msgstr "Wystąpił błąd"
msgid "Import World File Calibration..."
-msgstr ""
+msgstr "Importuj kalibrację z pliku słowa..."
msgid "Loads calibration data from a world file"
-msgstr ""
+msgstr "Wczytuje dane kalibracji z pliku słowa"
msgid "Reset Calibration"
-msgstr ""
+msgstr "Wyzeruj kalibrację"
msgid "Reset calibration"
-msgstr ""
+msgstr "Zeruje kalibrację obrazu"
msgid "Calibration reset"
-msgstr ""
+msgstr "Wyzerowanie kalibracji"
msgid "Save Picture Calibration..."
msgstr "Zapisz kalibrację..."
@@ -31802,13 +32186,13 @@ msgid "Saves calibration data to a file"
msgstr "Zapisuje kalibrację obrazu do pliku"
msgid "Saving file failed: {0}"
-msgstr "Zapisywanie pliku nie udało się: {0}"
+msgstr "Nie udało się zapisać pliku: {0}"
msgid "Export World file Calibration..."
-msgstr ""
+msgstr "Eksportuj kalibrację do pliku słowa..."
msgid "Saves calibration data to a world file"
-msgstr ""
+msgstr "Zapisuje dane kalibracji do pliku słowa"
msgid "New picture layer from clipboard"
msgstr "Nowa warstwa ze schowka"
@@ -31826,52 +32210,52 @@ msgid ""
msgstr ""
msgid "Notification"
-msgstr ""
+msgstr "Powiadomienie"
msgid "PicLayer move"
-msgstr "Przesuń PicLayer"
+msgstr "Przesuwanie warstwy PicLayer"
msgid "Moved"
-msgstr ""
+msgstr "Przesunięcie"
msgid "Drag to move the picture"
-msgstr "Przeciągnij aby przesunąć obraz"
+msgstr "Przesuwa obraz"
msgid "PicLayer rotate"
-msgstr ""
+msgstr "Obracanie warstwy PicLayer"
msgid "Rotated"
-msgstr "Obrócone"
+msgstr "Obrócenie"
msgid "Drag to rotate the picture"
-msgstr "Przeciągnij aby obrócić obraz"
+msgstr "Obraca obraz"
msgid "PicLayer scale X"
-msgstr ""
+msgstr "Skalowanie warstwy PicLayer w osi X"
msgid "Scaled by X"
-msgstr ""
+msgstr "Przeskalowanie w osi X"
msgid "Drag to scale the picture in the X Axis"
-msgstr "Przeciągnij aby skalować obraz w osi X"
+msgstr "Skaluje obraz w osi X"
msgid "PicLayer scale"
-msgstr ""
+msgstr "Skalowanie warstwy PicLayer"
msgid "Scaled"
-msgstr ""
+msgstr "Przeskalowanie"
msgid "Drag to scale the picture in the X and Y Axis"
-msgstr "Przeciągnij aby skalować obraz w osi X i Y"
+msgstr "Skaluje obraz w osi X i Y"
msgid "PicLayer scale Y"
-msgstr ""
+msgstr "Skalowanie warstwy PicLayer w osi Y"
msgid "Scaled by Y"
-msgstr ""
+msgstr "Przeskalowanie w osi Y"
msgid "Drag to scale the picture in the Y Axis"
-msgstr "Przeciągnij aby skalować obraz w osi Y"
+msgstr "Skaluje obraz w osi Y"
msgid "PicLayer shear"
msgstr ""
@@ -31883,34 +32267,34 @@ msgid "Drag to shear the picture"
msgstr ""
msgid "PicLayer Move point"
-msgstr ""
+msgstr "Przenoszenie punktów warstwy PicLayer"
msgid "Point added/moved"
-msgstr ""
+msgstr "Dodanie/przesunięcie punktu"
msgid "Drag or create point on the picture"
-msgstr ""
+msgstr "Przenosi lub tworzy punkt na obrazie"
msgid "PicLayer Remove point"
-msgstr ""
+msgstr "Usuwanie punktów warstwy PicLayer"
msgid "Point removed"
-msgstr ""
+msgstr "Usunięcie punktu"
msgid "Remove point on the picture"
-msgstr ""
+msgstr "Usuwa punkt z obrazu"
msgid "PicLayer Transform point"
-msgstr ""
+msgstr "Przekształcanie punktu warstwy PicLayer"
msgid "Point transformed"
-msgstr ""
+msgstr "Przekształcenie punktu"
msgid "Transform point on the picture"
-msgstr ""
+msgstr "Przekształca punkt obrazu"
msgid "PicLayer: {0}"
-msgstr ""
+msgstr "PicLayer: {0}"
msgid "Calibration Files"
msgstr "Pliki kalibracji"
@@ -31920,6 +32304,7 @@ msgstr "Nie można znaleźć obiektu."
msgid "PicLayer failed to load or import the image."
msgstr ""
+"Nie udało się wczytać lub zaimportować obrazu przez wtyczkę PicLayer."
msgid "Nothing in clipboard"
msgstr "Schowek jest pusty"
@@ -31937,19 +32322,22 @@ msgid ""
"Set \"{0}\" to yes/no/ask in the preferences\n"
"to control the autoloading of calibration files."
msgstr ""
+"Proszę ustalić wartość klucza ustawień „{0}” na yes/no/ask, aby\n"
+"zmienić ustawienia automatycznego wczytywania plików kalibracji."
msgid "Do you want to apply it ?"
msgstr "Zastosować?"
msgid "Load calibration file?"
-msgstr ""
+msgstr "Wczytać plik kalibracji?"
msgid "It will be applied automatically."
-msgstr ""
+msgstr "Zostanie on automatycznie zastosowany."
msgid ""
"Also, from now on, calibration files will always be loaded automatically."
msgstr ""
+"Od tego momentu pliki kalibracji będą zawsze automatycznie wczytywane."
msgid "Point info"
msgstr ""
@@ -31958,13 +32346,13 @@ msgid "Point info."
msgstr ""
msgid "Connecting server"
-msgstr ""
+msgstr "Nawiązywania połączenia z serwerem"
msgid "PointInfo"
msgstr ""
msgid "Data not available."
-msgstr ""
+msgstr "Dane niedostępne."
msgid "Add new address point"
msgstr ""
@@ -32277,9 +32665,6 @@ msgstr "Połącz"
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr "Id"
-
msgid "State"
msgstr "Stan"
@@ -32953,10 +33338,10 @@ msgid "Seamark Inspector"
msgstr ""
msgid "Select only one object"
-msgstr ""
+msgstr "Wybierz tylko jeden obiekt"
msgid "Select a map object"
-msgstr ""
+msgstr "Wybierz obiekt mapy"
msgid "Shape actions panel"
msgstr ""
@@ -32965,13 +33350,13 @@ msgid "Shape mode control panel"
msgstr ""
msgid "Rotate Mode:"
-msgstr ""
+msgstr "Tryb obrotu:"
msgid "Clockwise"
-msgstr ""
+msgstr "Zgodnie z ruchem wskazówek zegara"
msgid "Counter Clockwise"
-msgstr ""
+msgstr "Przeciwnie do ruchu wskazówek zegara"
msgid "Input angle here"
msgstr ""
@@ -32980,7 +33365,7 @@ msgid "Rotate"
msgstr "Obróć"
msgid "Align building "
-msgstr ""
+msgstr "Wyrównanie budynku "
msgid "Select building"
msgstr "Wybierz budynek"
@@ -32989,16 +33374,16 @@ msgid "Select road"
msgstr "Wybierz drogę"
msgid "Select none"
-msgstr ""
+msgstr "Wyczyść zaznaczenie"
msgid "Min Distance:"
-msgstr ""
+msgstr "Minimalny odstęp:"
msgid "Input min distance"
-msgstr ""
+msgstr "Wprowadź minimalny odstęp"
msgid "Align all buildings"
-msgstr ""
+msgstr "Wyrównaj wszystkie budynki"
msgid "Delete overlay"
msgstr ""
@@ -33100,7 +33485,7 @@ msgid "Undelete node {0}"
msgstr ""
msgid "OSM Export"
-msgstr ""
+msgstr "Eksport OSM"
msgid "Export traffic data to SUMO network file."
msgstr ""
@@ -33295,7 +33680,7 @@ msgid "Mark element done"
msgstr ""
msgid "Todo list"
-msgstr ""
+msgstr "Lista zadań do wykonania"
msgid "Open the todo list."
msgstr ""
@@ -33319,7 +33704,7 @@ msgid "Add the selected items to the todo list."
msgstr ""
msgid "Mark selected"
-msgstr ""
+msgstr "Zaznacz wybrane"
msgid "Mark the selected items (on the map) as done in the todo list."
msgstr ""
@@ -33328,13 +33713,13 @@ msgid "Mark the selected item in the todo list as done. (])."
msgstr ""
msgid "Mark all"
-msgstr ""
+msgstr "Zaznacz wszystkie"
msgid "Mark all items in the todo list as done."
msgstr ""
msgid "Unmark all"
-msgstr ""
+msgstr "Odznacz wszystkie"
msgid "Unmark all items in the todo list that have been marked as done."
msgstr ""
@@ -33346,7 +33731,7 @@ msgid "Remove all items (marked and unmarked) from the todo list."
msgstr ""
msgid "Todo list {0}/{1} ({2}%)"
-msgstr ""
+msgstr "Lista zadań do wykonania {0}/{1} ({2}%)"
msgid "To-fix"
msgstr ""
@@ -33370,7 +33755,7 @@ msgid "Skip"
msgstr ""
msgid "Skip Error"
-msgstr ""
+msgstr "Pomiń błąd"
msgid "Fixed"
msgstr "Poprawione"
@@ -33382,16 +33767,16 @@ msgid "Not an error"
msgstr "To nie jest błąd"
msgid "<html><a href=\"\">List of tasks</a></html>"
-msgstr ""
+msgstr "<html><a href=\"\">Lista zadań</a></html>"
msgid "Select a task ..."
-msgstr ""
+msgstr "Wybierz zadanie..."
msgid "Set download area (m²)"
-msgstr ""
+msgstr "Wybierz obszar do pobrania (m²)"
msgid "~.02"
-msgstr ""
+msgstr "~.02"
msgid "Tasks"
msgstr "Zadania"
@@ -33400,7 +33785,7 @@ msgid "Config"
msgstr "Ustawienia"
msgid "Activation"
-msgstr ""
+msgstr "Aktywacja"
msgid "tofix:Skip item"
msgstr ""
@@ -33447,10 +33832,10 @@ msgid "Merge objects nodes"
msgstr ""
msgid "Tracer"
-msgstr ""
+msgstr "Tracer"
msgid "Tracer."
-msgstr ""
+msgstr "Tracer."
msgid "Tracer building"
msgstr ""
@@ -33462,7 +33847,7 @@ msgid "Tracer2."
msgstr "Tracer2."
msgid "Change tag {0} to {1}"
-msgstr ""
+msgstr "Zmień znacznik {0} na {1}"
msgid ""
"The Tracer2Server version isn''t compatible with this plugin. Please "
@@ -33481,22 +33866,22 @@ msgstr ""
"pracy zaleca się jego aktualizację do wersji {0}."
msgid "No set of parameter is active!"
-msgstr ""
+msgstr "Brak aktywnego zestawu parametrów!"
msgid "Select parameter"
msgstr ""
msgid "Tracer2: add a way with {0} points"
-msgstr ""
+msgstr "Tracer2: dodanie linii z {0} punktami"
msgid "Tracer2: modify way to {0} points"
-msgstr ""
+msgstr "Tracer2: zmodyfikowanie linii z {0} punktami"
msgid "Tracer2 error"
-msgstr ""
+msgstr "Błąd Tracer2"
msgid "Parameter for server request"
-msgstr ""
+msgstr "Parametry zapytania dla serwera"
msgid "Resolution:"
msgstr "Rozdzielczość:"
@@ -33505,46 +33890,46 @@ msgid "Mode:"
msgstr "Tryb:"
msgid "Threshold:"
-msgstr ""
+msgstr "Granica:"
msgid "Points per circle:"
-msgstr ""
+msgstr "Liczba węzłów okręgu:"
msgid "Tag:"
msgstr "Znacznik:"
msgid "Preferred values:"
-msgstr "Wartości preferowane"
+msgstr "Preferowane wartości:"
msgid "Delete parameter \"{0}\"?"
-msgstr ""
+msgstr "Usunąć parametr „{0}”?"
msgid "Add new"
msgstr "Dodaj nowy"
msgid "Add predefined"
-msgstr ""
+msgstr "Dodaj wstępnie zdefiniowany"
msgid "Select predefined parameter"
-msgstr ""
+msgstr "Wybór wstępnie zdefiniowanego parametru"
msgid "Modify list of parameter for server request."
-msgstr ""
+msgstr "Modyfikuje listę parametrów zapytania dla serwera"
msgid "Parameter:"
-msgstr ""
+msgstr "Parametr:"
msgid ""
"Tracer2Server isn''t running. Please start the Server.\n"
"If you don''t have the server, please download it from\n"
"{0}."
msgstr ""
-"Tracer2Server nie jest uruchomiony. Proszę wpierw uruchomić Serwer.\n"
+"Tracer2Server nie jest uruchomiony. Proszę najpierw uruchomić serwer.\n"
"Jeżeli nie posiadasz serwera, możesz pobrać go z\n"
"{0}."
msgid "Tracer2Server hasn''t found anything."
-msgstr "Tracer2Server nie znalazł niczego."
+msgstr "Tracer2Server nie odnalazł niczego."
msgid "Tracer2Server has detected an error."
msgstr "Tracer2Server wykrył błąd."
@@ -33562,7 +33947,7 @@ msgid "Export sigs to XML..."
msgstr ""
msgid "Save Signatures file"
-msgstr ""
+msgstr "Zapisz plik podpisów"
msgid ""
"Get all referenced but not actually present OSM objects from OSM server."
@@ -33604,7 +33989,7 @@ msgid "OSM-Info"
msgstr "OSM-Info"
msgid "Signed"
-msgstr ""
+msgstr "Podpisany"
msgid "Unknown"
msgstr "Nieznany"
@@ -33654,13 +34039,13 @@ msgid "GnuPG"
msgstr "GnuPG"
msgid "Dialog"
-msgstr ""
+msgstr "Okno dialogowe"
msgid "Signed key value pair was: {0}={1}"
msgstr ""
msgid "{0} Signatures found."
-msgstr ""
+msgstr "Znaleziono {0} podpisów."
msgid "Signature Info"
msgstr "Informacje o podpisie"
@@ -33669,7 +34054,7 @@ msgid "Sorry, there are no Signatures for the selected Node."
msgstr ""
msgid "No Signature found"
-msgstr ""
+msgstr "Nie odnaleziono podpisu"
msgid ""
"Selected node was:\n"
@@ -33691,10 +34076,10 @@ msgid "Selected WaySegment was:"
msgstr ""
msgid "Signature Files"
-msgstr ""
+msgstr "Pliki podpisów"
msgid "OSM Signature Files"
-msgstr ""
+msgstr "Pliki podpisów OSM"
msgid "Only digits allowed in osmid: ''{0}''."
msgstr ""
@@ -33709,7 +34094,7 @@ msgid "Parsing Signature data..."
msgstr ""
msgid "The Signature is broken!"
-msgstr ""
+msgstr "Podpis jest uszkodzony!"
msgid "Manipulation Warning"
msgstr ""
@@ -33718,16 +34103,16 @@ msgid "Select a signing key from your keyring-file:"
msgstr ""
msgid "Don''t ask again for the key"
-msgstr ""
+msgstr "Nie pytaj ponownie o klucz"
msgid "Use a random key from this list"
-msgstr ""
+msgstr "Wybierz dowolny klucz z tej listy"
msgid "Create new Key"
msgstr "Stwórz nowy klucz"
msgid "Select a Key to sign"
-msgstr ""
+msgstr "Wybierz klucz do podpisu"
msgid ""
"The object with the ID \"{0}\" ({1}) is newly created.\n"
@@ -33736,25 +34121,25 @@ msgid ""
msgstr ""
msgid "Signing canceled!"
-msgstr ""
+msgstr "Podpisywanie anulowane!"
msgid "Please give a tolerance in meters"
-msgstr ""
+msgstr "Prosimy podać tolerancję w metrach"
msgid "Select as much as you like:"
msgstr "Zaznacz tyle ile chcesz:"
msgid "Survey"
-msgstr ""
+msgstr "Ankieta"
msgid "Aerial Photography"
-msgstr ""
+msgstr "Fotografia lotnicza"
msgid "Web Recherche"
-msgstr ""
+msgstr "Poszukiwania w sieci"
msgid "Trusted persons told me"
-msgstr ""
+msgstr "Zaufane osoby mi powiedziały"
msgid "Which source did you use?"
msgstr "Jakiego źródła użyłeś?"
@@ -33775,7 +34160,7 @@ msgid "Algorithm: "
msgstr "Algorytm: "
msgid "Strength in bit: "
-msgstr ""
+msgstr "Siła w bitach: "
msgid "Creation date: "
msgstr "Data utworzenia: "
@@ -33784,7 +34169,7 @@ msgid "Expiration date: "
msgstr "Data wygaśnięcia: "
msgid "PGP-Key details"
-msgstr ""
+msgstr "Szczegóły klucza PGP"
msgid "User-ID:"
msgstr "User-ID:"
@@ -33793,7 +34178,7 @@ msgid "Select algorithm:"
msgstr "Wybierz algorytm:"
msgid "Choose Bitlength (Strength):"
-msgstr ""
+msgstr "Wybierz długość bitową (siłę):"
msgid "Encryption algorithm to protect private key:"
msgstr ""
@@ -33802,7 +34187,7 @@ msgid "Choose an expiry date for the key:"
msgstr "Data zakończenia ważności klucza:"
msgid "Create a new signing key"
-msgstr ""
+msgstr "Utwórz nowy klucz podpisywania"
msgid "Turn lanes tagging - editor"
msgstr ""
@@ -33877,7 +34262,7 @@ msgid "Number of lanes"
msgstr ""
msgid "Directional"
-msgstr ""
+msgstr "Kierunkowe"
msgid "Turn lanes"
msgstr ""
@@ -33914,7 +34299,7 @@ msgid "Revalidate all turnlanes-relations."
msgstr ""
msgid "Automatically fixes the issue."
-msgstr ""
+msgstr "Automatycznie naprawia problem."
msgid "Selects the offending relation."
msgstr ""
@@ -33985,7 +34370,7 @@ msgid ""
"Cannot add object ''{0}'' as relation member because it is deleted or "
"invisible in layer ''{1}''"
msgstr ""
-"Nie można dodać obiektu „{0}'' jako członka relacji, ponieważ jest usunięty "
+"Nie można dodać obiektu „{0}” jako członka relacji, ponieważ jest usunięty "
"lub niewidoczny na warstwie „{1}”"
msgid "Clear the selected roles or delete the selected members"
@@ -34193,7 +34578,7 @@ msgstr ""
"Wyklucza pojazdy transportu publicznego takie jak autobusy, tramwaje, itp."
msgid "Heavy Goods Vehicles"
-msgstr "Samochody ciężarowe"
+msgstr "Duże samochody ciężarowe (TIR)"
msgid "Motorcars"
msgstr "Samochody osobowe"
@@ -34458,10 +34843,10 @@ msgid "The required tag <tt>{0}={1}</tt> is missing."
msgstr "Brakuje wymaganego znacznika <tt>{0}={1}</tt>."
msgid "Add missing tag"
-msgstr "Dodaj brakujący tag"
+msgstr "Dodaj brakujący znacznik"
msgid "Add the missing tag {0}={1}"
-msgstr "Dodaj brakujący tag {0}={1}"
+msgstr "Dodaj brakujący znacznik {0}={1}"
msgid ""
"The way <span class=\"object-name\">{0}</span> with role <tt>from</tt> and "
@@ -34559,7 +34944,7 @@ msgid "Internal error: number of nodes is {0}."
msgstr "Wewnętrzny błąd: liczba węzłów wynosi {0}."
msgid "Copy all tags of selected objects to paste buffer."
-msgstr ""
+msgstr "Kopiuje do schowka wszystkie znaczniki wybranych obiektów."
msgid "Extract node"
msgstr "Wydziel węzeł"
@@ -34607,18 +34992,20 @@ msgid ""
msgstr ""
msgid "The selected nodes can not be consecutive nodes in the object."
-msgstr ""
+msgstr "Zaznaczone węzły nie mogą być kolejnymi węzłami obiektu."
msgid "Split adjacent ways"
msgstr "Rozdziel sąsiadujące linie"
msgid "Split adjacent ways on T-intersections"
-msgstr "Rozdziel sąsiadujące linie na połączeniach w kształcie T"
+msgstr "Rozdziela sąsiadujące linie na przecięciach w kształcie T"
msgid ""
"There are several ways containing one of the splitting nodes. Select ways "
"participating in this operation."
msgstr ""
+"Istnieje kilka linii zawierających jeden z rozdzielanych węzłów. Proszę "
+"zaznaczyć linie biorące udział w tej czynności."
msgid "Symmetry"
msgstr "Symetria"
@@ -34627,9 +35014,11 @@ msgid ""
"Please select at least two nodes for symmetry axis and something else to "
"mirror."
msgstr ""
+"Proszę zaznaczyć co najmniej dwa węzły wyznaczające oś symetrii i obiekty do "
+"odbicia."
msgid "Copy tags from previous selection"
-msgstr "Skopiuj znaczniki z poprzedniego zaznaczenia"
+msgstr "Skopiuj znaczniki z zaznaczenia"
msgid "Pastes tags of previously selected object(s)"
msgstr "Wkleja znaczniki poprzednio zaznaczonych obiektów"
@@ -34668,18 +35057,19 @@ msgstr "Wybierz własny adres URL"
msgid "Please select one of custom URLs (configured in Preferences)"
msgstr ""
+"Proszę wybrać jeden z własnych adresów URL (skonfigurowanych w ustawieniach)"
msgid "Ask every time"
-msgstr "Pytaj za każdym razem"
+msgstr "Pytanie za każdym razem"
msgid "Configure custom URL"
-msgstr ""
+msgstr "Konfigurowanie własnego adresu URL"
msgid "Open custom URL"
msgstr "Otwórz własny adres URL"
msgid "Opens specified URL browser"
-msgstr ""
+msgstr "Otwiera określony adres URL"
msgid "Utilsplugin2 settings"
msgstr "Ustawienia Utilsplugin2"
@@ -34702,6 +35092,14 @@ msgid ""
"latitude/longitude <br/> Your can manually load settings from file "
"<b>customurl.txt</b> in JOSM folder"
msgstr ""
+"Proszę zmodyfikować własne adresy URL i zaznaczyć jeden używany za pomocą "
+"narzędzia<br/> <b>{key}</b> jest zastępowany wartością "
+"znacznika<br/> <b>{#id}</b> jest zastępowany identyfikatorem "
+"obiektu<br/> <b>{#type}</b> jest zastępowany ciągiem "
+"\"node\",\"way\" lub \"relation\"<br/> <b>{#lat} , "
+"{#lon}</b> jest zastępowany szerokością/długością geograficzną "
+"środka ekranu<br/> Można wczytać ręcznie ustawienia z pliku "
+"<b>customurl.txt</b> znajdującego się w katalogu JOSM."
msgid "Custom URL configuration"
msgstr "Własne adresy URL"
@@ -34765,19 +35163,19 @@ msgid "Edit tags of object list in table"
msgstr ""
msgid "Tag multiple objects"
-msgstr "Tagowanie wielu obiektów"
+msgstr "Zmień znaczniki wielu obiektom"
msgid "Sync with JOSM selection"
msgstr ""
msgid "Zoom to objects"
-msgstr ""
+msgstr "Przybliż do obiektów"
msgid "Remove tag"
-msgstr "Usuń tag"
+msgstr "Usuń znacznik"
msgid "Delete tags from multiple objects"
-msgstr ""
+msgstr "Usuń znaczniki z wielu obiektów"
msgid "Duplicate tags from the first"
msgstr ""
@@ -34795,13 +35193,13 @@ msgid "Multitag Background: highlight"
msgstr ""
msgid "Replace geometry of selected object with a new one"
-msgstr "Zastąp geometrię wybranego obiektu"
+msgstr "Zastępuje geometrię wybranego obiektu"
msgid ""
"This tool replaces geometry of one object with another, and so requires "
"exactly two objects to be selected."
msgstr ""
-"To narzędzie zamienia geometrię jednego obiektu z inną, i dlatego wymaga "
+"To narzędzie zamienia geometrię jednego obiektu z inną i dlatego wymaga "
"wybrania dokładnie dwóch obiektów."
msgid ""
@@ -34896,6 +35294,7 @@ msgstr "Zaznacza przecinające się linie"
msgid "Please select some ways to find connected and intersecting ways!"
msgstr ""
+"Proszę wybrać linie, aby wyszukać połączone i przecinające się linie!"
msgid "All intersecting ways"
msgstr "Wszystkie przecinające się linie"
@@ -34905,6 +35304,8 @@ msgstr "Zaznacza wszystkie przecinające się linie"
msgid "Please select some ways to find all connected and intersecting ways!"
msgstr ""
+"Proszę wybrać linie, aby wyszukać wszystkie połączone i przecinające się "
+"linie!"
msgid "Middle nodes"
msgstr "Środkowe węzły"
@@ -34913,7 +35314,7 @@ msgid "Select middle nodes"
msgstr "Zaznacza środkowe węzły"
msgid "Please select two nodes connected by way!"
-msgstr "Wybierz dwa węzły połączone linią!"
+msgstr "Proszę wybrać dwa węzły połączone linią!"
msgid "Too many ways are added: {0}!"
msgstr "Dodano zbyt dużo linii: {0}!"
@@ -34922,14 +35323,14 @@ msgid "All inside [testing]"
msgstr "Wszystko wewnątrz (testowe)"
msgid "Select all inside selected polygons"
-msgstr "Wybierz wszystkie obiekty leżace w środku wybranego wielokąta"
+msgstr "Zaznacza wszystkie obiekty leżące w środku wybranego wielokąta"
msgid ""
"Nothing found. Please select some closed ways or multipolygons to find all "
"primitives inside them!"
msgstr ""
-"Nic nie znaleziono. Wybierz zamknięte linie lub wielokąty złożone aby "
-"odszukać wszystkie elementy w środku."
+"Nic nie odnaleziono. Proszę zaznaczyć zamknięte linie lub wielokąty złożone, "
+"aby wyszukać wszystkie elementy w środku."
msgid "Area boundary [testing]"
msgstr "Granica obszaru (testowe)"
@@ -34943,25 +35344,25 @@ msgid ""
msgstr ""
msgid "Select Highway"
-msgstr "Zaznacz całą drogę"
+msgstr "Cała droga"
msgid "Select highway for the name/ref given"
-msgstr "Zaznacza całą drogę na podstawie tych samych tagów name/ref"
+msgstr "Zaznacza całą drogę na podstawie znaczników name/ref"
msgid "Please select one or two ways for this action"
-msgstr "Proszę wybrać jedną lub dwie linie dla tej akcji"
+msgstr "Proszę zaznaczyć jedną lub dwie linie dla tej czynności"
msgid "Select last modified nodes"
-msgstr "Zaznacz ostatnio zmodyfikowane węzły"
+msgstr "Ostatnio zmodyfikowane węzły"
msgid "Select last modified ways"
-msgstr "Wybierz ostatnio zmodyfikowane linie"
+msgstr "Ostatnio zmodyfikowane linie"
msgid "Select Way Nodes"
-msgstr "Zaznacz węzły linii"
+msgstr "Węzły linii"
msgid "Select all nodes of a selected way."
-msgstr "Zaznacz wszystkie węzły wybranej linii."
+msgstr "Zaznacza wszystkie węzły wybranej linii."
msgid "Undo selection"
msgstr "Cofnij zaznaczenie"
@@ -34997,10 +35398,10 @@ msgid "Video: {0}"
msgstr "Film: {0}"
msgid "jumps n sec back"
-msgstr "przeskakuje o n sekund do tyłu"
+msgstr "przechodzi n sekund wstecz"
msgid "jumps n sec forward"
-msgstr "przeskakuje o n sekund do przodu"
+msgstr "przechodzi n sekund naprzód"
msgid "Faster"
msgstr "Szybciej"
@@ -35160,7 +35561,7 @@ msgstr "<html>Nie ma więcej połączonych linii do pobrania.</html>"
msgid "Node ''{0}'' is a junction with more than 2 connected ways."
msgstr ""
-"Węzeł „{0}'' jest skrzyżowaniem z więcej niż dwiema połączonymi liniami."
+"Węzeł „{0}” jest skrzyżowaniem z więcej niż dwiema połączonymi liniami."
msgid "Enter search expression here.."
msgstr "Wprowadź frazę do znalezienia..."
@@ -35198,7 +35599,7 @@ 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 ""
+msgstr "Dodaj Wikidata dla języka ''{0}''"
msgid "Add names from Wikipedia"
msgstr "Dodaj nazwy z Wikipedii"
@@ -35224,7 +35625,7 @@ msgid "Search Wikidata items"
msgstr "Wyszukaj obiekty Wikidata"
msgid "Target key: "
-msgstr ""
+msgstr "Klucz docelowy: "
msgid "Search Wikipedia category"
msgstr "Szukaj kategorii w Wikipedii"
diff --git a/i18n/po/pt.po b/i18n/po/pt.po
index df4decc..97a86bf 100644
--- a/i18n/po/pt.po
+++ b/i18n/po/pt.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
-"PO-Revision-Date: 2017-02-23 13:48+0000\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"PO-Revision-Date: 2017-04-07 16:38+0000\n"
"Last-Translator: Rui <xande6ruz at yandex.com>\n"
"Language-Team: Portuguese <pt at li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:06+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:03+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: pt\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3656,6 +3656,9 @@ msgstr "Projeção"
msgid "Matrix set identifier"
msgstr "Identificador de conjunto de matriz"
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Sem camadas definidas pelo documento getCapabilities: {0}"
@@ -3664,6 +3667,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4388,6 +4396,9 @@ msgstr "Verifica se os multi-polígonos estão corretos."
msgid "Area style way is not closed"
msgstr "A linha de área não está fechada"
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "Multi-polígono sem linha exterior definida na relação"
@@ -4450,6 +4461,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr "Nenhuma função útil no membro do multi-polígono"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "Não-linha dentro de um multi-polígono"
@@ -9988,47 +10002,50 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} objeto a eliminar:"
msgstr[1] "{0} objetos a eliminar:"
-msgid "Show tile info"
-msgstr "Mostrar informações da tela"
+msgid "Native projections"
+msgstr ""
-msgid "Tile Info"
-msgstr "Informação da Tela"
+msgid "Offset"
+msgstr "Alinhamento"
-msgid "Metadata "
-msgstr "Metadados "
+msgid "Tile download projection"
+msgstr ""
-msgid "Load tile"
-msgstr "Carregar tela"
+msgid "Tile display projection"
+msgstr ""
-msgid "Auto zoom"
-msgstr "Enquadramento automático"
+msgid "Current zoom"
+msgstr ""
-msgid "Auto load tiles"
-msgstr "Carregar automaticamente as telas"
+msgid "Show tile info"
+msgstr "Mostrar informações da tela"
-msgid "Show errors"
-msgstr "Mostrar erros"
+msgid "Tile Info"
+msgstr "Informação da Tela"
-msgid "Load all tiles"
-msgstr "Carregar todas as telas"
+msgid "Tile name"
+msgstr ""
-msgid "Load all error tiles"
-msgstr "Carregar todas as telas com erro"
+msgid "Tile URL"
+msgstr ""
-msgid "Zoom to native resolution"
-msgstr "Enquadrar na resolução nativa"
+msgid "Tile size"
+msgstr ""
-msgid "Change resolution"
-msgstr "Alterar resolução"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Aproximar enquadramento"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Afastar enquadramento"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
-msgstr "Limpar ficheiros temporários das telas"
+msgid "Metadata "
+msgstr "Metadados "
+
+msgid "Load tile"
+msgstr "Carregar tela"
msgid "Failed to create tile source"
msgstr "Não foi possível criar a fonte das telas"
@@ -10146,8 +10163,14 @@ msgstr[1] "{0} trilhos GPS, "
msgid "Save GPX file"
msgstr "Gravar ficheiro GPX"
-msgid "Imagery fade"
-msgstr "Desvanecimento da imagem de fundo"
+msgid "Id"
+msgstr "Identificador"
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
+msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr "Tipo de imagem não suportada: {0}"
@@ -10262,9 +10285,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Gravar ficheiro OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "São suportadas as projeções EPSG:4326 e Mercator"
-
msgid "Validation errors"
msgstr "Erros de validação"
@@ -10275,11 +10295,12 @@ msgid "Set WMS Bookmark"
msgstr "Criar favorito da imagem de fundo WMS"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
-"O JOSM utilizará EPSG:4326 para consultar o servidor, mas os resultados "
-"poderão variar dependendo do servidor WMS"
msgid "Correlate to GPX"
msgstr "Correlacionar com GPX"
@@ -10456,20 +10477,6 @@ msgstr "Deve selecionar um trilho GPX"
msgid "No selected GPX track"
msgstr "Nenhum trilho GPX selecionado"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Ocorreu um erro ao processar o fuso horário.\n"
-"Formato esperado: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Ocorreu um erro ao processar o alinhamento.\n"
-"Formato esperado: {0}"
-
msgid "Geotagged Images"
msgstr "Imagens Geo-posicionadas"
@@ -10611,12 +10618,26 @@ msgstr ""
"\n"
"Tempo GPS: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Ocorreu um erro ao processar o alinhamento.\n"
+"Formato esperado: {0}"
+
msgid "Show thumbnails"
msgstr "Mostrar miniaturas das imagens"
msgid "Show image thumbnails instead of icons."
msgstr "Mostrar miniaturas das imagens em vez de ícones."
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Ocorreu um erro ao processar o fuso horário.\n"
+"Formato esperado: {0}"
+
msgid "Choose visible tracks"
msgstr "Escolher trilhos GPS visíveis"
@@ -10793,6 +10814,36 @@ msgstr "Criar marcadores a partir dos pontos com nome"
msgid "Named Trackpoints from {0}"
msgstr "Pontos do trilho com nome de {0}"
+msgid "Auto load tiles"
+msgstr "Carregar automaticamente as telas"
+
+msgid "Auto zoom"
+msgstr "Enquadramento automático"
+
+msgid "Decrease zoom"
+msgstr "Afastar enquadramento"
+
+msgid "Flush tile cache"
+msgstr "Limpar ficheiros temporários das telas"
+
+msgid "Increase zoom"
+msgstr "Aproximar enquadramento"
+
+msgid "Load all tiles"
+msgstr "Carregar todas as telas"
+
+msgid "Load all error tiles"
+msgstr "Carregar todas as telas com erro"
+
+msgid "Show errors"
+msgstr "Mostrar erros"
+
+msgid "Change resolution"
+msgstr "Alterar resolução"
+
+msgid "Zoom to native resolution"
+msgstr "Enquadrar na resolução nativa"
+
msgid "gps marker"
msgstr "marcador GPS"
@@ -12430,15 +12481,6 @@ msgstr "Nome da cache"
msgid "Object Count"
msgstr "Número de objetos"
-msgid "imagery fade"
-msgstr "desvanecimento da imagem de fundo"
-
-msgid "Fade Color: "
-msgstr "Cor da Opacidade: "
-
-msgid "Fade amount: "
-msgstr "Nível da Opacidade (+ ou - opaco): "
-
msgid "Soft"
msgstr "Nitidez Suave"
@@ -12490,6 +12532,9 @@ msgstr "Imagens de Fundo: Padrão"
msgid "Available default entries:"
msgstr "Fontes disponíveis:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "Fontes ativadas:"
@@ -13801,6 +13846,9 @@ msgstr "Atributos Opcionais:"
msgid "Unknown requisite: {0}"
msgstr "Requisito desconhecido: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "Expressão de membro inválida: {0}"
@@ -14893,7 +14941,7 @@ msgid "Confirm Remote Control action"
msgstr "Confirmar a ação do Controlo Remoto"
msgid "The following keys are mandatory, but have not been provided: {0}"
-msgstr ""
+msgstr "As seguintes chaves são obrigatórias, mas não foram fornecidas: {0}"
msgid ""
"Remote Control has been asked to report its protocol version. This enables "
@@ -14971,6 +15019,8 @@ msgstr ""
msgid ""
"Version ''{0}'' of meta data for note layer is not supported. Expected: 0.1"
msgstr ""
+"A versão ''{0}'' dos metadados da camada de erros reportados não é "
+"suportada. Esperado: 0.1"
msgid ""
"Version ''{0}'' of meta data for osm data layer is not supported. Expected: "
@@ -15090,6 +15140,9 @@ msgstr "substituido pelo novo módulo {0}"
msgid "no longer required"
msgstr "deixou de ser necessário"
+msgid "Plugin information"
+msgstr "Informação do módulo"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -15322,9 +15375,6 @@ msgstr ""
"O módulo foi removido da configuração. Por favor reinicie o JOSM para "
"finalizar a remoção."
-msgid "Plugin information"
-msgstr "Informação do módulo"
-
msgid "no description available"
msgstr "sem descrição disponível"
@@ -15850,6 +15900,10 @@ msgid ""
"http://forum.openstreetmap.org/viewtopic.php?id=25677).\n"
"Currently you have {1,number,#}MB memory allocated for JOSM"
msgstr ""
+"Para adicionar outra camada necessita de disponibilizar {0,number,#}MB de "
+"memória RAM para o JOSM utilizando o comando -Xmx{0,number,#}M (veja "
+"http://forum.openstreetmap.org/viewtopic.php?id=25677).\n"
+"Neste momento tem atribuído ao JOSM {1,number,#}MB de memória RAM."
msgid "{0}... [please type its number]"
msgstr "{0}... [por favor digite o seu número]"
@@ -16063,6 +16117,9 @@ 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 ""
+"Ocorreu uma exceção inesperada.\n"
+"Isto é normalmente um erro de programação. Se estiver a usar a última versão "
+"do JOSM por favor considere reportar este erro aos programadores."
msgid "Debug information"
msgstr "Informações de depuração"
@@ -16232,6 +16289,14 @@ msgid "farmland"
msgstr "terra de cultivo"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "residencial"
@@ -16243,6 +16308,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr "pedreira"
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr "matagal"
@@ -16255,6 +16332,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "industrial"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "estrada associada"
@@ -16587,7 +16688,7 @@ msgid "OSM Inspector: Highways"
msgstr "OSM Inspector: Vias"
msgid "OSM Inspector: Area"
-msgstr ""
+msgstr "OSM Inspector: Área"
msgid "OSM Inspector: Routing"
msgstr "OSM Inspector: Rotas"
@@ -16596,7 +16697,7 @@ msgid "OSM Inspector: Addresses"
msgstr "OSM Inspector: Endereços"
msgid "OSM Inspector: Coastline (EU)"
-msgstr ""
+msgstr "OSM Inspector: Linha costeira (EU)"
msgid "imagico.de OSM images for mapping: Prokletije Mountains"
msgstr ""
@@ -16610,6 +16711,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr "IGN Argentina (TMS)"
@@ -16701,16 +16810,19 @@ msgid "imagico.de OSM images for mapping: Rila and Pirin Mountains"
msgstr ""
msgid "OpenStreetMap (Belgian Style)"
-msgstr ""
+msgstr "OpenStreetMap (Estilo Belga)"
msgid "OpenStreetMap (Belgian Style - French)"
-msgstr ""
+msgstr "OpenStreetMap (Estilo Belga - Francês)"
msgid "OpenStreetMap (Belgian Style - Dutch)"
-msgstr ""
+msgstr "OpenStreetMap (Estilo Belga - Países Baixos)"
msgid "OpenStreetMap (Belgian Style - German)"
-msgstr ""
+msgstr "OpenStreetMap (Estilo Belga - Alemão)"
+
+msgid "Orthophoto IGN-NGI"
+msgstr "Ortofoto IGN-NGI"
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -16763,11 +16875,11 @@ msgstr "SPW(allonie) 2012-2013 imagens aéreas"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 imagens aéreas"
-msgid "TEC bus lines (2014)"
-msgstr "TEC linhas de autocarros (2014)"
+msgid "TEC bus lines"
+msgstr ""
-msgid "TEC bus stops (2014)"
-msgstr "TEC paragens de autocarros (2014)"
+msgid "TEC bus stops"
+msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
msgstr ""
@@ -16799,6 +16911,81 @@ msgstr "Londrina Ortofoto 2011"
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr "SIG Santa Catarina OrtoRGB 2012"
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Geobase - Hidrografia"
@@ -16851,6 +17038,12 @@ msgstr "Checoslováquia RUIAN - parcelas"
msgid "Czech pLPIS"
msgstr "Checoslováquia pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Dinamarca)"
@@ -16999,6 +17192,12 @@ msgstr "Berlim aerial photograph 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Berlim fotografias aéreas 2016"
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -17039,6 +17238,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -17063,6 +17270,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -17107,35 +17317,44 @@ msgstr "Drone Imagery Canaan(Haiti) Novembro 2015"
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
-msgstr "FÖMI ortofoto 2000"
+msgid "FÖMI orthophoto 2000"
+msgstr ""
-msgid "FÖMI ortophoto 2005"
-msgstr "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
+msgstr ""
-msgid "Szeged ortophoto 2011"
-msgstr "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
+msgstr ""
msgid "Inner part of Szeged"
msgstr "Inner part of Szeged"
-msgid "Törökbálint ortophoto 2013"
-msgstr "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
+msgstr ""
msgid "5 cm resolution bald image"
msgstr "5 cm resolution bald image"
-msgid "Törökbálint ortophoto 2015"
-msgstr "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
+msgstr ""
-msgid "Danube flood ortophoto 2013"
-msgstr "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
+msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
"Bacia hidrográfica do Danúbio emBudapeste, Szentendre e Szigetmonostor"
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -17277,6 +17496,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard -Ortofoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -17305,8 +17532,8 @@ 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)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: Ortofotomapa (imagem aérea)"
@@ -17454,6 +17681,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk - Carro"
@@ -17529,6 +17764,9 @@ msgstr "Cantão da Argóvia 25cm (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Cantão da Argóvia 25cm (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr "Kanton Zürich Orthophotos 2014/2015 10cm"
@@ -17634,33 +17872,76 @@ msgstr "TIGER 2012 Estradas sobrepostas"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr "TIGER Estradas Novas e Desalinhadas (2015)"
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcelas"
msgid "NC Latest Orthoimagery"
msgstr "NC Ortofotos Recentes"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr "Estradas Florestais dos E.U.A."
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr "NJ 2015 Imagens Aéreas (Infravermelhos)"
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr "NJ 2015 Imagens Aéreas (Cores Naturais)"
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr "Texas Ortofoto"
@@ -17670,12 +17951,25 @@ msgstr "Filadélfia 2015 Imagens Aéreas"
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr "MD 3 Polegadas Imagens Aéreas"
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr "MD Mapa Base de Transportes"
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -18003,8 +18297,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -18181,9 +18475,6 @@ msgstr ""
"Base de dados de alinhamentos de imagens de fundo: partilhe e obtenha "
"alinhamentos com um simples botão."
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -20241,28 +20532,33 @@ msgstr "Faixa/Pista para Bicicletas"
msgid "Cycleway"
msgstr "Ciclovia"
+msgctxt "cycleway"
msgid "lane"
-msgstr "faixa na estrada"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "pista"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "faixa na estrada - sentido oposto ao sentido do trânsito na estrada"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
-"pista de ciclovia separada - sentido oposto ao sentido do trânsito na estrada"
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
-"sentido oposto (ciclistas podem usar a estrada no sentido oposto do trãnsito)"
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "partilha com faixa de autocarros (BUS)"
+msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "faixa partilhada"
+msgstr ""
msgid "Cycleway left"
msgstr "Ciclovia esquerda"
@@ -21440,6 +21736,9 @@ msgstr "Cartão de membro"
msgid "Wash"
msgstr "Lavagem"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Loja de Automóveis"
@@ -23260,10 +23559,6 @@ msgid "garages"
msgstr "garagens"
msgctxt "building"
-msgid "industrial"
-msgstr "industrial"
-
-msgctxt "building"
msgid "school"
msgstr "escola"
@@ -24665,6 +24960,21 @@ msgstr "palácio"
msgid "Archaeological Site"
msgstr "Sítio Arqueológico"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Campo de Batalha"
@@ -26226,6 +26536,21 @@ msgstr "Centro Administrativo"
msgid "Label point"
msgstr "Nó onde aparecerá o nome"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "Sítio"
@@ -27782,15 +28107,6 @@ msgstr "Importar imagens locais"
msgid "Import pictures into Mapillary layer"
msgstr "Importar imagens para a camada Mapillary"
-msgid "Select pictures"
-msgstr "Selecionar imagens"
-
-msgid "Import pictures into sequence"
-msgstr "Importar as imagens em sequência"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importar imagens para a camada Mapillary em sequência"
-
msgid "Join mode"
msgstr "Modo de unir"
@@ -28033,6 +28349,43 @@ msgstr "Seguir a imagem selecionada"
msgid "Go forward"
msgstr "Avançar"
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Importar"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -28070,6 +28423,9 @@ msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
"Mostra informação detalhada sobre a imagem atual selecionada do Mapillary"
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -28079,6 +28435,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr "Adicionar etiqueta Mapillary"
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -28088,15 +28447,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr "Não foi possível abrir o URL {0} no navegador de internet"
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -28129,7 +28506,13 @@ msgstr[1] "Viradas {0} imagens"
msgid "2 images unjoined"
msgstr "2 imagens separadas"
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -28146,9 +28529,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr "A descarregar"
@@ -28962,6 +29342,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -29877,6 +30260,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -29897,46 +30286,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
-msgstr ""
+msgid "Replace Geometry"
+msgstr "Substituir Geometria (mantém histórico de autores)"
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
-msgstr "Configurar definições de fusão"
+msgid "List of tags to merge"
+msgstr ""
-msgid "Generate matches"
-msgstr "Gerar correspondências"
+msgid "except"
+msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Substituir Geometria (mantém histórico de autores)"
+msgid "Advanced Example"
+msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
+msgstr "Configurar definições de fusão"
+
+msgid "Generate matches"
+msgstr "Gerar correspondências"
+
+msgid "Merging"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -29969,6 +30366,12 @@ msgstr "Seleção vazia"
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -30353,9 +30756,6 @@ msgstr "Importar Globalsat"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Importar dados do Globalsat Datalogger DG100 para uma camada GPX."
-msgid "Import"
-msgstr "Importar"
-
msgid "GPS Blams"
msgstr ""
@@ -30881,9 +31281,6 @@ msgstr "A carregar alinhamentos de imagens de fundo..."
msgid "Error processing XML response: {0}"
msgstr "Surgiu um erro ao processar a resposta XML: {0}"
-msgid "Offset"
-msgstr "Alinhamento"
-
msgid "Imagery Offset Database"
msgstr "Base de dados de Alinhamentos de Imagens de Fundo"
@@ -31026,24 +31423,6 @@ msgstr "A enviar um novo alinhamento..."
msgid "This string should be 3 to 200 letters long."
msgstr "Este texto deve ter entre 3 e 200 caracteres."
-msgid "Adjust imagery"
-msgstr "Ajustar imagem de fundo"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Altere a posição da camada de imagem de fundo selecionada"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Selecione a camada de imagem de fundo a alinhar."
-
-msgid "Start adjusting"
-msgstr "Começar a ajustar"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "Não existem nenhuma camada de imagem de fundo para ajustar"
-
-msgid "No layers to adjust"
-msgstr "Nenhuma camada a ajustar"
-
msgid "Normal"
msgstr "Normal"
@@ -31056,12 +31435,21 @@ msgstr "Rodar 180"
msgid "Rotate 270"
msgstr "Rodar 270"
-msgid "Previous image"
-msgstr "Imagem anterior"
+msgid "WayPoint Image"
+msgstr "Imagem do ponto do trilho GPS"
+
+msgid "Display non-geotagged photos"
+msgstr "Mostrar fotografias sem geo-referências"
+
+msgid "Imported Images"
+msgstr "Imagens Importadas"
msgid "Next image"
msgstr "Imagem seguinte"
+msgid "Previous image"
+msgstr "Imagem anterior"
+
msgid "Rotate left"
msgstr "Rodar à esquerda"
@@ -31074,15 +31462,6 @@ msgstr "Rodar à direita"
msgid "Rotate image right"
msgstr "Rodar a imagem para a direita"
-msgid "WayPoint Image"
-msgstr "Imagem do ponto do trilho GPS"
-
-msgid "Display non-geotagged photos"
-msgstr "Mostrar fotografias sem geo-referências"
-
-msgid "Imported Images"
-msgstr "Imagens Importadas"
-
msgid "Import vector graphics"
msgstr "Importar gráficos vetoriais"
@@ -33301,9 +33680,6 @@ msgstr "Unir"
msgid "Public Transport: Join GTFS stops"
msgstr "Transporte Público: unir paragens GTFS"
-msgid "Id"
-msgstr "Identificador"
-
msgid "State"
msgstr "Estado"
diff --git a/i18n/po/pt_BR.po b/i18n/po/pt_BR.po
index e5dd70c..d1d7b95 100644
--- a/i18n/po/pt_BR.po
+++ b/i18n/po/pt_BR.po
@@ -8,16 +8,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
-"PO-Revision-Date: 2017-03-22 01:04+0000\n"
-"Last-Translator: Lucas Pereira <lucaspefreitas at gmail.com>\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"PO-Revision-Date: 2017-04-04 01:17+0000\n"
+"Last-Translator: André Marcelo Alvarenga <andrealvarenga at gmx.net>\n"
"Language-Team: Português Brasileiro <gnome-pt_br-list at gnome.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:17+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:14+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: pt_BR\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -1997,7 +1997,7 @@ msgid ""
msgstr "Ignorando o erro porque o download foi cancelado. O erro foi: {0}"
msgid "No data found in this area."
-msgstr "Nenhum informação desta área encontrada."
+msgstr "Nenhuma informação encontrada nesta área."
msgid "OSM Server URL:"
msgstr "URL do servidor OSM:"
@@ -3611,6 +3611,9 @@ msgstr "Projeção"
msgid "Matrix set identifier"
msgstr "Matrix set identifier"
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Nenhuma camada definida pelo documento getCapabilities: {0}"
@@ -3621,6 +3624,11 @@ msgstr ""
"elemento final {2}"
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4332,6 +4340,9 @@ msgstr "Este teste verifica se os multipolígonos são válidos."
msgid "Area style way is not closed"
msgstr "O estilo de caminho da área não está fechado"
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "Sem caminho externo para o multipolígono"
@@ -4397,6 +4408,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr "Nenhuma regra últil para membro multipoligonal"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "Elementos que não são caminhos estão no multipolígono"
@@ -9885,47 +9899,50 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} objeto a remover:"
msgstr[1] "{0} objetos a remover:"
-msgid "Show tile info"
-msgstr "Mostrar informações da tile"
+msgid "Native projections"
+msgstr ""
-msgid "Tile Info"
-msgstr "Informação de Imagem de Fundo"
+msgid "Offset"
+msgstr "Deslocamento:"
-msgid "Metadata "
-msgstr "Metadados "
+msgid "Tile download projection"
+msgstr ""
-msgid "Load tile"
-msgstr "Carregar tile"
+msgid "Tile display projection"
+msgstr ""
-msgid "Auto zoom"
-msgstr "Zoom automático"
+msgid "Current zoom"
+msgstr ""
-msgid "Auto load tiles"
-msgstr "Carregar quadros automaticamente"
+msgid "Show tile info"
+msgstr "Mostrar informações da tile"
-msgid "Show errors"
-msgstr "Mostrar erros"
+msgid "Tile Info"
+msgstr "Informação de Imagem de Fundo"
-msgid "Load all tiles"
-msgstr "Carregar todas as tiles"
+msgid "Tile name"
+msgstr ""
-msgid "Load all error tiles"
-msgstr "Carregar todos os erros de tiles"
+msgid "Tile URL"
+msgstr ""
-msgid "Zoom to native resolution"
-msgstr "Zoom para a resolução nativa"
+msgid "Tile size"
+msgstr ""
-msgid "Change resolution"
-msgstr "Mudar resolução"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Aumentar zoom"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Diminuir zoom"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
-msgstr "Limpar cache de tile"
+msgid "Metadata "
+msgstr "Metadados "
+
+msgid "Load tile"
+msgstr "Carregar tile"
msgid "Failed to create tile source"
msgstr "Falha na criação da fonte de imagem de fundo"
@@ -10041,8 +10058,14 @@ msgstr[1] "{0} trilhas, "
msgid "Save GPX file"
msgstr "Salvar arquivo GPX"
-msgid "Imagery fade"
-msgstr "Desbotamento de camadas"
+msgid "Id"
+msgstr "Id"
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
+msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr "Tipo de camada não suportada: {0}"
@@ -10157,9 +10180,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Salvar arquivo OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "EPSG:4326 e Mercator projection são suportados"
-
msgid "Validation errors"
msgstr "Erros de validação"
@@ -10170,11 +10190,12 @@ msgid "Set WMS Bookmark"
msgstr "Adicionar marcador para esta camada WMS"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
-"O JOSM utilizará EPSG:4326 para pedir ao servidor, mas os resultados podem "
-"variar dependendo do servidor WMS"
msgid "Correlate to GPX"
msgstr "Correlacionar com GPX"
@@ -10348,20 +10369,6 @@ msgstr "Você tem que selecionar uma trilha GPS"
msgid "No selected GPX track"
msgstr "Não selecionar trilha GPS"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Erro ao analisar timezone.\n"
-"Formato esperado: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Erro ao analisar o deslocamento.\n"
-"Formato esperado: {0}"
-
msgid "Geotagged Images"
msgstr "Imagens Geotagueadas"
@@ -10503,12 +10510,26 @@ msgstr ""
"\n"
"Hora GPS: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Erro ao analisar o deslocamento.\n"
+"Formato esperado: {0}"
+
msgid "Show thumbnails"
msgstr "Mostrar miniaturas"
msgid "Show image thumbnails instead of icons."
msgstr "Mostrar miniaturas de imagens ao invés de ícones."
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Erro ao analisar timezone.\n"
+"Formato esperado: {0}"
+
msgid "Choose visible tracks"
msgstr "Escolha faixas visíveis"
@@ -10684,6 +10705,36 @@ msgstr "Marcadores de Pontos Nomeados"
msgid "Named Trackpoints from {0}"
msgstr "Trackpoints nomeados de {0}"
+msgid "Auto load tiles"
+msgstr "Carregar quadros automaticamente"
+
+msgid "Auto zoom"
+msgstr "Zoom automático"
+
+msgid "Decrease zoom"
+msgstr "Diminuir zoom"
+
+msgid "Flush tile cache"
+msgstr "Limpar cache de tile"
+
+msgid "Increase zoom"
+msgstr "Aumentar zoom"
+
+msgid "Load all tiles"
+msgstr "Carregar todas as tiles"
+
+msgid "Load all error tiles"
+msgstr "Carregar todos os erros de tiles"
+
+msgid "Show errors"
+msgstr "Mostrar erros"
+
+msgid "Change resolution"
+msgstr "Mudar resolução"
+
+msgid "Zoom to native resolution"
+msgstr "Zoom para a resolução nativa"
+
msgid "gps marker"
msgstr "Marcador gps"
@@ -12292,15 +12343,6 @@ msgstr "Nome do cache"
msgid "Object Count"
msgstr "Quantidade de Itens"
-msgid "imagery fade"
-msgstr "imagery fade"
-
-msgid "Fade Color: "
-msgstr "Cor do desvanecimento: "
-
-msgid "Fade amount: "
-msgstr "Proporção de desvanecimento: "
-
msgid "Soft"
msgstr "Leve"
@@ -12349,6 +12391,9 @@ msgstr "Imagem do plano de fundo: Padrão"
msgid "Available default entries:"
msgstr "Entradas padrão disponíveis:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "Entradas selecionadas:"
@@ -13630,6 +13675,9 @@ msgstr "Atributos opcionais:"
msgid "Unknown requisite: {0}"
msgstr "Requisito desconhecido: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "Membro ilegal na expressão: {0}"
@@ -14903,6 +14951,9 @@ msgstr "substituído por um novo plugin {0}"
msgid "no longer required"
msgstr "não é mais necessário"
+msgid "Plugin information"
+msgstr "Informações sobre o plugin"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -15139,9 +15190,6 @@ msgstr ""
"O plugin foi removido da configuração. Por favor, reinicie o JOSM para "
"desativar o plugin."
-msgid "Plugin information"
-msgstr "Informações sobre o plugin"
-
msgid "no description available"
msgstr "sem descrição disponível"
@@ -16032,6 +16080,14 @@ msgid "farmland"
msgstr "terras agrícolas"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "residencial"
@@ -16043,6 +16099,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr "arbusto"
@@ -16055,6 +16123,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "industrial"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "associatedStreet"
@@ -16410,6 +16502,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -16512,6 +16612,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -16563,10 +16666,10 @@ msgstr "SPW(allonie) 2012-2013 aerial imagery"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 aerial imagery"
-msgid "TEC bus lines (2014)"
-msgstr "TEC bus lines (2014)"
+msgid "TEC bus lines"
+msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -16599,6 +16702,81 @@ msgstr "Londrina Ortofoto 2011"
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr "SIG Santa Catarina OrtoRGB 2012"
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Geobase Hydrography"
@@ -16651,6 +16829,12 @@ msgstr "Czech RUIAN parcely"
msgid "Czech pLPIS"
msgstr "Czech pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Denmark)"
@@ -16799,6 +16983,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16839,6 +17029,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -16863,6 +17061,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -16907,34 +17108,43 @@ msgstr "Drone Imagery Canaan(Haiti) November 2015"
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
-msgstr "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
+msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -17075,6 +17285,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard -Orthophoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -17103,8 +17321,8 @@ 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)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: Ortofotomapa (aerial image)"
@@ -17252,6 +17470,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Car"
@@ -17327,6 +17553,9 @@ msgstr "Kanton Aargau 25cm (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Kanton Aargau 25cm (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -17432,33 +17661,76 @@ msgstr "TIGER 2012 Roads Overlay"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr "New & Misaligned TIGER Roads (2015)"
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
msgid "NC Latest Orthoimagery"
msgstr "NC Últimas Ortoimagens"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr "U.S. Forest Service roads"
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -17468,12 +17740,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -17804,8 +18089,8 @@ msgstr ""
"camadas de fundo. Otimizado para basemap.at."
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -17979,9 +18264,6 @@ msgstr ""
"Banco de dados de deslocamentos de imagens: compartilhe e adquira imagens "
"offsets com um botão."
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "WMSPlugin-style imagery adjustment mapmode"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -19998,26 +20280,33 @@ msgstr "Ciclofaixa/Ciclovia"
msgid "Cycleway"
msgstr "Ciclovia"
+msgctxt "cycleway"
msgid "lane"
-msgstr "ciclofaixa"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "ciclovia"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "ciclofaixa no contrafluxo"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "ciclovia no contrafluxo"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
-msgstr "no contrafluxo"
+msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "compartilha corredor de ônibus"
+msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "faixa compartilhada"
+msgstr ""
msgid "Cycleway left"
msgstr "Ciclovia na esquerda"
@@ -21196,6 +21485,9 @@ msgstr ""
msgid "Wash"
msgstr "Lava Jato"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Concessionária"
@@ -23014,10 +23306,6 @@ msgid "garages"
msgstr "garagens"
msgctxt "building"
-msgid "industrial"
-msgstr "industrial"
-
-msgctxt "building"
msgid "school"
msgstr "escola"
@@ -24420,6 +24708,21 @@ msgstr "palácio"
msgid "Archaeological Site"
msgstr "Sítio Arqueológico"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Campo de Batalha"
@@ -25985,6 +26288,21 @@ msgstr "Centro administrativo"
msgid "Label point"
msgstr "Ponto de renderização do nome"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "Local"
@@ -27533,15 +27851,6 @@ msgstr "Importar imagens locais"
msgid "Import pictures into Mapillary layer"
msgstr "Importar imagens na camada do Mapillary"
-msgid "Select pictures"
-msgstr "Selecionar imagens"
-
-msgid "Import pictures into sequence"
-msgstr "Importar imagens na sequência"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importar imagens na camada Mapillary em uma sequência"
-
msgid "Join mode"
msgstr "Join mode"
@@ -27784,6 +28093,43 @@ msgstr "Sigir imagem selecionada"
msgid "Go forward"
msgstr "Ir para a frente"
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Importar"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -27819,6 +28165,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -27828,6 +28177,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -27837,15 +28189,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -27878,7 +28248,13 @@ msgstr[1] "Viradas {0} imagens"
msgid "2 images unjoined"
msgstr "2 imagens se separaram"
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -27895,9 +28271,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr "Baixando"
@@ -28476,7 +28849,7 @@ msgstr ""
"<ul>\n"
" <li><b>Alinhar segmentos.</b> Pressione <b><i><span "
"style=\"color:green\">{0}</span></i></b>. Alternativamente, você pode usar o "
-"comando no munu <b>Ferramentas</b>\n"
+"comando no menu <b>Ferramentas</b>\n"
"ou pode colocar um atalho na <b>barra de ferramentas</b>.\n"
" </li>\n"
"</ul>\n"
@@ -28712,6 +29085,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -29620,6 +29996,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -29640,46 +30022,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
-msgstr ""
+msgid "Replace Geometry"
+msgstr "Substituir geometria"
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
-msgstr "Configurar as definições de fusão"
+msgid "List of tags to merge"
+msgstr ""
-msgid "Generate matches"
-msgstr "Gerar correspondências"
+msgid "except"
+msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Substituir geometria"
+msgid "Advanced Example"
+msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
+msgstr "Configurar as definições de fusão"
+
+msgid "Generate matches"
+msgstr "Gerar correspondências"
+
+msgid "Merging"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -29712,6 +30102,12 @@ msgstr "Seleção vazia"
msgid "Freeze reference selection"
msgstr "Congelar referência de seleção"
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -30112,9 +30508,6 @@ msgstr "Importação Globalsat"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Importa dados do Globalsat Datalogger DG100 na camada GPX."
-msgid "Import"
-msgstr "Importar"
-
msgid "GPS Blams"
msgstr "GPS Blams"
@@ -30636,9 +31029,6 @@ msgstr "Carregando deslocamentos de imagens..."
msgid "Error processing XML response: {0}"
msgstr "Erro no processamento da resposta XML: {0}"
-msgid "Offset"
-msgstr "Deslocamento:"
-
msgid "Imagery Offset Database"
msgstr "Imagery Offset Database"
@@ -30778,24 +31168,6 @@ msgstr "Enviando um novo offset..."
msgid "This string should be 3 to 200 letters long."
msgstr "Esta cadeia deve ter de 3 a 200 letras."
-msgid "Adjust imagery"
-msgstr "Ajustar imagem"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Ajuste a posição da camada de imagens selecionadas"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Por favor, selecione a camada de imagens para ajustar."
-
-msgid "Start adjusting"
-msgstr "Iniciar ajuste"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "Atualmente nenhuma camada de imagens para ajustar."
-
-msgid "No layers to adjust"
-msgstr "Sem camadas para ajustar"
-
msgid "Normal"
msgstr "Normal"
@@ -30808,12 +31180,21 @@ msgstr "Girar 180"
msgid "Rotate 270"
msgstr "Girar 270"
-msgid "Previous image"
-msgstr "Imagem anterior"
+msgid "WayPoint Image"
+msgstr "WayPoint Image"
+
+msgid "Display non-geotagged photos"
+msgstr "Mostrar fotos não georeferenciadas"
+
+msgid "Imported Images"
+msgstr "Imagens importadas"
msgid "Next image"
msgstr "Próxima imagem"
+msgid "Previous image"
+msgstr "Imagem anterior"
+
msgid "Rotate left"
msgstr "Girar para a esquerda"
@@ -30826,15 +31207,6 @@ msgstr "Girar para a direita"
msgid "Rotate image right"
msgstr "Girar imagem para a direita"
-msgid "WayPoint Image"
-msgstr "WayPoint Image"
-
-msgid "Display non-geotagged photos"
-msgstr "Mostrar fotos não georeferenciadas"
-
-msgid "Imported Images"
-msgstr "Imagens importadas"
-
msgid "Import vector graphics"
msgstr "Importar gráficos vetoriais"
@@ -32987,7 +33359,7 @@ msgstr ""
"servidor ou abrir um arquivo OSM."
msgid "No data found"
-msgstr "Nenhum informação encontrada"
+msgstr "Nenhuma informação encontrada"
msgid "The GTFS file was empty."
msgstr "O arquivo GTFS estava vazio."
@@ -33040,9 +33412,6 @@ msgstr "Entrar"
msgid "Public Transport: Join GTFS stops"
msgstr "Transporte Público: Junte-se a paradas GTFS"
-msgid "Id"
-msgstr "Id"
-
msgid "State"
msgstr "Estado"
diff --git a/i18n/po/rm.po b/i18n/po/rm.po
index c489501..81db343 100644
--- a/i18n/po/rm.po
+++ b/i18n/po/rm.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2009-06-21 19:14+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Raeto-Romance <rm at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n !=1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:07+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:04+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3305,6 +3305,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3313,6 +3316,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3977,6 +3985,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4033,6 +4044,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9011,46 +9025,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9165,7 +9182,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9279,9 +9302,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9292,8 +9312,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9455,16 +9478,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9594,12 +9607,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9759,6 +9782,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11175,15 +11228,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11232,6 +11276,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12407,6 +12454,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13549,6 +13599,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13747,9 +13800,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14453,6 +14503,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14464,6 +14522,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14476,6 +14546,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14831,6 +14925,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14933,6 +15035,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14984,10 +15089,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15020,6 +15125,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15072,6 +15252,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15218,6 +15404,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15257,6 +15449,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15281,6 +15481,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15325,34 +15528,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15493,6 +15705,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15521,7 +15741,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15670,6 +15890,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15745,6 +15973,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15850,33 +16081,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15886,12 +16160,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16210,8 +16497,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16352,9 +16639,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18259,24 +18543,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19449,6 +19740,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21264,10 +21558,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22668,6 +22958,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24209,6 +24514,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25705,15 +26025,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25955,6 +26266,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25990,6 +26338,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25999,6 +26350,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26008,15 +26362,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26049,7 +26421,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26066,9 +26444,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26761,6 +27136,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27599,6 +27977,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27619,46 +28003,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27691,6 +28083,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28066,9 +28464,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28553,9 +28948,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28674,42 +29066,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28722,15 +29105,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30823,9 +31197,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/ro.po b/i18n/po/ro.po
index 54840c5..9640a39 100644
--- a/i18n/po/ro.po
+++ b/i18n/po/ro.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: JOSM\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2015-02-24 11:34+0000\n"
"Last-Translator: Ciprian <c1pr1an_43v3r at yahoo.com>\n"
"Language-Team: Romanian <gnomero-list at lists.sourceforge.net>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
"== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:07+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:04+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"X-Poedit-Country: ROMANIA\n"
"Language: ro\n"
"X-Poedit-Language: Romanian\n"
@@ -3357,6 +3357,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3365,6 +3368,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4031,6 +4039,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4087,6 +4098,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9067,46 +9081,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9221,7 +9238,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr "Salvează fișier GPX"
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9337,9 +9360,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Salvează fișier OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9350,8 +9370,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9513,16 +9536,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr "Imagini geoetichetate"
@@ -9652,12 +9665,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9817,6 +9840,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11237,15 +11290,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11294,6 +11338,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12470,6 +12517,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13612,6 +13662,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13810,9 +13863,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14516,6 +14566,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14527,6 +14585,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14539,6 +14609,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14894,6 +14988,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14996,6 +15098,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15047,10 +15152,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15083,6 +15188,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15135,6 +15315,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15281,6 +15467,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15320,6 +15512,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15344,6 +15544,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15388,34 +15591,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15556,6 +15768,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15584,7 +15804,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15733,6 +15953,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15808,6 +16036,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15913,33 +16144,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15949,12 +16223,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16273,8 +16560,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16415,9 +16702,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18322,24 +18606,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19512,6 +19803,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21327,10 +21621,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22731,6 +23021,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24272,6 +24577,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25768,15 +26088,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -26018,6 +26329,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26053,6 +26401,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26062,6 +26413,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26071,15 +26425,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26112,7 +26484,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26129,9 +26507,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26824,6 +27199,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27662,6 +28040,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27682,46 +28066,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27754,6 +28146,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28129,9 +28527,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28616,9 +29011,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28737,42 +29129,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28785,15 +29168,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30886,9 +31260,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/ru.po b/i18n/po/ru.po
index d3ed666..a2e87b3 100644
--- a/i18n/po/ru.po
+++ b/i18n/po/ru.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
-"PO-Revision-Date: 2017-03-22 10:03+0000\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"PO-Revision-Date: 2017-05-02 10:38+0000\n"
"Last-Translator: Nkolay Parukhin <parukhin at gmail.com>\n"
"Language-Team: Koptev Oleg <koptev.oleg at gmail.com>\n"
"MIME-Version: 1.0\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:08+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:05+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: ru_RU\n"
msgid "Use OAuth"
@@ -1536,7 +1536,7 @@ msgid "Toggles the global setting ''{0}''."
msgstr "Переключает глобальную настройку: ''{0}''."
msgid "Discourage upload"
-msgstr ""
+msgstr "Препятствовать передаче на сервер"
msgid "UnGlue Ways"
msgstr "Разъединить точки на несколько"
@@ -3623,10 +3623,10 @@ msgid "This imagery is marked as best in this region in other editors."
msgstr "Этот снимок отмечен как лучший в данном регионе в других редакторах."
msgid "{0} mirror server {1}"
-msgstr ""
+msgstr "{0} сервер-зеркало {1}"
msgid "{0} mirror server"
-msgstr ""
+msgstr "{0} сервер-зеркало"
msgid "Update default entries"
msgstr "Обновить доступные по умолчанию подложки"
@@ -3669,6 +3669,9 @@ msgstr "Проекция"
msgid "Matrix set identifier"
msgstr "Идентификатор набора матриц"
+msgid "No default layer selected, choosing first layer."
+msgstr "Не выбран слой по умолчанию, выбирается первый слой."
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Слои не заданы документом getCapabilities: {0}"
@@ -3679,6 +3682,13 @@ msgstr ""
"конечного элемента {2}"
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+"Невозможно использовать слой {0}, так как не найдены поддерживаемые форматы. "
+"Слой доступен в форматах: {1}"
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4384,6 +4394,9 @@ msgstr "Этот тест проверяет правильность мульт
msgid "Area style way is not closed"
msgstr "Линия стиля \"полигон\" не замкнута"
+msgid "No outer way for boundary"
+msgstr "Нет внешней линии для мультиполигона boundary"
+
msgid "No outer way for multipolygon"
msgstr "У мультиполигона отсутствует внешняя линия"
@@ -4451,6 +4464,9 @@ msgstr "Внешняя линия мультиполигона имеет общ
msgid "No useful role for multipolygon member"
msgstr "Роль для участника мультиполигона задана неудачно"
+msgid "Non-Way in boundary"
+msgstr "Участник мультиполигона boundary не является линией"
+
msgid "Non-Way in multipolygon"
msgstr "Не-линия в мультиполигоне"
@@ -6032,6 +6048,8 @@ msgstr "Элемент"
msgid "Merged members not frozen yet. Cannot build resolution command"
msgstr ""
+"Объединённые участники ещё не «заморожены». Невозможно построить команду "
+"улаживания конфликта"
msgid "<undefined>"
msgstr "<не определено>"
@@ -8682,10 +8700,10 @@ msgstr ""
"инструментов.</html>"
msgid "Zoom to downloaded data"
-msgstr ""
+msgstr "Приблизиться к загруженным данным"
msgid "Select to zoom to entire newly downloaded data."
-msgstr ""
+msgstr "Выберите, чтобы приблизиться к последним загруженным данным"
msgid ""
"Use left click&drag to select area, arrows or right mouse button to scroll "
@@ -10001,47 +10019,50 @@ msgstr[0] "Удалить {0} объект:"
msgstr[1] "Удалить {0} объекта:"
msgstr[2] "Удалить {0} объектов:"
-msgid "Show tile info"
-msgstr "Показать информацию о квадрате"
+msgid "Native projections"
+msgstr ""
-msgid "Tile Info"
-msgstr "Информация о квадрате"
+msgid "Offset"
+msgstr "Смещение"
-msgid "Metadata "
-msgstr "Метаданные "
+msgid "Tile download projection"
+msgstr ""
-msgid "Load tile"
-msgstr "Скачать квадрат"
+msgid "Tile display projection"
+msgstr ""
-msgid "Auto zoom"
-msgstr "Автомасштабирование"
+msgid "Current zoom"
+msgstr "Текущий масштаб"
-msgid "Auto load tiles"
-msgstr "Автозагрузка квадратов"
+msgid "Show tile info"
+msgstr "Показать информацию о квадрате"
-msgid "Show errors"
-msgstr "Показывать ошибки"
+msgid "Tile Info"
+msgstr "Информация о квадрате"
-msgid "Load all tiles"
-msgstr "Скачать все квадраты"
+msgid "Tile name"
+msgstr "Имя квадрата"
-msgid "Load all error tiles"
-msgstr "Скачать все квадраты с ошибками"
+msgid "Tile URL"
+msgstr "URL квадрата"
-msgid "Zoom to native resolution"
-msgstr "Увеличить до исходного разрешения"
+msgid "Tile size"
+msgstr "Размер квадрата"
-msgid "Change resolution"
-msgstr "Изменить разрешение"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Увеличить масштаб"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Уменьшить масштаб"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
-msgstr "Сбросить кэш квадратов"
+msgid "Metadata "
+msgstr "Метаданные "
+
+msgid "Load tile"
+msgstr "Скачать квадрат"
msgid "Failed to create tile source"
msgstr "Не удалось создать источник тайлов"
@@ -10163,8 +10184,14 @@ msgstr[2] "{0} дорожек, "
msgid "Save GPX file"
msgstr "Сохранить файл GPX"
-msgid "Imagery fade"
-msgstr "Угасание подложки"
+msgid "Id"
+msgstr "Идентификатор"
+
+msgid "Min. zoom"
+msgstr "Мин. масштаб"
+
+msgid "Max. zoom"
+msgstr "Макс. масштаб"
msgid "Unsupported imagery type: {0}"
msgstr "Неподдерживаемый тип подложки: {0}"
@@ -10239,7 +10266,7 @@ msgid "Upload is discouraged"
msgstr "Передача не рекомендуется"
msgid "Upload is blocked"
-msgstr ""
+msgstr "Передача на сервер заблокирована"
msgid "Convert to GPX layer"
msgstr "Преобразовать в слой GPX"
@@ -10281,9 +10308,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Сохранить файл OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "Поддерживаются EPSG:4326 и проекция Меркатора"
-
msgid "Validation errors"
msgstr "Ошибки при проверке"
@@ -10294,11 +10318,16 @@ msgid "Set WMS Bookmark"
msgstr "Установить закладку WMS"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+"Изменение проекции слоя {0} с {1} на {2}. Для лучшего качества и "
+"производительности переключитесь на одну из поддерживаемых проекций: {3}"
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
-"JOSM будет использовать EPSG:4326 при запросе к серверу, но результаты могут "
-"отличаться в зависимости от WMS-сервера"
+"Не удалось найти поддерживаемую проекцию для слоя {0}. Будет использоваться "
+"{1}."
msgid "Correlate to GPX"
msgstr "Относятся к GPX"
@@ -10474,20 +10503,6 @@ msgstr "Необходимо выбрать трек GPX"
msgid "No selected GPX track"
msgstr "Трек GPX не выделен"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Ошибка при разборе часового пояса.\n"
-"Ожидаемый формат: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Ошибка при разборе смещения.\n"
-"Ожидаемый формат: {0}"
-
msgid "Geotagged Images"
msgstr "Изображения с данными о местоположении"
@@ -10632,12 +10647,26 @@ msgstr ""
"\n"
"Время GPS: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Ошибка при разборе смещения.\n"
+"Ожидаемый формат: {0}"
+
msgid "Show thumbnails"
msgstr "Показывать миниатюры"
msgid "Show image thumbnails instead of icons."
msgstr "Показывать миниатюры изображений вместо значков"
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Ошибка при разборе часового пояса.\n"
+"Ожидаемый формат: {0}"
+
msgid "Choose visible tracks"
msgstr "Фильтровать треки"
@@ -10814,6 +10843,36 @@ msgstr "Маркеры из именованных точек"
msgid "Named Trackpoints from {0}"
msgstr "Именованные точки трека из {0}"
+msgid "Auto load tiles"
+msgstr "Автозагрузка квадратов"
+
+msgid "Auto zoom"
+msgstr "Автомасштабирование"
+
+msgid "Decrease zoom"
+msgstr "Уменьшить масштаб"
+
+msgid "Flush tile cache"
+msgstr "Сбросить кэш квадратов"
+
+msgid "Increase zoom"
+msgstr "Увеличить масштаб"
+
+msgid "Load all tiles"
+msgstr "Скачать все квадраты"
+
+msgid "Load all error tiles"
+msgstr "Скачать все квадраты с ошибками"
+
+msgid "Show errors"
+msgstr "Показывать ошибки"
+
+msgid "Change resolution"
+msgstr "Изменить разрешение"
+
+msgid "Zoom to native resolution"
+msgstr "Увеличить до исходного разрешения"
+
msgid "gps marker"
msgstr "маркер GPS"
@@ -12201,13 +12260,13 @@ msgid "Track and Point Coloring"
msgstr "Раскрасить треки и точки"
msgid "Overlay gain adjustment"
-msgstr ""
+msgstr "Настройка наложения теплокарты"
msgid "Lower limit of visibility"
msgstr "Нижний предел видимости"
msgid "Adjust the gain of overlay blending."
-msgstr ""
+msgstr "Настроить интенсивность наложения теплокарты на лежащий ниже слой"
msgid "Draw all GPX traces that exceed this threshold."
msgstr "Рисовать все GPX-треки, превышающие этот порог."
@@ -12411,15 +12470,6 @@ msgstr "Название кэша"
msgid "Object Count"
msgstr "Количество объектов"
-msgid "imagery fade"
-msgstr "потускнение снимка"
-
-msgid "Fade Color: "
-msgstr "Цвет угасания: "
-
-msgid "Fade amount: "
-msgstr "Значение угасания: "
-
msgid "Soft"
msgstr "Сгладить"
@@ -12468,6 +12518,9 @@ msgstr "Слой: по умолчанию"
msgid "Available default entries:"
msgstr "Доступные по умолчанию:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "Выбранные:"
@@ -13748,6 +13801,9 @@ msgstr "Дополнительные атрибуты:"
msgid "Unknown requisite: {0}"
msgstr "Неизвестный запрос: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr "Неизвестное значение регулярного выражения: {0}"
+
msgid "Illegal member expression: {0}"
msgstr "Недопустимое выражение в {0}"
@@ -15024,6 +15080,9 @@ msgstr "заменено новым {0} модулем"
msgid "no longer required"
msgstr "больше не требуется"
+msgid "Plugin information"
+msgstr "Информация о модуле"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -15268,9 +15327,6 @@ msgstr ""
"Модуль удалён из настроек. Пожалуйста, перезагрузите JOSM, чтобы выгрузить "
"модуль."
-msgid "Plugin information"
-msgstr "Информация о модуле"
-
msgid "no description available"
msgstr "описание отсутствует"
@@ -16196,6 +16252,14 @@ msgid "farmland"
msgstr "поле"
msgctxt "landuse"
+msgid "farmyard"
+msgstr "двор фермы"
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr "кладбище"
+
+msgctxt "landuse"
msgid "residential"
msgstr "жилые кварталы"
@@ -16207,6 +16271,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr "карьер"
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr "огородные участки"
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr "виноградник"
+
msgctxt "natural"
msgid "scrub"
msgstr "кустарник"
@@ -16219,6 +16295,30 @@ msgctxt "natural"
msgid "grassland"
msgstr "луг"
+msgctxt "natural"
+msgid "wetland"
+msgstr "болото"
+
+msgctxt "natural"
+msgid "heath"
+msgstr "пустошь"
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr "пожарная часть"
+
+msgctxt "leisure"
+msgid "park"
+msgstr "парк"
+
+msgctxt "leisure"
+msgid "track"
+msgstr "трек"
+
+msgctxt "building"
+msgid "industrial"
+msgstr "промышленное"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "Улица"
@@ -16575,6 +16675,16 @@ msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
"Снимки с imagico.de: остров Мордвинова (Элефант)/остров Шишкова (Кларенс)"
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr "Снимки с imagico.de: Земля Эндерби и Берег Кемпа"
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+"Sentinel-2 каналы 234 (true color), снимки Sentinel-2 Земли Эндерби и Берега "
+"Кемпа, начало 2017"
+
msgid "IGN Argentina (TMS)"
msgstr "IGN Аргентина (TMS)"
@@ -16669,13 +16779,16 @@ msgid "OpenStreetMap (Belgian Style)"
msgstr "OpenStreetMap (бельгийский стиль)"
msgid "OpenStreetMap (Belgian Style - French)"
-msgstr ""
+msgstr "OpenStreetMap (бельгийский стиль - французский язык)"
msgid "OpenStreetMap (Belgian Style - Dutch)"
-msgstr ""
+msgstr "OpenStreetMap (бельгийский стиль - голландский язык)"
msgid "OpenStreetMap (Belgian Style - German)"
-msgstr ""
+msgstr "OpenStreetMap (бельгийский стиль - немецкий язык)"
+
+msgid "Orthophoto IGN-NGI"
+msgstr "Ортофото IGN-NGI"
msgid "AGIV Flanders most recent aerial imagery"
msgstr "AGIV Фландрия - самые новые аэрофотоснимки"
@@ -16728,11 +16841,11 @@ msgstr "SPW(allonie) 2012-2013 аэрофотосъёмка"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 аэрофотосъёмка"
-msgid "TEC bus lines (2014)"
-msgstr "TEC автобусные маршруты (2014)"
+msgid "TEC bus lines"
+msgstr "Автобусные маршруты TEC"
-msgid "TEC bus stops (2014)"
-msgstr "Автобусные остановки TEC (2014)"
+msgid "TEC bus stops"
+msgstr "Автобусные остановки TEC"
msgid "Benin: Cotonou Pleiade 2016"
msgstr "Бенин: Котону 2016 (Pleiade)"
@@ -16764,6 +16877,81 @@ msgstr "Лондрина - ортофото 2011"
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr "SIG Санта-Катарина - OrtoRGB 2012"
+msgid "Arapiraca AL"
+msgstr "Арапирака (штат Алагоас)"
+
+msgid "Branquinha AL"
+msgstr "Бранкинья (штат Алагоас)"
+
+msgid "Cajueiro AL"
+msgstr "Кажуэйру(штат Алагоас)"
+
+msgid "Campo Alegre AL"
+msgstr "Кампу-Алегри (штат Алагоас)"
+
+msgid "Capela AL"
+msgstr "Капела (штат Алагоас)"
+
+msgid "Delmiro Gouveia AL"
+msgstr "Делмиру-Говея (штат Алагоас)"
+
+msgid "Estrela de Alagoas"
+msgstr "Эстрела-ди-Алагоас"
+
+msgid "Girau do Ponciano"
+msgstr "Жирау-ду-Понсиану"
+
+msgid "Major Isidoro AL"
+msgstr "Мажор-Изидору (штат Алагоас)"
+
+msgid "Mar Vermelho AL"
+msgstr "Мар-Вермелью (штат Алагоас)"
+
+msgid "Minador do Negrão"
+msgstr "Минадор-ду-Негран"
+
+msgid "Olho d’Agua do Casado AL"
+msgstr "Олью-д’Агуа-ду-Казаду (штат Алагоас)"
+
+msgid "Palestina AL"
+msgstr "Палестина (штат Алагоас)"
+
+msgid "Palmeira dos Indios AL"
+msgstr "Палмейра-дуз-Индиус (штат Алагоас)"
+
+msgid "Pão de Açucar AL"
+msgstr "Пан-ди-Асукар (штат Алагоас)"
+
+msgid "Piranhas AL"
+msgstr "Пираньяс (штат Алагоас)"
+
+msgid "Poço das Trincheiras AL"
+msgstr "Посу-дас-Триншейрас (штат Алагоас)"
+
+msgid "Santana do Ipanema AL"
+msgstr "Сантана-ду-Ипанема (штат Алагоас)"
+
+msgid "São Miguel dos Campos AL"
+msgstr "Сан-Мигел-дус-Кампус (штат Алагоас)"
+
+msgid "Teotonio Vilela AL"
+msgstr "Теотониу-Вилела (штат Алагоас)"
+
+msgid "União dos Palmares AL"
+msgstr "Униан-дус-Палмарис (штат Алагоас)"
+
+msgid "Viçosa AL"
+msgstr "Висоза (штат Алагоас)"
+
+msgid "Alagoas Litoral 2006"
+msgstr "Литораль штата Алагоас, 2006"
+
+msgid "DER-ES"
+msgstr "DER-ES"
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Geobase (гидрография)"
@@ -16816,6 +17004,12 @@ msgstr "Чехия RUIAN (земельные участки)"
msgid "Czech pLPIS"
msgstr "Чехия pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr "Praha IPR: последние ортофото"
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Дания)"
@@ -16963,6 +17157,12 @@ msgstr "Берлин - аэрофотосъёмка 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Берлин - аэрофотосъёмка 2016"
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr "Deutsche Bahn - ж/д линии VzG, ноябрь 2013"
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr "Deutsche Bahn - ж/д линии VzG, ноябрь 2015"
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Эрланген - аэрофотосъёмка (2016 5.0 cm)"
@@ -17004,6 +17204,16 @@ msgstr ""
"Снимки с imagico.de: прибрежные отмели Северной Германии (инфракрасные "
"снимки)"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr "Снимки с imagico.de: побережье Северного моря, 2016"
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+"каналы 234 (true color), новые снимки берега при отливе для обновления карт "
+"осушек (ваттов) и подводных отмелей (баров)"
+
msgid "Saxony latest aerial imagery"
msgstr "Саксония: самые новые аэрофотоснимки"
@@ -17028,6 +17238,9 @@ msgstr "Майнц: все аэрофотоснимки"
msgid "Mainz latest aerial imagery"
msgstr "Майнц: самые новые аэрофотоснимки"
+msgid "Munich latest aerial imagery 60cm"
+msgstr "Мюнхен: новые аэрофотоснимки 60см"
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr "Снимки с imagico.de: Касигианнгуит"
@@ -17074,35 +17287,44 @@ msgstr "Canaan (Гаити) - съёмка с дрона, ноябрь 2015"
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr "Matthew (Гаити) - съёмка с дрона, октябрь 2016"
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr "FÖMI ортофото 2000"
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr "FÖMI ортофото 2005"
-msgid "Szeged ortophoto 2011"
-msgstr "Сегед - ортовото 2011"
+msgid "Szeged orthophoto 2011"
+msgstr "Сегед - ортофото 2011"
msgid "Inner part of Szeged"
msgstr "Внутренняя часть Сегеда"
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr "Тёрёкбалинт - ортофото 2013"
msgid "5 cm resolution bald image"
msgstr "Изображение без растительности с разрешением 5 см"
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr "Тёрёкбалинт - ортофото 2015"
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr "Разлив Дуная - ортофото 2013"
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Русло Дуная в Будапеште, Сентендре и Сигетмоносторе"
-msgid "Budapest district XI ortophoto 2015"
-msgstr "Будапешт, район XI - ортофото 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr "Будапешт, округ XI - ортофото 2015"
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr "Будапешт, округ XI - ортофото 2017"
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr "Шошкут, Пустазамор, Тарнок, Диошд - ортофото 2017"
+
+msgid "5 cm resolution bald image of 4 settlement"
+msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Венгрия (маршруты пешего туризма)"
@@ -17242,6 +17464,16 @@ msgstr "Аэрофотоснимки PDOK 25 см (WMTS)"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Шпицберген - ортофото 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr "Снимки с imagico.de: мозаика Шпицбергена"
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+"Sentinel-2 мозаика Шпицбергена, в основном Sentinel-2 2016 каналы 234 (true "
+"color)"
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr "Снимки с imagico.de: западная часть Каракорума"
@@ -17272,8 +17504,8 @@ msgstr ""
"Снимки с imagico.de: хребет Кордильера-де-Вильканота и ледниковая шапка "
"Келькайя"
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr "Пангасинан/Булакан (Филлипины HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr "Пангасинан/Булакан (Филиппины HiRes)"
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: ортофото"
@@ -17421,6 +17653,16 @@ msgstr "Снимки с imagico.de: Северный и Полярный Ура
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr "Снимки с imagico.de: космодром Восточный"
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr "Снимки с imagico.de: побережье Печорского моря"
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+"каналы 234 (true color), снимки Sentinel-2 побережья Печорского моря, осень "
+"2016"
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk (автомобильная)"
@@ -17496,6 +17738,9 @@ msgstr "Кантон Аргау 25см (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Кантон Аргау 25 см (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr "Кантон Аргау 25см (AGIS 2016)"
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr "Кантон Цюрих - ортофото 2014/2015 10см"
@@ -17601,33 +17846,89 @@ msgstr "TIGER 2012 - оверлей дорог"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr "Новые и невыровненные дороги TIGER (2015)"
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+"При масштабе 16+ public domain данные из Бюро переписи населения США. При "
+"более низких масштабах - только изменения с 2006, кроме уже включёных в "
+"OpenStreetMap"
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcels"
msgid "NC Latest Orthoimagery"
msgstr "Северная Каролина: последние ортоснимки"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+"Самые свежие снимки штата Северная Каролина в true color. Разрешение 6 "
+"дюймов/пиксель, включают в себя снимки, сделанные в 2010, 2012, 2013 и 2014"
+
msgid "U.S. Forest Service roads"
msgstr "U.S. Forest Service - дороги"
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr "Снимки с imagico.de: Аляскинский хребет"
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+"Каналы 234 (true color), последние летние снимки Аляскинского хребта для "
+"картирования природных особенностей"
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr "NJ 2015 аэрофотосъёмка (инфракрасная)"
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+"Цифровые ортоснимки Нью-Джерси, ближний инфракрасный диапазон, разрешение 1 "
+"фут (30,5 см)"
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr "NJ 2015 аэрофотосъёмка (естественные цвета)"
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+"Цифровые ортоснимки Нью-Джерси, естественные цвета, разрешение 1 фут (30,5 "
+"см)"
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr "Метрополитенский ареал Сан-Хуан: ортосъёмка 2013 USACE"
msgid "WA 2013 aerial imagery for San Juan County"
msgstr "Округ Сан-Хуан (Вашингтон) - аэрофотосъёмка 2013"
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr "WA округ Сан-Хуан, аэрофотосъёмка 2016"
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+"Аэрофотоснимки public domain, сделанные в мае-июле в округе Сан-Хуан, "
+"Вашингтон. Разрешение 6 дюймов."
+
msgid "WA Vector Streetmap for San Juan County"
msgstr "Векторная карта улиц округа Сан-Хуан (Вашингтон)"
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr "Ортофото Техаса"
@@ -17637,12 +17938,26 @@ msgstr "Филадельфия - снимки 2015"
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr "Мэриленд: самые новые аэрофотоснимки 6\""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr "Снимки штата Мэриленд, разрешение 6 дюймов (15 см)"
+
msgid "MD Three Inch Aerial Imagery"
msgstr "Мэриленд: снимки 3 дюйма"
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+"Снимки городов Роквилл, Гейтерсберг и Аннаполис, разрешение 3 дюйма (7,6 см)"
+
msgid "MD Transportation Basemap"
msgstr "Мэриленд: базовая карта транспорта"
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr "Делавэр - ортофото 2012"
@@ -17973,11 +18288,11 @@ msgstr ""
"basemap.at."
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
-"Автоматически назначает адреса выделенным объектам в Австрии. Данные: (c) "
-"Österreichisches Adressregister."
+"Автоматически присваивает адреса выделенным объектам в Австрии. Данные: © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgid ""
"Allows the user to correct angle of buildings to 90 degrees, and aligns all "
@@ -18023,7 +18338,7 @@ msgstr ""
"команды можно скачать по ссылке."
msgid "Tool for conflating data (matching and merging)."
-msgstr ""
+msgstr "Инструмент для объединения данных (поиска совпадений и слияния)."
msgid "Downloads new data when you pan/zoom"
msgstr "Подкачивает новые данные при панорамировании или изменении масштаба"
@@ -18150,9 +18465,6 @@ msgstr ""
"База данных смещений снимков: делитесь и получайте смещения с помощью одной "
"кнопки"
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "Старый режим выранивания подложки (как в бывшем WMSPlugin)"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18172,6 +18484,8 @@ msgid ""
"Extends ImproveWayAccuracy mode with helpers to place nodes at accurate "
"distances and angles."
msgstr ""
+"Дополняет режим улучшения точности линий средствами для размещения точек с "
+"соблюдением точных расстояний и углов."
msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
@@ -20181,26 +20495,33 @@ msgstr "Велосипедная полоса/дорожка"
msgid "Cycleway"
msgstr "Велодорожка"
+msgctxt "cycleway"
msgid "lane"
-msgstr "полоса"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "трек"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "встречная_полоса"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "встречная_дорожка"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
-msgstr "встречная"
+msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "совместно_с_автобусом"
+msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "совместная"
+msgstr ""
msgid "Cycleway left"
msgstr "Велодорожка слева"
@@ -21378,6 +21699,9 @@ msgstr "Членская карта"
msgid "Wash"
msgstr "Автомойка"
+msgid "Self Service"
+msgstr "Самообслуживание"
+
msgid "Car Dealer"
msgstr "Автосалон"
@@ -22295,7 +22619,7 @@ msgid "Ranger Station"
msgstr "Пост рейнджеров"
msgid "Fire Station"
-msgstr "Пожарное депо"
+msgstr "Пожарная часть"
msgid "Post Office"
msgstr "Почтовое отделение"
@@ -23195,10 +23519,6 @@ msgid "garages"
msgstr "гаражи"
msgctxt "building"
-msgid "industrial"
-msgstr "промышленное"
-
-msgctxt "building"
msgid "school"
msgstr "школа"
@@ -24601,6 +24921,21 @@ msgstr "дворец"
msgid "Archaeological Site"
msgstr "Археологические раскопки"
+msgid "tumulus"
+msgstr "курган"
+
+msgid "megalith"
+msgstr "мегалит"
+
+msgid "fortification"
+msgstr "фортификационное сооружение"
+
+msgid "settlement"
+msgstr "поселение"
+
+msgid "necropolis"
+msgstr "некрополь"
+
msgid "Battlefield"
msgstr "Поле битвы"
@@ -26162,6 +26497,21 @@ msgstr "Административный центр"
msgid "Label point"
msgstr "Точка подписи"
+msgid "Outline of building"
+msgstr "Контур здания"
+
+msgid "Inner segment"
+msgstr "Внутренний сегмент"
+
+msgid "Roof ridge"
+msgstr "Конёк крыши"
+
+msgid "Roof edge"
+msgstr "Край крыши"
+
+msgid "Building level"
+msgstr "Число этажей"
+
msgid "Site"
msgstr "Место"
@@ -26550,10 +26900,10 @@ msgid "View UAI sheet of school/college"
msgstr "Просмотреть информацию UAI о школе/колледже"
msgid "View %name% sheet of hospital/home"
-msgstr ""
+msgstr "Посмотреть информацию %name% о больнице/доме"
msgid "View explanation of %name% code"
-msgstr ""
+msgstr "Посмотреть расшифровку кода %name%"
msgid "Get identification card (pdf) for this establishment"
msgstr "Получить идентификационную карту (pdf) этого учреждения"
@@ -27017,30 +27367,35 @@ msgid ""
"wikipedia tag has no language given, use ''wikipedia''=''language:page "
"title''"
msgstr ""
+"у тега wikipedia не указан язык, используйте формат "
+"''wikipedia''=''language:page title''"
msgid "wikipedia tag has an unknown language prefix"
-msgstr ""
+msgstr "у тега wikipedia указан неизвестный префикс языка"
msgid "wikipedia tag format is deprecated"
-msgstr ""
+msgstr "формат тега wikipedia устарел"
msgid "''wikipedia''=''language:page title''"
msgstr "''wikipedia''=''язык:заголовок страницы''"
msgid "wikipedia ''{0}'' language is obsolete, use ''{1}'' instead"
-msgstr ""
+msgstr "язык wikipedia ''{0}'' устарел, используйте ''{1}'' вместо него"
msgid "wikipedia ''{0}'' language is invalid, use ''{1}'' instead"
msgstr ""
+"неверный язык тега wikipedia ''{0}'', используйте ''{1}'' вместо него"
msgid "{0} tag should not have URL-encoded values like ''%27''"
msgstr ""
+"в теге {0} не должно быть URL-кодированных значений, таких как ''%27''"
msgid "wikipedia title should not start with a space after language code"
msgstr ""
+"заголовок страницы wikipedia не должен содержать пробел после кода языка"
msgid "wikipedia title should not have ''{0}'' prefix"
-msgstr ""
+msgstr "заголовок страницы Википедии не должен иметь префикс ''{0}''"
msgid "wikipedia page title should have first letter capitalized"
msgstr "первый символ заголовка страницы wikipedia должен быть заглавным"
@@ -27048,9 +27403,12 @@ msgstr "первый символ заголовка страницы wikipedia
msgid ""
"wikipedia page title should have spaces instead of underscores (''_''→'' '')"
msgstr ""
+"заголовок страницы wikipedia должен содержать пробелы вместо символов "
+"подчёркивания (''_''→'' '')"
msgid "wikipedia language seems to be duplicated, e.g. en:en:Foo"
msgstr ""
+"похоже что префикс языка wikipedia продублирован, например, en:en:Foo"
msgid "wikidata tag must be in Qnnnn format, where n is a digit"
msgstr "Формат тега wikidata должен быть Qnnnn, где n - цифры"
@@ -27703,7 +28061,7 @@ msgid "Mapillary object layer"
msgstr "Слой объектов Mapillary"
msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
+msgstr "Отображает слой с объектами карты, обнаруженными Mapillary"
msgid "Mapillary"
msgstr "Mapillary"
@@ -27735,15 +28093,6 @@ msgstr "Импортировать локальные изображения"
msgid "Import pictures into Mapillary layer"
msgstr "Импортировать изображения на слой Mapillary"
-msgid "Select pictures"
-msgstr "Выберите изображения"
-
-msgid "Import pictures into sequence"
-msgstr "Импортировать изображения в последовательность"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Импортировать изображения в последовательность в слое Mapillary"
-
msgid "Join mode"
msgstr "Режим объединения"
@@ -27958,7 +28307,7 @@ msgid "Preview images when hovering its icon"
msgstr "Предпросмотр изображения при наведении на его значок"
msgid "Cut off sequences at download bounds"
-msgstr ""
+msgstr "Обрезать последовательности по границам скачанной области"
msgid "Download mode"
msgstr "Режим скачивания"
@@ -27993,6 +28342,43 @@ msgstr "Следовать за выделенным снимком"
msgid "Go forward"
msgstr "Вперёд"
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Импортировать"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr "Не удалось импортировать изображение ''{0}''!"
+
+msgid "Could not import the directory ''{0}''!"
+msgstr "Не удалось импортировать каталог ''{0}''!"
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr "Тег с ключом <i>{0}</i> уже есть у выделенного объекта OSM."
@@ -28036,15 +28422,21 @@ msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
"Показывает подробную информацию о текущем выделенном снимке Mapillary"
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr "Открыть в браузере"
msgid "Copy key"
-msgstr ""
+msgstr "Копировать ID"
msgid "Add Mapillary tag"
msgstr "Добавить тег Mapillary"
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr "Действия со снимком"
@@ -28054,20 +28446,38 @@ msgstr "Идентификатор снимка"
msgid "Sequence key"
msgstr "Идентификатор последовательности"
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr "у снимка нет идентификатора"
+msgid "unknown user"
+msgstr "неизвестный пользователь"
+
msgid "sequence has no key"
msgstr "у последовательности нет идентификатора"
msgid "Could not open the URL {0} in a browser"
msgstr "Не удалось открыть URL {0} в браузере"
+msgid "Downloading map objects…"
+msgstr "Скачивание объектов карты…"
+
+msgid "All map objects loaded."
+msgstr "Все объекты карты загружены."
+
+msgid "Too many map objects, zoom in to see all."
+msgstr "Слишком много объектов на карте. Приблизьте, чтобы увидеть все."
+
+msgid "Downloading map objects failed!"
+msgstr "Не удалось скачать объекты карты!"
+
msgid "Mapillary objects"
msgstr "Объекты Mapillary"
msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
+msgstr "Отображает объекты, обнаруженные Mapillary в своих снимках улиц"
msgid "Deleted {0} image"
msgid_plural "Deleted {0} images"
@@ -28099,8 +28509,17 @@ msgstr[2] "Повёрнуто {0} изображений"
msgid "2 images unjoined"
msgstr "2 снимка разъединены"
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr "Не удалось выполнить чтение из URL {0}!"
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
+"{0}\n"
+"Не удалось прочитать объекты карты из URL\n"
+"{1}!"
msgid "everything in the visible area"
msgstr "всё в видимой области"
@@ -28118,9 +28537,6 @@ msgstr ""
"Скачанная область OSM слишком велика. Режим загрузки изменён на область со "
"скачанными данными OSM до следующего перезапуска слоя."
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr "Загрузка"
@@ -28908,7 +29324,7 @@ msgid "Merge nodes with existing nodes"
msgstr "Объединять точки с существующими точками"
msgid "use austria address helper"
-msgstr ""
+msgstr "использовать Austria Address Helper"
msgid ""
"Automatically try to find the correct address via Austria Address Helper "
@@ -28937,11 +29353,14 @@ msgstr "Austria Address Helper"
msgid "Successfully added address to selected object:"
msgstr "Успешно добавлен адрес к выделенному объекту:"
+msgid "Distance between building center and address coordinates:"
+msgstr "Расстояние между центром здания и координатами адреса:"
+
msgid "No address was found for this object."
msgstr "Адрес для этого объекта не найден."
msgid "An unexpected exception occurred:"
-msgstr ""
+msgstr "Произошла непредвиденная ошибка:"
msgid "Building Generalization"
msgstr "Генерализация зданий"
@@ -29799,10 +30218,10 @@ msgid "Filter by window. Buffer: "
msgstr "Фильтрация по окну. Буфер: "
msgid "Union up to "
-msgstr ""
+msgstr "Объединять до "
msgid " adjacent Reference features"
-msgstr ""
+msgstr " смежных объектов справочного слоя"
msgid "Weight"
msgstr "Вес"
@@ -29829,30 +30248,41 @@ msgid "Symmetric Difference (Centroids Aligned)"
msgstr ""
msgid "Compactness"
-msgstr ""
+msgstr "Компактность"
msgid "Angle Histogram. Bins: "
-msgstr ""
+msgstr "Угловая гистограмма. Число интервалов: "
msgid "Tags (Exact Match): "
-msgstr ""
+msgstr "Теги (точное совпадение): "
msgid "Tags (Levenshtein Distance): "
-msgstr ""
+msgstr "Теги (расстояние Левенштейна): "
msgid "List of tags to match"
-msgstr ""
+msgstr "Список тегов для сравнения"
+
+msgid "Identical Elements Filter"
+msgstr "Фильтрация идентичных элементов"
+
+msgid "Avoid matching an element with itself"
+msgstr "Избегать сопоставления элемента с самим собой"
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
"used to weed out very small and very large features."
msgstr ""
+"Фильтрация ускорит процесс поиска совпадений. Фильтрация по окну отсеивает "
+"совпадения между объектами, контуры которых не перекрываются. Фильтрация по "
+"площади отсеивает очень маленькие и очень большие объекты."
msgid ""
"Better matches may be found by creating temporary unions of features sharing "
"a common edge."
msgstr ""
+"Более подходящие совпадения можно будет найти, создавая временные "
+"объединения объектов, имеющих общую грань."
msgid "Matching"
msgstr "Сопоставление"
@@ -29863,6 +30293,33 @@ msgstr "Фильтрация"
msgid "Unioning"
msgstr "Объединение"
+msgid "Programming"
+msgstr "Программирование"
+
+msgid "Replace Geometry"
+msgstr "Заменить геометрию"
+
+msgid "Merge Tags"
+msgstr "Объединить теги"
+
+msgid "List of tags to merge"
+msgstr "Список тегов для объединения"
+
+msgid "except"
+msgstr "кроме"
+
+msgid "List of tags to NOT merge (they will be ignored)"
+msgstr ""
+"Список тегов, которые НЕ следует объединять(они будут проигнорированы)"
+
+msgid "Overwrite tags without confirmation"
+msgstr "Перезаписывать теги без подтверждения"
+
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
+msgstr ""
+
msgid "Simple Example"
msgstr "Простой пример"
@@ -29878,33 +30335,15 @@ msgstr "Настроить параметры объединения"
msgid "Generate matches"
msgstr "Подобрать пары"
+msgid "Merging"
+msgstr "Слияние"
+
msgid "Reference:"
msgstr "Ссылка:"
msgid "Subject:"
msgstr ""
-msgid "Programming"
-msgstr "Программирование"
-
-msgid "Merging"
-msgstr ""
-
-msgid "Replace Geometry"
-msgstr "Заменить геометрию"
-
-msgid "Merge Tags"
-msgstr ""
-
-msgid "List of tags to merge"
-msgstr ""
-
-msgid "Overwrite tags without confirmation"
-msgstr "Перезаписывать теги без подтверждения"
-
-msgid "List of tags to overwrite without confirmation"
-msgstr "Список тегов для перезаписи без подтверждения"
-
msgid "Selections must be made for both reference and subject."
msgstr "Выделение должно быть сделано и на справочном и на целевом слое"
@@ -29935,11 +30374,17 @@ msgstr "Ничего не выделено"
msgid "Freeze reference selection"
msgstr "Заблокировать выделение в справочном слое"
-msgid "Disambiguating"
+msgid "Reference and subject sets should better be different."
msgstr ""
+msgid "Relations are not supported yet, please do not select them."
+msgstr "Отношения пока не поддерживаются. Пожалуйста, не выбирайте их."
+
+msgid "Disambiguating"
+msgstr "С устранением неоднозначностей"
+
msgid "One to One"
-msgstr ""
+msgstr "Один в один"
msgid "Distance"
msgstr "Расстояние"
@@ -29951,7 +30396,7 @@ msgid "Centroid"
msgstr "Центроид"
msgid "Hausdorff"
-msgstr ""
+msgstr "Хаусдорфово"
msgid "List of tags to match (default: none)"
msgstr "Список тегов для сравнения (по умолчанию: нет)"
@@ -30338,9 +30783,6 @@ msgstr "Импорт с Globalsat"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Импортировать данные с Globalsat Datalogger DG100 на слой GPX."
-msgid "Import"
-msgstr "Импортировать"
-
msgid "GPS Blams"
msgstr "Данные GPS Blam"
@@ -30858,9 +31300,6 @@ msgstr "Загружаю смещения..."
msgid "Error processing XML response: {0}"
msgstr "Ошибка обработки XML-ответа: {0}"
-msgid "Offset"
-msgstr "Смещение"
-
msgid "Imagery Offset Database"
msgstr "База смещений снимков"
@@ -30996,24 +31435,6 @@ msgstr "Сохраняю новое смещение..."
msgid "This string should be 3 to 200 letters long."
msgstr "Эта строка должна быть длиной от 3 до 200 знаков."
-msgid "Adjust imagery"
-msgstr "Выравнивание подложки"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Настроить смещение выбранного слоя снимков"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Пожалуйста, выберите слой со снимками для выравнивания"
-
-msgid "Start adjusting"
-msgstr "Начать выравнивание"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "Нет доступных слоёв со снимками для выравнивания"
-
-msgid "No layers to adjust"
-msgstr "Нет слоёв для выравнивания"
-
msgid "Normal"
msgstr "Нормальный"
@@ -31026,12 +31447,21 @@ msgstr "Повернуть на 180°"
msgid "Rotate 270"
msgstr "Повернуть на 270°"
-msgid "Previous image"
-msgstr "Предыдущее изображение"
+msgid "WayPoint Image"
+msgstr "Картинка путевой точки"
+
+msgid "Display non-geotagged photos"
+msgstr "Показать фотографии без геотегов"
+
+msgid "Imported Images"
+msgstr "Импортированные изображения"
msgid "Next image"
msgstr "Следующее изображение"
+msgid "Previous image"
+msgstr "Предыдущее изображение"
+
msgid "Rotate left"
msgstr "Повернуть влево"
@@ -31044,15 +31474,6 @@ msgstr "Повернуть вправо"
msgid "Rotate image right"
msgstr "Вращать изображение вправо"
-msgid "WayPoint Image"
-msgstr "Картинка путевой точки"
-
-msgid "Display non-geotagged photos"
-msgstr "Показать фотографии без геотегов"
-
-msgid "Imported Images"
-msgstr "Импортированные изображения"
-
msgid "Import vector graphics"
msgstr "Импорт векторной графики"
@@ -31060,28 +31481,28 @@ msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr "SVG файлы [модуль ImportVec] (*.svg)"
msgid "Improve Way"
-msgstr ""
+msgstr "Улучшение линий"
msgid "Improve Way mode"
-msgstr ""
+msgstr "Режим улучшения линий"
msgid "Mode: Enable way accuracy helpers"
-msgstr ""
+msgstr "Режим: включить помощники улучшения точности линий"
msgid "improve way accuracy helper turn angle text"
-msgstr ""
+msgstr "помощник улучшения точности линий: значение угла поворота"
msgid "improve way accuracy helper distance text"
-msgstr ""
+msgstr "помощник улучшения точности линий: значение расстояния"
msgid "improve way accuracy helper arc fill"
-msgstr ""
+msgstr "помощник улучшения точности линий: заливка дуги"
msgid "improve way accuracy helper arc stroke"
-msgstr ""
+msgstr "помощник улучшения точности линий: контур дуги"
msgid "improve way accuracy helper perpendicular line"
-msgstr ""
+msgstr "помощник улучшения точности линий: перпендикулярная линия"
msgid "improve way accuracy helper equal angle circle"
msgstr ""
@@ -33281,9 +33702,6 @@ msgstr "Соединить"
msgid "Public Transport: Join GTFS stops"
msgstr "Общественный транспорт: Соединение GTFS остановок"
-msgid "Id"
-msgstr "Идентификатор"
-
msgid "State"
msgstr "Штат"
@@ -33705,10 +34123,10 @@ msgstr ""
"пакета правок в позиции ({1},{2}). Пропущено."
msgid "Create Roundabout"
-msgstr ""
+msgstr "Создать кольцевую развязку"
msgid "Roundabout Expander"
-msgstr ""
+msgstr "Создание кольцевой развязки"
msgid "Road Sign Plugin"
msgstr "RoadSigns Plugin"
diff --git a/i18n/po/sk.po b/i18n/po/sk.po
index dedfa00..3838b1e 100644
--- a/i18n/po/sk.po
+++ b/i18n/po/sk.po
@@ -9,16 +9,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
-"PO-Revision-Date: 2017-03-18 20:27+0000\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"PO-Revision-Date: 2017-04-27 18:57+0000\n"
"Last-Translator: aceman444 <Unknown>\n"
"Language-Team: Slovak <>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:10+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:07+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: sk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3626,6 +3626,9 @@ msgstr "Projekcia"
msgid "Matrix set identifier"
msgstr "Identifikátor mriežky"
+msgid "No default layer selected, choosing first layer."
+msgstr "Nebola vybraná predvolená vrstva, použije sa prvá vrstva."
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Dokument getCapabilities nedefinuje žiadne vrstvy: {0}"
@@ -3636,6 +3639,13 @@ msgstr ""
"element {2}"
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+"Vrstva {0} sa nedá použiť, pretože sa nenašli podporované formáty. Vrstva je "
+"dostupná vo formátoch: {1}"
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4345,6 +4355,9 @@ msgstr "Tento test skontroluje, či je multipolygón platný."
msgid "Area style way is not closed"
msgstr "Cesta reprezentujúca oblasť nie je uzavretá"
+msgid "No outer way for boundary"
+msgstr "Chýba vonkajšia cesta v hranici"
+
msgid "No outer way for multipolygon"
msgstr "Chýba vonkajšia cesta multipolygónu (s rolou \"outer\")"
@@ -4412,6 +4425,9 @@ msgstr "Vonkajšia cesta multipolygónu zdieľa úseky s vonkajšou oblasťou"
msgid "No useful role for multipolygon member"
msgstr "Žiadna platná rola pre člena multipolygónu"
+msgid "Non-Way in boundary"
+msgstr "Objekt, ktorý nie je cestou, v hranici"
+
msgid "Non-Way in multipolygon"
msgstr "V multipolygóne je člen, ktorý nie je cestou"
@@ -9913,47 +9929,50 @@ msgstr[0] "{0} zmazaných objektov:"
msgstr[1] "{0} zmazaný objekt:"
msgstr[2] "{0} zmazané objekty:"
-msgid "Show tile info"
-msgstr "Zobraziť informácie o dlaždici"
+msgid "Native projections"
+msgstr "Zabudované projekcie"
-msgid "Tile Info"
-msgstr "Informácie o dlaždiciach"
+msgid "Offset"
+msgstr "Posun"
-msgid "Metadata "
-msgstr "Metaúdaje "
+msgid "Tile download projection"
+msgstr "Projekcia sťahovania dlaždíc"
-msgid "Load tile"
-msgstr "Načítať dlaždicu"
+msgid "Tile display projection"
+msgstr "Projekcia zobrazenia dlaždíc"
-msgid "Auto zoom"
-msgstr "Automatické priblíženie"
+msgid "Current zoom"
+msgstr "Aktuálne priblíženie"
-msgid "Auto load tiles"
-msgstr "Automaticky načítať dlaždice"
+msgid "Show tile info"
+msgstr "Zobraziť informácie o dlaždici"
-msgid "Show errors"
-msgstr "Zobrazovať chyby"
+msgid "Tile Info"
+msgstr "Informácie o dlaždiciach"
-msgid "Load all tiles"
-msgstr "Načítať všetky dlaždice"
+msgid "Tile name"
+msgstr "Názov dlaždice"
-msgid "Load all error tiles"
-msgstr "Načítať všetky chybné dlaždice"
+msgid "Tile URL"
+msgstr "URL dlaždice"
-msgid "Zoom to native resolution"
-msgstr "Vrátiť na pôvodnú úroveň priblíženia"
+msgid "Tile size"
+msgstr "Veľkosť dlaždice"
-msgid "Change resolution"
-msgstr "Zmena rozlíšenia"
+msgid "Tile display size"
+msgstr "Veľkosť dlaždice"
-msgid "Increase zoom"
-msgstr "Priblížiť"
+msgid "Reprojection"
+msgstr "Reprojekcia"
-msgid "Decrease zoom"
-msgstr "Oddialiť"
+msgid "Reprojected tile size"
+msgstr "Veľkosť dlaždice reprojekcie"
-msgid "Flush tile cache"
-msgstr "Vymazať pamäť dlaždíc"
+msgid "Metadata "
+msgstr "Metaúdaje "
+
+msgid "Load tile"
+msgstr "Načítať dlaždicu"
msgid "Failed to create tile source"
msgstr "Nepodarilo sa vytvoriť zdroj dlaždíc"
@@ -10073,8 +10092,14 @@ msgstr[2] "{0} stopy(track), "
msgid "Save GPX file"
msgstr "Uložiť GPX súbor"
-msgid "Imagery fade"
-msgstr "Zoslabenie mapového podkladu"
+msgid "Id"
+msgstr "Id"
+
+msgid "Min. zoom"
+msgstr "Min. priblíženie"
+
+msgid "Max. zoom"
+msgstr "Max. priblíženie"
msgid "Unsupported imagery type: {0}"
msgstr "Nepodporovaný typ podkladových snímok: {0}"
@@ -10191,9 +10216,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Uložiť OSM súbor"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "Projekcie EPSG:4326 a Mercatorova sú podporované"
-
msgid "Validation errors"
msgstr "Overovanie chýb"
@@ -10204,11 +10226,15 @@ msgid "Set WMS Bookmark"
msgstr "Nastaviť WMS Záložku"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
msgstr ""
-"JOSM použije EPSG:4326 pre požiadavky na server, ale výsledky sa môžu líšiť "
-"v závislosti od WMS servera"
+"Premietam vrstvu {0} z {1} do {2}. Pre najlepšiu kvalitu obrazu a rýchlosť "
+"prepnite na jednu z podporovaných projekcií: {3}"
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
+msgstr ""
+"Nepodarilo sa nájsť podporovanú projekciu pre vrstvu {0}. Použije sa {1}."
msgid "Correlate to GPX"
msgstr "Zladiť GPX"
@@ -10384,20 +10410,6 @@ msgstr "Môžete vybrať GPX stopu"
msgid "No selected GPX track"
msgstr "Nevybratá GPX stopa"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Chyba pri rozkladaní časového pásma.\n"
-"Čakám na formát: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Chyba pri rozkladaní rozdielu.\n"
-"Čakám na formát: {0}"
-
msgid "Geotagged Images"
msgstr "Obrázky s GPS súradnicami"
@@ -10542,12 +10554,26 @@ msgstr ""
"\n"
"GPS čas: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Chyba pri rozkladaní rozdielu.\n"
+"Čakám na formát: {0}"
+
msgid "Show thumbnails"
msgstr "Zobraziť náhľady"
msgid "Show image thumbnails instead of icons."
msgstr "Zobrazovať náhľady namiesto ikon."
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Chyba pri rozkladaní časového pásma.\n"
+"Čakám na formát: {0}"
+
msgid "Choose visible tracks"
msgstr "Vyberte viditeľné stopy"
@@ -10721,6 +10747,36 @@ msgstr "Značky z pomenovaných bodov"
msgid "Named Trackpoints from {0}"
msgstr "Pomenovanie trackpoints od {0}"
+msgid "Auto load tiles"
+msgstr "Automaticky načítať dlaždice"
+
+msgid "Auto zoom"
+msgstr "Automatické priblíženie"
+
+msgid "Decrease zoom"
+msgstr "Oddialiť"
+
+msgid "Flush tile cache"
+msgstr "Vymazať pamäť dlaždíc"
+
+msgid "Increase zoom"
+msgstr "Priblížiť"
+
+msgid "Load all tiles"
+msgstr "Načítať všetky dlaždice"
+
+msgid "Load all error tiles"
+msgstr "Načítať všetky chybné dlaždice"
+
+msgid "Show errors"
+msgstr "Zobrazovať chyby"
+
+msgid "Change resolution"
+msgstr "Zmena rozlíšenia"
+
+msgid "Zoom to native resolution"
+msgstr "Vrátiť na pôvodnú úroveň priblíženia"
+
msgid "gps marker"
msgstr "gps značka"
@@ -11931,7 +11987,7 @@ msgid "Dilution of Position (red = high, green = low, if available)"
msgstr "Hustota pozícií (červená = vysoká, zelená = nízka, ak je dostupná)"
msgid "Track date"
-msgstr "dátum stopy"
+msgstr "Dátum stopy"
msgid "Heat Map (dark = few, bright = many)"
msgstr "Teplotná mapa (tmavé = málo, svetlé = veľa)"
@@ -12316,15 +12372,6 @@ msgstr "Názov vyrovnávacej pamäte"
msgid "Object Count"
msgstr "Počet objektov"
-msgid "imagery fade"
-msgstr "zoslabenie mapového podkladu"
-
-msgid "Fade Color: "
-msgstr "Farba zoslabenia: "
-
-msgid "Fade amount: "
-msgstr "Úroveň zoslabenia: "
-
msgid "Soft"
msgstr "Jemné"
@@ -12375,6 +12422,9 @@ msgstr "Pozadie snímok: Predvolené"
msgid "Available default entries:"
msgstr "Dostupné predvolené podklady:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr "Nové záznamy je možné pridať na <a href=\"{0}\">Wiki</a>."
+
msgid "Selected entries:"
msgstr "Vybrané položky:"
@@ -13664,6 +13714,9 @@ msgstr "Voliteľné atribúty:"
msgid "Unknown requisite: {0}"
msgstr "Neznámy žiadaný: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr "Neznáma hodnota regulárneho výrazu: {0}"
+
msgid "Illegal member expression: {0}"
msgstr "Nepovolený členský výraz: {0}"
@@ -14947,6 +15000,9 @@ msgstr "nahradený novým pluginom {0}"
msgid "no longer required"
msgstr "už nie je potrebný"
+msgid "Plugin information"
+msgstr "Informácia o pluginoch"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -15191,9 +15247,6 @@ msgstr ""
"Plugin bol odstránený z nastavení. Prosím reštartujte JOSM aby sa prestal "
"používať."
-msgid "Plugin information"
-msgstr "Informácia o pluginoch"
-
msgid "no description available"
msgstr "Popis nedostupný"
@@ -16118,16 +16171,36 @@ msgid "farmland"
msgstr "poľnohospodárska pôda"
msgctxt "landuse"
+msgid "farmyard"
+msgstr "farma/poľnohospodárske družstvo"
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr "cintorín"
+
+msgctxt "landuse"
msgid "residential"
msgstr "obytná (osídlená) zóna"
msgctxt "landuse"
msgid "greenfield"
-msgstr ""
+msgstr "Oblasť plánovanej výstavby (\"na zelenej lúke\")"
msgctxt "landuse"
msgid "village_green"
-msgstr ""
+msgstr "Obecná zeleň (centrálny park obce)"
+
+msgctxt "landuse"
+msgid "quarry"
+msgstr "Lom/Povrchová baňa"
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr "záhradkárska oblasť"
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr "vinica"
msgctxt "natural"
msgid "scrub"
@@ -16139,7 +16212,31 @@ msgstr "les"
msgctxt "natural"
msgid "grassland"
-msgstr ""
+msgstr "Divoká tráva/Step"
+
+msgctxt "natural"
+msgid "wetland"
+msgstr "mokraď"
+
+msgctxt "natural"
+msgid "heath"
+msgstr "vresovisko"
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr "hasičská stanica"
+
+msgctxt "leisure"
+msgid "park"
+msgstr "park"
+
+msgctxt "leisure"
+msgid "track"
+msgstr "pretekárska dráha"
+
+msgctxt "building"
+msgid "industrial"
+msgstr "priemyselná"
msgctxt "Relation type"
msgid "associatedStreet"
@@ -16497,6 +16594,16 @@ msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
"imagico.de OSM obrázky pre mapovanie: Elephant Island/Clarence Island"
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+"Snímky zo Sentinel-2 kanály 234 (skutočné farby), Snímky zo Sentinel-2 z "
+"Enderby Land a Kemp Coast, začiatok 2017"
+
msgid "IGN Argentina (TMS)"
msgstr "IGN Argentína (TMS)"
@@ -16599,6 +16706,9 @@ msgstr "OpenStreetMap (Belgický štýl - Holandsky)"
msgid "OpenStreetMap (Belgian Style - German)"
msgstr "OpenStreetMap (Belgický štýl - Nemecky)"
+msgid "Orthophoto IGN-NGI"
+msgstr "Ortofoto IGN-NGI"
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr "AGIV Flanders najnovšie letecké snímky"
@@ -16650,11 +16760,11 @@ msgstr "SPW(allonie) 2012-2013 letecké snímky"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 letecké snímky"
-msgid "TEC bus lines (2014)"
-msgstr "LInky autobusov TEC (2014)"
+msgid "TEC bus lines"
+msgstr "Linky autobusov TEC"
-msgid "TEC bus stops (2014)"
-msgstr "TEC autobusové zastávky (2014)"
+msgid "TEC bus stops"
+msgstr "Zastávky autobusov TEC"
msgid "Benin: Cotonou Pleiade 2016"
msgstr "Benin: Cotonou Pleiade 2016"
@@ -16686,6 +16796,81 @@ msgstr "Londrina Ortofoto 2011"
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr "SIG Santa Catarina OrtoRGB 2012"
+msgid "Arapiraca AL"
+msgstr "Arapiraca AL"
+
+msgid "Branquinha AL"
+msgstr "Branquinha AL"
+
+msgid "Cajueiro AL"
+msgstr "Cajueiro AL"
+
+msgid "Campo Alegre AL"
+msgstr "Campo Alegre AL"
+
+msgid "Capela AL"
+msgstr "Capela AL"
+
+msgid "Delmiro Gouveia AL"
+msgstr "Delmiro Gouveia AL"
+
+msgid "Estrela de Alagoas"
+msgstr "Estrela de Alagoas"
+
+msgid "Girau do Ponciano"
+msgstr "Girau do Ponciano"
+
+msgid "Major Isidoro AL"
+msgstr "Major Isidoro AL"
+
+msgid "Mar Vermelho AL"
+msgstr "Mar Vermelho AL"
+
+msgid "Minador do Negrão"
+msgstr "Minador do Negrão"
+
+msgid "Olho d’Agua do Casado AL"
+msgstr "Olho d’Agua do Casado AL"
+
+msgid "Palestina AL"
+msgstr "Palestina AL"
+
+msgid "Palmeira dos Indios AL"
+msgstr "Palmeira dos Indios AL"
+
+msgid "Pão de Açucar AL"
+msgstr "Pão de Açucar AL"
+
+msgid "Piranhas AL"
+msgstr "Piranhas AL"
+
+msgid "Poço das Trincheiras AL"
+msgstr "Poço das Trincheiras AL"
+
+msgid "Santana do Ipanema AL"
+msgstr "Santana do Ipanema AL"
+
+msgid "São Miguel dos Campos AL"
+msgstr "São Miguel dos Campos AL"
+
+msgid "Teotonio Vilela AL"
+msgstr "Teotonio Vilela AL"
+
+msgid "União dos Palmares AL"
+msgstr "União dos Palmares AL"
+
+msgid "Viçosa AL"
+msgstr "Viçosa AL"
+
+msgid "Alagoas Litoral 2006"
+msgstr "Alagoas Litoral 2006"
+
+msgid "DER-ES"
+msgstr "DER-ES"
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr "IBGE-BC250-Trecho Rodoviario"
+
msgid "Geobase Hydrography"
msgstr "Geobase Hydrografia"
@@ -16738,6 +16923,12 @@ msgstr "Český RUIAN parcely"
msgid "Czech pLPIS"
msgstr "Český pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr "Praha IPR najnovšie ortofoto"
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr "Praha IPR ortofoto s riedkou vegetáciou"
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Dánsko)"
@@ -16886,6 +17077,12 @@ msgstr "Berlín letecké fotografie 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Berlín letecké fotografie 2016"
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr "Deutsche Bahn VzG linky Nov 2013"
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr "Deutsche Bahn VzG linky Nov 2015"
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Erlangen letecké snímky (2016 5.0 cm)"
@@ -16929,6 +17126,16 @@ 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: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+"234 kanálov (skutočné farby), aktuálne snímky z odlivu na pobreží pre "
+"spresnenie zaplavovaných oblastí"
+
msgid "Saxony latest aerial imagery"
msgstr "Dolné Sasko najnovšie letecké snímky"
@@ -16953,6 +17160,9 @@ msgstr "Mainz všetky letecké snímky"
msgid "Mainz latest aerial imagery"
msgstr "Mainz najnovšie letecké snímky"
+msgid "Munich latest aerial imagery 60cm"
+msgstr "Mníchov najnovšie letecké snímky 60cm"
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr "imagico.de OSM obrázky pre mapovanie: Qasigiannguit"
@@ -16997,35 +17207,44 @@ msgstr "Snímky z dronov Canaan(Haiti) November 2015"
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr "Snímky z dronu Matthew (Haiti) Október 2016"
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr "FÖMI ortofoto 2000"
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr "FÖMI ortofoto 2005"
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr "Szeged ortofoto 2011"
msgid "Inner part of Szeged"
msgstr "Vnútorné časti mesta Szeged"
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr "Törökbálint ortofoto 2013"
msgid "5 cm resolution bald image"
msgstr "obrázky s rozlíšením 5 cm"
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr "Törökbálint ortofoto 2015"
-msgid "Danube flood ortophoto 2013"
-msgstr "Dunajská záplava ortofoto 2013"
+msgid "Danube flood orthophoto 2013"
+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 XI ortophoto 2015"
-msgstr "Budapešť XI.okrsok ortofoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr "Budapest okrsok XI ortofoto 2015"
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr "Budapesť okrsok XI ortofoto 2017"
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr "Sóskút, Pusztazámor, Tárnok, Diósd ortofoto 2017"
+
+msgid "5 cm resolution bald image of 4 settlement"
+msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Maďarsko (turistické chodníky)"
@@ -17165,6 +17384,14 @@ msgstr "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Svalbard - Ortofoto 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr "imagico.de OSM obrázky pre mapovanie: Western Karakoram"
@@ -17195,8 +17422,8 @@ 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)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: Ortofotomapa (letecké snímky)"
@@ -17344,6 +17571,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Auto"
@@ -17419,6 +17654,9 @@ msgstr "Kanton Aargau 25cm (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Kanton Aargau 25cm (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr "Kanton Zürich Ortofoto 2014/2015 10cm"
@@ -17524,33 +17762,78 @@ msgstr "TIGER 2012 Cesty"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr "Nové & Nezarovnané TIGER cesty (2015)"
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Parcely"
msgid "NC Latest Orthoimagery"
msgstr "NC Latest Orthoimagery"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
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 ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr "NJ 2015 Letecké snímky (Infračervené)"
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr "NJ 2015 Letecké snímky (Prirodzené farby)"
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
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 ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr "WA 2016 letecké snímky pre San Juan County"
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+"Verejné (Public domain) letecké snímky získané v máji až júli od San Juan "
+"County, WA. Rozlíšenie je 6 palcov v celej oblasti."
+
msgid "WA Vector Streetmap for San Juan County"
msgstr "WA Vektorový Streetmap pre San Juan"
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr "Texas Ortofoto"
@@ -17560,12 +17843,25 @@ msgstr "Philadelphia 2015 letecké snímky"
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr "MD Najnovšie 6-palcové letecké snímky"
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr "MD 3-palcové letecké snímky"
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr "MD Základná mapa dopravy"
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr "Delaware 2012 Ortofoto"
@@ -17895,11 +18191,11 @@ msgstr ""
"basemap.at."
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
-"Automaticky pridelí adresy na vybrané objekty v Rakúsku. Data (c) "
-"Österreichisches Adressregister."
+"Automaticky priradí adresy vybraným objektom v Rakúsku. Dáta © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgid ""
"Allows the user to correct angle of buildings to 90 degrees, and aligns all "
@@ -17947,7 +18243,7 @@ msgstr ""
"štandardné príkazy (oblúku, kružnica atď.)"
msgid "Tool for conflating data (matching and merging)."
-msgstr ""
+msgstr "Nástroj na zjednotenie dát (porovnanie a zlúčenie)."
msgid "Downloads new data when you pan/zoom"
msgstr "Sťahuje nové údaje pri posúvaní/približovaní"
@@ -18067,9 +18363,6 @@ msgstr ""
"Databáza posunov mapových podkladov: zdieľajte a získajte ponusy mapových "
"podkladov jediným tlačidlom."
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "Prispôsobenie mapových podkladov typu WMSPlugin"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18089,6 +18382,8 @@ msgid ""
"Extends ImproveWayAccuracy mode with helpers to place nodes at accurate "
"distances and angles."
msgstr ""
+"Rozširuje režim zlepšenia presnosti ciest o možnosti umiestnenia bodov do "
+"presných rozostupov a uhlov."
msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr "Tento plugin zjednodušuje mapovanie a úpravy chodieb v budovách."
@@ -18303,6 +18598,8 @@ msgid ""
"Expand a simple intersection to a roundabout in gradual steps. Select an "
"intersection node or a roundabout and press Crtl-Shift-R"
msgstr ""
+"Rozšíri jednoduchú križovatku na kruhový objazd v postupných krokoch. Zvoľte "
+"bod križovania alebo kruhový objazd a stlačte Crtl-Shift-R"
msgid ""
"Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -20079,24 +20376,31 @@ msgstr "Pruh pre cyklistov"
msgid "Cycleway"
msgstr "Cesta pre cyklistov"
+msgctxt "cycleway"
msgid "lane"
msgstr "jazdný pruh"
+msgctxt "cycleway"
msgid "track"
-msgstr "stopa (dráha)"
+msgstr "samostatná dráha"
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr "protismerný pruh"
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "protismerná cesta"
+msgstr "protismerná dráha"
+msgctxt "cycleway"
msgid "opposite"
-msgstr "protismerná"
+msgstr "protismerná jazda"
+msgctxt "cycleway"
msgid "share_busway"
msgstr "cesta zdieľaná s autobusom"
+msgctxt "cycleway"
msgid "shared_lane"
msgstr "zdieľaný pruh"
@@ -20707,7 +21011,7 @@ msgid "marsh"
msgstr "mokraď"
msgid "reedbed"
-msgstr "mokraď´s rákosím"
+msgstr "mokraď s rákosím"
msgid "saltmarsh"
msgstr "soľná bažina"
@@ -21277,6 +21581,9 @@ msgstr "Členská karta"
msgid "Wash"
msgstr "Umývačka"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Predajca automobilov"
@@ -23092,10 +23399,6 @@ msgid "garages"
msgstr "garáže"
msgctxt "building"
-msgid "industrial"
-msgstr "priemyselná"
-
-msgctxt "building"
msgid "school"
msgstr "škola"
@@ -24498,6 +24801,21 @@ msgstr "Palác"
msgid "Archaeological Site"
msgstr "Archeologické nálezisko"
+msgid "tumulus"
+msgstr "mohyla"
+
+msgid "megalith"
+msgstr "megalit"
+
+msgid "fortification"
+msgstr "opevnenie"
+
+msgid "settlement"
+msgstr "osada"
+
+msgid "necropolis"
+msgstr "pohrebisko"
+
msgid "Battlefield"
msgstr "Bojisko"
@@ -26057,6 +26375,21 @@ msgstr "Administratívne centrum"
msgid "Label point"
msgstr "Miesto pre menovku"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "Areál (site)"
@@ -26760,7 +27093,7 @@ msgstr ""
"použite namiesto toho {1} + {2}."
msgid "node connects highway and building"
-msgstr ""
+msgstr "bod spája komunikáciu a budovu"
msgid "abbreviated street name"
msgstr "skrátený názov ulice"
@@ -26908,53 +27241,64 @@ msgid ""
"wikipedia tag has no language given, use ''wikipedia''=''language:page "
"title''"
msgstr ""
+"značka wikipedia nemá zadaný jazyk, použite \"wikipedia\"=\"jazyk:názov "
+"stránky\""
msgid "wikipedia tag has an unknown language prefix"
-msgstr ""
+msgstr "značka wikipedia má uvedený neznámy jazyk"
msgid "wikipedia tag format is deprecated"
-msgstr ""
+msgstr "značka wikipedia má zastaralý formát"
msgid "''wikipedia''=''language:page title''"
msgstr "\"wikipedia\"=\"jazyk:názov stránky\""
msgid "wikipedia ''{0}'' language is obsolete, use ''{1}'' instead"
msgstr ""
+"jazyk \"{0}\" pre ''wikipedia'' je zastaralý, použite namiesto toho \"{1}\""
msgid "wikipedia ''{0}'' language is invalid, use ''{1}'' instead"
msgstr ""
+"jazyk \"{0}\" pre ''wikipedia'' je neplatný, použite namiesto toho \"{1}\""
msgid "{0} tag should not have URL-encoded values like ''%27''"
-msgstr ""
+msgstr "značka {0} by nemala obsahovať hodnoty kódované pre URL ako \"%27\""
msgid "wikipedia title should not start with a space after language code"
msgstr ""
+"názov článku pre ''wikipedia'' by nemal začínať medzerou za kódom jazyka"
msgid "wikipedia title should not have ''{0}'' prefix"
-msgstr ""
+msgstr "názov článku pre ''wikipedia'' by nemal mať predponu \"{0}\""
msgid "wikipedia page title should have first letter capitalized"
-msgstr ""
+msgstr "názov článku pre ''wikipedia'' by mal mať prvé písmeno veľké"
msgid ""
"wikipedia page title should have spaces instead of underscores (''_''→'' '')"
msgstr ""
+"názov článku pre ''wikipedia'' by mal mať medzery namiesto podtržníkov "
+"(\"_\"→\" \")"
msgid "wikipedia language seems to be duplicated, e.g. en:en:Foo"
-msgstr ""
+msgstr "jazyk vo ''wikipedia'' vyzerá byť zduplikovaný, napr. en:en:Foo"
msgid "wikidata tag must be in Qnnnn format, where n is a digit"
-msgstr ""
+msgstr "značka ''wikidata'' musí byť vo formáte Qnnnn, kde n sú číslice"
msgid ""
"wikipedia tag is set, but there is no wikidata tag. Wikipedia plugin might "
"help with wikidata id lookups"
msgstr ""
+"značka ''wikipedia'' je zadaná, ale chýba značka ''wikidata''. Plugin "
+"Wikipedia môže pomôcť s vyhľadaním id pre wikidata"
msgid ""
"wikipedia tag is not set, but a ''{0}'' tag is. Make sure to use "
"wikipedia=language:value together with wikidata tag."
msgstr ""
+"značka ''wikipedia'' nie je nastavená, ale značka \"{0}\" je. Použite "
+"''wikipedia=jazyk:hodnota'' spolu so značkou ''wikidata''."
msgid "Hide icons at low zoom"
msgstr "Skryť ikony pri malom priblížení"
@@ -27610,15 +27954,6 @@ msgstr "Importovať lokálne obrázky"
msgid "Import pictures into Mapillary layer"
msgstr "Importovať obrázky do vrstvy Mapillary"
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr "Importovať obrázky do postupnosti"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importovať obrázky do vrstvy Mapillary v postupnosti"
-
msgid "Join mode"
msgstr "Režim spájania"
@@ -27860,6 +28195,43 @@ msgstr "Nasledovať vybraný obrázok"
msgid "Go forward"
msgstr "Prejsť dopredu"
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Importovať"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -27895,6 +28267,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -27904,6 +28279,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -27913,15 +28291,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -27958,7 +28354,13 @@ msgstr[2] "{0} obrázky otočené"
msgid "2 images unjoined"
msgstr "2 obrázky rozpojené"
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -27975,9 +28377,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr "Sťahuje sa"
@@ -28679,6 +29078,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -29570,6 +29972,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -29590,46 +29998,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
+msgstr "Nahradiť geometriu"
+
+msgid "Merge Tags"
msgstr ""
-msgid "<Please select data>"
+msgid "List of tags to merge"
msgstr ""
-msgid "Configure conflation settings"
+msgid "except"
msgstr ""
-msgid "Generate matches"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Reference:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Subject:"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Programming"
+msgid "Simple Example"
msgstr ""
-msgid "Merging"
+msgid "Advanced Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Nahradiť geometriu"
+msgid "<Please select data>"
+msgstr ""
-msgid "Merge Tags"
+msgid "Configure conflation settings"
msgstr ""
-msgid "List of tags to merge"
+msgid "Generate matches"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Merging"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -29662,6 +30078,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -30043,9 +30465,6 @@ msgstr "Globalsat Import"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Importovať Dáta z Globalsat Datalogger DG100 do GPX vrstvy."
-msgid "Import"
-msgstr "Importovať"
-
msgid "GPS Blams"
msgstr ""
@@ -30550,9 +30969,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -30671,24 +31087,6 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
-msgstr ""
-
-msgid "Start adjusting"
-msgstr ""
-
-msgid "There are currently no imagery layer to adjust."
-msgstr ""
-
-msgid "No layers to adjust"
-msgstr ""
-
msgid "Normal"
msgstr "Normálny"
@@ -30701,12 +31099,21 @@ msgstr "Otočiť o 180°"
msgid "Rotate 270"
msgstr "Otočiť o 270°"
-msgid "Previous image"
-msgstr "Predchádzajúci obrázok"
+msgid "WayPoint Image"
+msgstr "WayPoint Image"
+
+msgid "Display non-geotagged photos"
+msgstr "Zobraziť fotky bez informácií o polohe"
+
+msgid "Imported Images"
+msgstr "Importované obrázky"
msgid "Next image"
msgstr "Nasledujúci obrázok"
+msgid "Previous image"
+msgstr "Predchádzajúci obrázok"
+
msgid "Rotate left"
msgstr "Otočiť vľavo"
@@ -30719,15 +31126,6 @@ msgstr "Otočiť vpravo"
msgid "Rotate image right"
msgstr "Otočiť obrázok vpravo"
-msgid "WayPoint Image"
-msgstr "WayPoint Image"
-
-msgid "Display non-geotagged photos"
-msgstr "Zobraziť fotky bez informácií o polohe"
-
-msgid "Imported Images"
-msgstr "Importované obrázky"
-
msgid "Import vector graphics"
msgstr "Importovať vektorovú grafiku"
@@ -32844,9 +33242,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr "Štát (vo federácii)"
diff --git a/i18n/po/sl.po b/i18n/po/sl.po
index 649aa8f..18042cd 100644
--- a/i18n/po/sl.po
+++ b/i18n/po/sl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2015-11-07 17:38+0000\n"
"Last-Translator: Joško Horvat <Unknown>\n"
"Language-Team: Slovenian <sl at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "
"n%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:10+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:07+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: sl\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3321,6 +3321,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3329,6 +3332,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4001,6 +4009,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4057,6 +4068,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9057,46 +9071,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
-msgstr "Spremeni ločljivost"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9211,7 +9228,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr "Shrani datoteko GPX"
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9325,9 +9348,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Shrani datoteko OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9338,8 +9358,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9501,16 +9524,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr "Slike z geografskim položajem"
@@ -9644,12 +9657,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9809,6 +9832,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr "Spremeni ločljivost"
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11227,15 +11280,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11284,6 +11328,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12461,6 +12508,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13609,6 +13659,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13811,9 +13864,6 @@ msgstr ""
"Vstavek je bil odstranjen iz nastavitev. Prosim, ponovno zaženite JOSM za "
"njegovo odstranitev iz spomina."
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr "opis ni na voljo"
@@ -14517,6 +14567,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14528,6 +14586,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14540,6 +14610,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14895,6 +14989,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14997,6 +15099,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15048,10 +15153,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15084,6 +15189,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15136,6 +15316,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15282,6 +15468,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15321,6 +15513,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15345,6 +15545,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15389,34 +15592,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15557,6 +15769,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15585,7 +15805,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15734,6 +15954,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15809,6 +16037,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15914,33 +16145,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15950,12 +16224,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16274,8 +16561,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16416,9 +16703,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18323,24 +18607,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19513,6 +19804,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21328,10 +21622,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22732,6 +23022,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Arheološko najdišče"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24273,6 +24578,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25769,15 +26089,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -26019,6 +26330,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26054,6 +26402,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26063,6 +26414,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26072,15 +26426,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26113,7 +26485,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26130,9 +26508,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26825,6 +27200,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27663,6 +28041,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27683,46 +28067,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27755,6 +28147,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28130,9 +28528,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Uvozi podatke iz Globalsat Datalogger DG100 naprave v plast GPX."
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28617,9 +29012,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28738,42 +29130,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28786,15 +29169,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30889,9 +31263,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/sq.po b/i18n/po/sq.po
index f639d09..93317bd 100644
--- a/i18n/po/sq.po
+++ b/i18n/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2011-11-04 19:43+0000\n"
"Last-Translator: StefanPrifti <Unknown>\n"
"Language-Team: FLOSS Kosova\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 04:34+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 04:34+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3305,6 +3305,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3313,6 +3316,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3977,6 +3985,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4033,6 +4044,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9011,46 +9025,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9165,7 +9182,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9279,9 +9302,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9292,8 +9312,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9455,16 +9478,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9594,12 +9607,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9759,6 +9782,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11175,15 +11228,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11232,6 +11276,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12407,6 +12454,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13549,6 +13599,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13747,9 +13800,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14453,6 +14503,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14464,6 +14522,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14476,6 +14546,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14831,6 +14925,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14933,6 +15035,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14984,10 +15089,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15020,6 +15125,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15072,6 +15252,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15218,6 +15404,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15257,6 +15449,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15281,6 +15481,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15325,34 +15528,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15493,6 +15705,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15521,7 +15741,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15670,6 +15890,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15745,6 +15973,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15850,33 +16081,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15886,12 +16160,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16210,8 +16497,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16352,9 +16639,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18259,24 +18543,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19449,6 +19740,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21264,10 +21558,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22668,6 +22958,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24209,6 +24514,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25705,15 +26025,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25955,6 +26266,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25990,6 +26338,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25999,6 +26350,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26008,15 +26362,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26049,7 +26421,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26066,9 +26444,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26761,6 +27136,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27599,6 +27977,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27619,46 +28003,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27691,6 +28083,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28066,9 +28464,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28553,9 +28948,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28674,42 +29066,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28722,15 +29105,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30823,9 +31197,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/sr.po b/i18n/po/sr.po
index c2cf532..b8fd14c 100644
--- a/i18n/po/sr.po
+++ b/i18n/po/sr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2015-02-01 15:30+0000\n"
"Last-Translator: Slobodan Simić <Unknown>\n"
"Language-Team: Serbian <sr at li.org>\n"
@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:08+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:06+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: sr\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3306,6 +3306,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3314,6 +3317,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3978,6 +3986,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4034,6 +4045,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9013,46 +9027,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9167,7 +9184,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9281,9 +9304,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9294,8 +9314,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9457,16 +9480,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9596,12 +9609,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9761,6 +9784,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11177,15 +11230,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11234,6 +11278,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12409,6 +12456,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13551,6 +13601,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13749,9 +13802,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14455,6 +14505,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14466,6 +14524,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14478,6 +14548,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14833,6 +14927,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14935,6 +15037,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14986,10 +15091,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15022,6 +15127,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15074,6 +15254,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15220,6 +15406,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15259,6 +15451,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15283,6 +15483,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15327,34 +15530,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15495,6 +15707,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15523,7 +15743,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15672,6 +15892,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15747,6 +15975,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15852,33 +16083,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15888,12 +16162,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16212,8 +16499,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16354,9 +16641,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18261,24 +18545,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19451,6 +19742,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21266,10 +21560,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22670,6 +22960,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24211,6 +24516,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25707,15 +26027,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25957,6 +26268,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25992,6 +26340,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26001,6 +26352,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26010,15 +26364,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26051,7 +26423,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26068,9 +26446,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26763,6 +27138,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27601,6 +27979,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27621,46 +28005,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27693,6 +28085,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28068,9 +28466,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28555,9 +28950,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28676,42 +29068,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28724,15 +29107,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30825,9 +31199,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/sv.po b/i18n/po/sv.po
index d006311..fd60215 100644
--- a/i18n/po/sv.po
+++ b/i18n/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2017-02-22 12:40+0000\n"
"Last-Translator: Erik <Unknown>\n"
"Language-Team: Swedish <sv at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:11+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:08+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: sv\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3567,6 +3567,9 @@ msgstr "Projektion"
msgid "Matrix set identifier"
msgstr "Matrix-lägesindentifierare"
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Lager definierade av getCapabilities document: {0}"
@@ -3576,6 +3579,11 @@ msgstr ""
"WMTS Parser fel - startelementer {0} har ett annat namn än slutelementet {2}"
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4255,6 +4263,9 @@ msgstr "Detta testar om multipolygoner är giltiga."
msgid "Area style way is not closed"
msgstr "Sträcka av typen yta är inte sluten"
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "Multipolygon utan angiven yttre sträcka"
@@ -4315,6 +4326,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr "Ingen användbar roll för multipolygonens medlem"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "Multipolygon innehåller annat än sträckor"
@@ -9434,46 +9448,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] "{0} objekt att radera:"
msgstr[1] "{0} objekt att radera:"
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
-msgstr "Ladda tiles automatiskt"
+msgid "Show tile info"
+msgstr ""
-msgid "Show errors"
-msgstr "Visa fel"
+msgid "Tile Info"
+msgstr ""
-msgid "Load all tiles"
-msgstr "Ladda alla tiles"
+msgid "Tile name"
+msgstr ""
-msgid "Load all error tiles"
-msgstr "Ladda alla fel tiles"
+msgid "Tile URL"
+msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
-msgstr "Ändra upplösning"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Öka zoomläge"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Minska zoomläge"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9588,7 +9605,13 @@ msgstr[1] "{0} spår, "
msgid "Save GPX file"
msgstr "Spara GPX-fil"
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9704,9 +9727,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Spara OSM-fil"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "EPSG:4326 och Mercator-projektion stöds"
-
msgid "Validation errors"
msgstr "Valideringsfel"
@@ -9717,8 +9737,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9886,20 +9909,6 @@ msgstr "Välj ett GPX-spår"
msgid "No selected GPX track"
msgstr "Inget GPX-spår har valts"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Fel vid tolkning av tidszon.\n"
-"Förväntat format: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Fel vid tolkning av förskjutning.\n"
-"Förväntat format: {0}"
-
msgid "Geotagged Images"
msgstr "Geotaggade bilder"
@@ -10039,12 +10048,26 @@ msgstr ""
"\n"
"GPS-tid: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Fel vid tolkning av förskjutning.\n"
+"Förväntat format: {0}"
+
msgid "Show thumbnails"
msgstr "Visa miniatyrbilder"
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Fel vid tolkning av tidszon.\n"
+"Förväntat format: {0}"
+
msgid "Choose visible tracks"
msgstr ""
@@ -10208,6 +10231,36 @@ msgstr "Markörer från namngivna punkter"
msgid "Named Trackpoints from {0}"
msgstr "Namngivna spårpunkter från {0}"
+msgid "Auto load tiles"
+msgstr "Ladda tiles automatiskt"
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr "Minska zoomläge"
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr "Öka zoomläge"
+
+msgid "Load all tiles"
+msgstr "Ladda alla tiles"
+
+msgid "Load all error tiles"
+msgstr "Ladda alla fel tiles"
+
+msgid "Show errors"
+msgstr "Visa fel"
+
+msgid "Change resolution"
+msgstr "Ändra upplösning"
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr "gps-markör"
@@ -11666,15 +11719,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr "Mjuk"
@@ -11723,6 +11767,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12920,6 +12967,9 @@ msgstr "Valfria attribut:"
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -14081,6 +14131,9 @@ msgstr "ersatt av nya insticksmodulen {0}"
msgid "no longer required"
msgstr "krävs inte längre"
+msgid "Plugin information"
+msgstr "Insticksmodulsinformation"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -14302,9 +14355,6 @@ msgstr ""
"Insticksmodulen har tagits bort från inställningarna. Starta om JOSM för "
"frigöra insticksmodulen."
-msgid "Plugin information"
-msgstr "Insticksmodulsinformation"
-
msgid "no description available"
msgstr "ingen beskrivning tillgänglig"
@@ -15075,6 +15125,14 @@ msgid "farmland"
msgstr "jordbruksmark"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "bostadsområde"
@@ -15086,6 +15144,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr "buskage"
@@ -15098,6 +15168,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "industri"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -15453,6 +15547,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -15555,6 +15657,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15606,10 +15711,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15642,6 +15747,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15694,6 +15874,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15840,6 +16026,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15879,6 +16071,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15903,6 +16103,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15947,34 +16150,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -16115,6 +16327,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -16143,7 +16363,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -16292,6 +16512,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -16367,6 +16595,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -16472,33 +16703,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -16508,12 +16782,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16834,8 +17121,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16976,9 +17263,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18905,26 +19189,33 @@ msgstr "Cykel- bana/spår"
msgid "Cycleway"
msgstr "Cykelbana"
+msgctxt "cycleway"
msgid "lane"
-msgstr "vägbana"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "spår"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "motsatta filen"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "motsatta spåret"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
-msgstr "motsatta"
+msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "delat körfält"
+msgstr ""
msgid "Cycleway left"
msgstr "cykelväg vänster"
@@ -20095,6 +20386,9 @@ msgstr ""
msgid "Wash"
msgstr "Biltvätt"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Bilhandlare"
@@ -21912,10 +22206,6 @@ msgid "garages"
msgstr "garagelänga"
msgctxt "building"
-msgid "industrial"
-msgstr "industri"
-
-msgctxt "building"
msgid "school"
msgstr "skola"
@@ -23316,6 +23606,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Utgrävningsplats"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Krigsskådeplats"
@@ -24868,6 +25173,21 @@ msgstr "Administrativt centrum"
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -26366,15 +26686,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr "Importera bilder till Mapillary-lager"
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr "Importera bilder till sekvens"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Importera bilder till Mapillary-lager i en sekvens"
-
msgid "Join mode"
msgstr ""
@@ -26616,6 +26927,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Importera"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26651,6 +26999,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26660,6 +27011,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26669,15 +27023,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26710,7 +27082,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26727,9 +27105,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -27422,6 +27797,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -28269,6 +28647,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -28289,46 +28673,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
+msgstr "Ersätt Geometri"
+
+msgid "Merge Tags"
msgstr ""
-msgid "<Please select data>"
+msgid "List of tags to merge"
msgstr ""
-msgid "Configure conflation settings"
+msgid "except"
msgstr ""
-msgid "Generate matches"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Reference:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Subject:"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Programming"
+msgid "Simple Example"
msgstr ""
-msgid "Merging"
+msgid "Advanced Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Ersätt Geometri"
+msgid "<Please select data>"
+msgstr ""
-msgid "Merge Tags"
+msgid "Configure conflation settings"
msgstr ""
-msgid "List of tags to merge"
+msgid "Generate matches"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -28361,6 +28753,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28741,9 +29139,6 @@ msgstr "Globalsatimport"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Importera data från en Globalsat Datalogger DG100 in i ett GPX-lager"
-msgid "Import"
-msgstr "Importera"
-
msgid "GPS Blams"
msgstr ""
@@ -29232,9 +29627,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -29353,24 +29745,6 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr "Justera bild"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Justera positionen för det valda bildlagret"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Välj bildlagret att justera."
-
-msgid "Start adjusting"
-msgstr "Börja justera"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "Det finns för närvarande inget bildlager att justera."
-
-msgid "No layers to adjust"
-msgstr "Inga lager att justera"
-
msgid "Normal"
msgstr "Normal"
@@ -29383,12 +29757,21 @@ msgstr "Rotera 180"
msgid "Rotate 270"
msgstr "Rotera 270"
-msgid "Previous image"
-msgstr "Föregående bild"
+msgid "WayPoint Image"
+msgstr "WayPoint-bild"
+
+msgid "Display non-geotagged photos"
+msgstr "Visa bilder utan geotaggning"
+
+msgid "Imported Images"
+msgstr "Importerade bilder"
msgid "Next image"
msgstr "Nästa bild"
+msgid "Previous image"
+msgstr "Föregående bild"
+
msgid "Rotate left"
msgstr "Rotera åt vänster"
@@ -29401,15 +29784,6 @@ msgstr "Rotera åt höger"
msgid "Rotate image right"
msgstr "Rotera bilden åt höger"
-msgid "WayPoint Image"
-msgstr "WayPoint-bild"
-
-msgid "Display non-geotagged photos"
-msgstr "Visa bilder utan geotaggning"
-
-msgid "Imported Images"
-msgstr "Importerade bilder"
-
msgid "Import vector graphics"
msgstr "Importera vektorgrafik"
@@ -31524,9 +31898,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr "Delstat"
diff --git a/i18n/po/ta.po b/i18n/po/ta.po
index d847dd6..1a7ec4f 100644
--- a/i18n/po/ta.po
+++ b/i18n/po/ta.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\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: 2017-03-24 05:12+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:09+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"X-Poedit-Country: INDIA\n"
"Language: ta\n"
"X-Poedit-Language: Tamil\n"
@@ -3341,6 +3341,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3349,6 +3352,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4013,6 +4021,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4069,6 +4080,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9048,46 +9062,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9202,7 +9219,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr "GPX கோப்பைக் காக்க"
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9318,9 +9341,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "OSM கோப்பைக் காக்க"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9331,8 +9351,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9494,16 +9517,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9633,12 +9646,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9798,6 +9821,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11214,15 +11267,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11271,6 +11315,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12446,6 +12493,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13588,6 +13638,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13786,9 +13839,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14492,6 +14542,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14503,6 +14561,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14515,6 +14585,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14870,6 +14964,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14972,6 +15074,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15023,10 +15128,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15059,6 +15164,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15111,6 +15291,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15257,6 +15443,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15296,6 +15488,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15320,6 +15520,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15364,34 +15567,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15532,6 +15744,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15560,7 +15780,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15709,6 +15929,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15784,6 +16012,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15889,33 +16120,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15925,12 +16199,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16249,8 +16536,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16391,9 +16678,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18298,24 +18582,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19488,6 +19779,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21303,10 +21597,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22707,6 +22997,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24248,6 +24553,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25744,15 +26064,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25994,6 +26305,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26029,6 +26377,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26038,6 +26389,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26047,15 +26401,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26088,7 +26460,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26105,9 +26483,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26800,6 +27175,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27638,6 +28016,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27658,46 +28042,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27730,6 +28122,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28105,9 +28503,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28592,9 +28987,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28713,42 +29105,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28761,15 +29144,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30868,9 +31242,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/te.po b/i18n/po/te.po
index 51dfb25..9326d31 100644
--- a/i18n/po/te.po
+++ b/i18n/po/te.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2011-05-13 08:50+0000\n"
"Last-Translator: Praveen Illa <mail2ipn at gmail.com>\n"
"Language-Team: Telugu <te at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:12+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:09+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: te\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3305,6 +3305,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3313,6 +3316,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3977,6 +3985,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4033,6 +4044,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9011,46 +9025,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9165,7 +9182,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9279,9 +9302,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9292,8 +9312,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9455,16 +9478,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9594,12 +9607,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9759,6 +9782,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11175,15 +11228,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11232,6 +11276,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12407,6 +12454,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13549,6 +13599,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13747,9 +13800,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14453,6 +14503,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14464,6 +14522,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14476,6 +14546,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14831,6 +14925,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14933,6 +15035,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14984,10 +15089,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15020,6 +15125,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15072,6 +15252,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15218,6 +15404,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15257,6 +15449,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15281,6 +15481,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15325,34 +15528,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15493,6 +15705,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15521,7 +15741,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15670,6 +15890,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15745,6 +15973,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15850,33 +16081,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15886,12 +16160,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16210,8 +16497,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16352,9 +16639,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18259,24 +18543,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19449,6 +19740,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21264,10 +21558,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22668,6 +22958,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24209,6 +24514,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25705,15 +26025,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25955,6 +26266,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25990,6 +26338,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25999,6 +26350,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26008,15 +26362,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26049,7 +26421,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26066,9 +26444,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26761,6 +27136,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27599,6 +27977,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27619,46 +28003,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27691,6 +28083,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28066,9 +28464,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28553,9 +28948,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28674,42 +29066,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28722,15 +29105,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30823,9 +31197,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/th.po b/i18n/po/th.po
index 9a55a17..f3f653d 100644
--- a/i18n/po/th.po
+++ b/i18n/po/th.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2009-03-23 02:34+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Thai <th at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:13+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:10+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: th\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3305,6 +3305,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3313,6 +3316,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3977,6 +3985,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4033,6 +4044,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9011,46 +9025,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9165,7 +9182,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9279,9 +9302,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9292,8 +9312,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9455,16 +9478,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9594,12 +9607,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9759,6 +9782,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11175,15 +11228,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11232,6 +11276,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12407,6 +12454,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13549,6 +13599,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13747,9 +13800,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14453,6 +14503,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14464,6 +14522,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14476,6 +14546,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14831,6 +14925,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14933,6 +15035,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14984,10 +15089,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15020,6 +15125,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15072,6 +15252,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15218,6 +15404,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15257,6 +15449,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15281,6 +15481,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15325,34 +15528,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15493,6 +15705,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15521,7 +15741,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15670,6 +15890,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15745,6 +15973,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15850,33 +16081,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15886,12 +16160,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16210,8 +16497,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16352,9 +16639,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18259,24 +18543,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19449,6 +19740,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21264,10 +21558,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22668,6 +22958,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24209,6 +24514,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25705,15 +26025,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25955,6 +26266,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25990,6 +26338,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25999,6 +26350,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26008,15 +26362,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26049,7 +26421,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26066,9 +26444,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26761,6 +27136,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27599,6 +27977,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27619,46 +28003,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27691,6 +28083,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28066,9 +28464,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28553,9 +28948,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28674,42 +29066,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28722,15 +29105,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30823,9 +31197,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/tr.po b/i18n/po/tr.po
index c409fa9..6cc2d3e 100644
--- a/i18n/po/tr.po
+++ b/i18n/po/tr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2017-02-06 01:25+0000\n"
"Last-Translator: Ferhad Fidan <ferhad at f-blog.info>\n"
"Language-Team: Türkçe <>\n"
@@ -17,8 +17,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:14+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:11+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3358,6 +3358,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3366,6 +3369,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4032,6 +4040,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4088,6 +4099,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9077,46 +9091,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
-msgstr "Çözünürlüğü değiştir"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9231,7 +9248,13 @@ msgstr[1] "{0} izler, "
msgid "Save GPX file"
msgstr "GPX olarak sakla"
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9345,9 +9368,6 @@ msgstr "Çözülmemiş çelişkiler var. Çelişkiler kaydedilmeyecektir! Devam?
msgid "Save OSM file"
msgstr "OSM dosyası olarak sakla"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr "Onaylama Hataları"
@@ -9358,8 +9378,11 @@ msgid "Set WMS Bookmark"
msgstr "WMS İmi Belirle"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9526,20 +9549,6 @@ msgstr "GPX izi seçmelisiniz"
msgid "No selected GPX track"
msgstr "seçili GPX izi yok"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Zaman diliminde sorun var.\n"
-"İstenen format: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"offset bilgisisnin okunmasında sorun.\n"
-"İstenen format: {0}"
-
msgid "Geotagged Images"
msgstr "Geotagged Görüntüler"
@@ -9671,12 +9680,26 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"offset bilgisisnin okunmasında sorun.\n"
+"İstenen format: {0}"
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Zaman diliminde sorun var.\n"
+"İstenen format: {0}"
+
msgid "Choose visible tracks"
msgstr ""
@@ -9837,6 +9860,36 @@ msgstr "işaretli noktalardan imleçler"
msgid "Named Trackpoints from {0}"
msgstr "{0} isim verilen izler"
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr "Çözünürlüğü değiştir"
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr "gps imleçi"
@@ -11266,15 +11319,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11323,6 +11367,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12499,6 +12546,9 @@ msgstr "Seçilebilen Özellikler:"
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13647,6 +13697,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13848,9 +13901,6 @@ msgstr ""
"Eklenti ayarlardan çıkartıldı, tamamen kaldırmak için JOSM u tekrar "
"çalıştırın."
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr "Açıklama mevcut değil"
@@ -14558,6 +14608,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14569,6 +14627,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14581,6 +14651,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14936,6 +15030,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -15038,6 +15140,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15089,10 +15194,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15125,6 +15230,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15177,6 +15357,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15323,6 +15509,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15362,6 +15554,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15386,6 +15586,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15430,34 +15633,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15598,6 +15810,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15626,7 +15846,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15775,6 +15995,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15850,6 +16078,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15955,33 +16186,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15991,12 +16265,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16315,8 +16602,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16457,9 +16744,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18364,24 +18648,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19554,6 +19845,9 @@ msgstr ""
msgid "Wash"
msgstr "Yıkama"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21369,10 +21663,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22773,6 +23063,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Arkeolojik Site"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Savaş Alanı"
@@ -24314,6 +24619,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25810,15 +26130,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -26060,6 +26371,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "İçeri Al"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26095,6 +26443,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26104,6 +26455,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26113,15 +26467,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26154,7 +26526,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26171,9 +26549,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26866,6 +27241,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27704,6 +28082,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27724,46 +28108,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
+msgstr "Geometriyi değiştir"
+
+msgid "Merge Tags"
msgstr ""
-msgid "<Please select data>"
+msgid "List of tags to merge"
msgstr ""
-msgid "Configure conflation settings"
+msgid "except"
msgstr ""
-msgid "Generate matches"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Reference:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Subject:"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Programming"
+msgid "Simple Example"
msgstr ""
-msgid "Merging"
+msgid "Advanced Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Geometriyi değiştir"
+msgid "<Please select data>"
+msgstr ""
-msgid "Merge Tags"
+msgid "Configure conflation settings"
msgstr ""
-msgid "List of tags to merge"
+msgid "Generate matches"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Merging"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27796,6 +28188,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28173,9 +28571,6 @@ msgstr "Globalsat İçeri AL"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Globalsat Datalogger DG100 ’dan veriyi GPX tabakasına al."
-msgid "Import"
-msgstr "İçeri Al"
-
msgid "GPS Blams"
msgstr ""
@@ -28660,9 +29055,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28781,24 +29173,6 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
-msgstr ""
-
-msgid "Start adjusting"
-msgstr ""
-
-msgid "There are currently no imagery layer to adjust."
-msgstr ""
-
-msgid "No layers to adjust"
-msgstr ""
-
msgid "Normal"
msgstr "Normal"
@@ -28811,12 +29185,21 @@ msgstr "Dönder 180"
msgid "Rotate 270"
msgstr "Dönder 270"
-msgid "Previous image"
-msgstr "Önceki Görüntü"
+msgid "WayPoint Image"
+msgstr "Yol noktaları görüntüsü"
+
+msgid "Display non-geotagged photos"
+msgstr "Gotag yapılmamış görüntüleri göster"
+
+msgid "Imported Images"
+msgstr "İçeri alınan görüntüler"
msgid "Next image"
msgstr "Sonraki Görüntü"
+msgid "Previous image"
+msgstr "Önceki Görüntü"
+
msgid "Rotate left"
msgstr "Sola Dönder"
@@ -28829,15 +29212,6 @@ msgstr "Görüntüyü sağa dönder"
msgid "Rotate image right"
msgstr "Görüntüyü sağa dönder"
-msgid "WayPoint Image"
-msgstr "Yol noktaları görüntüsü"
-
-msgid "Display non-geotagged photos"
-msgstr "Gotag yapılmamış görüntüleri göster"
-
-msgid "Imported Images"
-msgstr "İçeri alınan görüntüler"
-
msgid "Import vector graphics"
msgstr ""
@@ -30942,9 +31316,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr "İl"
diff --git a/i18n/po/ug.po b/i18n/po/ug.po
index 0f3af43..08936da 100644
--- a/i18n/po/ug.po
+++ b/i18n/po/ug.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2012-07-14 16:22+0000\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: Uyghur <ug at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:14+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:11+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: \n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3305,6 +3305,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3313,6 +3316,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3977,6 +3985,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4033,6 +4044,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9011,46 +9025,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9165,7 +9182,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9279,9 +9302,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9292,8 +9312,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9455,16 +9478,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9594,12 +9607,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9759,6 +9782,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11175,15 +11228,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11232,6 +11276,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12407,6 +12454,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13549,6 +13599,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13747,9 +13800,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14453,6 +14503,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14464,6 +14522,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14476,6 +14546,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14831,6 +14925,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14933,6 +15035,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14984,10 +15089,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15020,6 +15125,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15072,6 +15252,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15218,6 +15404,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15257,6 +15449,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15281,6 +15481,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15325,34 +15528,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15493,6 +15705,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15521,7 +15741,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15670,6 +15890,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15745,6 +15973,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15850,33 +16081,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15886,12 +16160,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16210,8 +16497,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16352,9 +16639,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18259,24 +18543,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19449,6 +19740,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21264,10 +21558,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22668,6 +22958,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24209,6 +24514,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25705,15 +26025,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25955,6 +26266,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25990,6 +26338,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25999,6 +26350,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26008,15 +26362,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26049,7 +26421,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26066,9 +26444,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26761,6 +27136,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27599,6 +27977,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27619,46 +28003,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27691,6 +28083,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28066,9 +28464,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28553,9 +28948,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28674,42 +29066,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28722,15 +29105,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30823,9 +31197,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/uk.po b/i18n/po/uk.po
index c2bd6d6..cc68162 100644
--- a/i18n/po/uk.po
+++ b/i18n/po/uk.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
-"PO-Revision-Date: 2017-03-12 21:11+0000\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"PO-Revision-Date: 2017-04-20 14:46+0000\n"
"Last-Translator: andygol <Unknown>\n"
"Language-Team: Ukrainian <uk 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%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:15+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:12+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: uk\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -2304,7 +2304,7 @@ msgid "Improve Way Accuracy mode"
msgstr "Режим Покращення Точності Ліній"
msgid "improve way accuracy helper line"
-msgstr "допоміжна лінія інструменту покращення точності ліній"
+msgstr "помічник, що показує допоміжну лінію"
msgid "Click on the way to start improving its shape."
msgstr "Клацніть по лінії, щоб розпочати покращення її форми."
@@ -3658,6 +3658,9 @@ msgstr "Проекція"
msgid "Matrix set identifier"
msgstr "Ідентифікатор набору матриць"
+msgid "No default layer selected, choosing first layer."
+msgstr "Типовий шар не обрано, використовується перший шар."
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "Не визначено жодного шару через getCapabilities докменту: {0}"
@@ -3668,6 +3671,13 @@ msgstr ""
"кніцевого елементу {2}"
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+"Неможливо використовувати шар {0}, бо не знайдені підтримувані формати. Шар "
+"доступний в форматах: {1}"
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4377,6 +4387,9 @@ msgstr "Цей тест перевіряє правильність мульти
msgid "Area style way is not closed"
msgstr "Лінія, що позначає полігон, не замкнена"
+msgid "No outer way for boundary"
+msgstr "Немає зовнішньої лінії у звʼязку кордону"
+
msgid "No outer way for multipolygon"
msgstr "У мультиполігона немає зовнішньої лінії"
@@ -4439,6 +4452,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr "Непридатна роль члена мультиполігону"
+msgid "Non-Way in boundary"
+msgstr "Не лінія у звʼязку кордону"
+
msgid "Non-Way in multipolygon"
msgstr "Не-лінія в мультиполігоні"
@@ -9964,47 +9980,50 @@ msgstr[0] "Вилучити {0} об’єкт:"
msgstr[1] "Вилучити {0} об’єкти:"
msgstr[2] "Вилучити {0} об’єктів:"
-msgid "Show tile info"
-msgstr "Показати дані квадрата"
+msgid "Native projections"
+msgstr "Початкові проекції"
-msgid "Tile Info"
-msgstr "Інформація про квадрат"
+msgid "Offset"
+msgstr "Зсув"
-msgid "Metadata "
-msgstr "Метадані "
+msgid "Tile download projection"
+msgstr "Проекція для завантаження квадратів"
-msgid "Load tile"
-msgstr "Завантажити квадрат"
+msgid "Tile display projection"
+msgstr "Проекція для показу квадратів"
-msgid "Auto zoom"
-msgstr "Автомасштабування"
+msgid "Current zoom"
+msgstr "Поточний масштаб"
-msgid "Auto load tiles"
-msgstr "Автозавантаження квадратів"
+msgid "Show tile info"
+msgstr "Показати дані квадрата"
-msgid "Show errors"
-msgstr "Показати помилки"
+msgid "Tile Info"
+msgstr "Інформація про квадрат"
-msgid "Load all tiles"
-msgstr "Завантажити всі квадрати"
+msgid "Tile name"
+msgstr "Назва квадрата"
-msgid "Load all error tiles"
-msgstr "Завантажити усі помилкові квадрати"
+msgid "Tile URL"
+msgstr "URL квадрата"
-msgid "Zoom to native resolution"
-msgstr "Масштабувати до природної розподільчої здатності"
+msgid "Tile size"
+msgstr "Розмір квадрата"
-msgid "Change resolution"
-msgstr "Змінити розподільчу здатність"
+msgid "Tile display size"
+msgstr "Розмір для показу квадратів"
-msgid "Increase zoom"
-msgstr "Збільшити масштаб"
+msgid "Reprojection"
+msgstr "Перепроецювання"
-msgid "Decrease zoom"
-msgstr "Зменшити масштаб"
+msgid "Reprojected tile size"
+msgstr "Розмір перепроецьованого квадрату"
-msgid "Flush tile cache"
-msgstr "Очистити кеш квадратів"
+msgid "Metadata "
+msgstr "Метадані "
+
+msgid "Load tile"
+msgstr "Завантажити квадрат"
msgid "Failed to create tile source"
msgstr "Збій створення джерела квадратів мапи"
@@ -10126,8 +10145,14 @@ msgstr[2] "{0} треків, "
msgid "Save GPX file"
msgstr "Зберегти файл GPX"
-msgid "Imagery fade"
-msgstr "Прозорість зображення"
+msgid "Id"
+msgstr "Ід."
+
+msgid "Min. zoom"
+msgstr "Мін. масштаб"
+
+msgid "Max. zoom"
+msgstr "Макс. масштаб"
msgid "Unsupported imagery type: {0}"
msgstr "Непідтримуваний тип фонового зображення: {0}"
@@ -10244,9 +10269,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Зберегти файл OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "Підтримуються проекції EPSG:4326 та Mercator"
-
msgid "Validation errors"
msgstr "Помилки"
@@ -10257,11 +10279,16 @@ msgid "Set WMS Bookmark"
msgstr "Встановити закладку WMS"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
msgstr ""
-"JOSM буде використовувати EPSG:4326 для надсилання запитів до сервера, \r\n"
-"але результати можуть відрізнятись в залежності в WMS-сервера"
+"Змінення проекції шару {0} з {1} на {2}. Для покращення якості та швидкодії "
+"оберіть одну з підтримуваних проекцій: {3}"
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
+msgstr ""
+"Неможливо знайти підтримувану проекцію для шару {0}. Використовуватиметься "
+"{1}."
msgid "Correlate to GPX"
msgstr "Відносяться до GPX"
@@ -10435,20 +10462,6 @@ msgstr "Ви повинні вибрати трек GPX"
msgid "No selected GPX track"
msgstr "Трек GPX не виділено"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Помилка в часовому поясі.\n"
-"Очікуваний формат: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Помилка зсуву.\n"
-"Очікуваний формат: {0}"
-
msgid "Geotagged Images"
msgstr "Зображення з геотеґами"
@@ -10593,12 +10606,26 @@ msgstr ""
"\n"
"GPS час: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Помилка зсуву.\n"
+"Очікуваний формат: {0}"
+
msgid "Show thumbnails"
msgstr "Показувати мініатюри"
msgid "Show image thumbnails instead of icons."
msgstr "Показувати мініатюри зображень замість значків"
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Помилка в часовому поясі.\n"
+"Очікуваний формат: {0}"
+
msgid "Choose visible tracks"
msgstr "Вибрати видимі треки"
@@ -10774,6 +10801,36 @@ msgstr "Позначки з іменованих точок"
msgid "Named Trackpoints from {0}"
msgstr "Іменовані точки треку з {0}"
+msgid "Auto load tiles"
+msgstr "Автозавантаження квадратів"
+
+msgid "Auto zoom"
+msgstr "Автомасштабування"
+
+msgid "Decrease zoom"
+msgstr "Зменшити масштаб"
+
+msgid "Flush tile cache"
+msgstr "Очистити кеш квадратів"
+
+msgid "Increase zoom"
+msgstr "Збільшити масштаб"
+
+msgid "Load all tiles"
+msgstr "Завантажити всі квадрати"
+
+msgid "Load all error tiles"
+msgstr "Завантажити усі помилкові квадрати"
+
+msgid "Show errors"
+msgstr "Показати помилки"
+
+msgid "Change resolution"
+msgstr "Змінити розподільчу здатність"
+
+msgid "Zoom to native resolution"
+msgstr "Масштабувати до природної розподільчої здатності"
+
msgid "gps marker"
msgstr "позначка GPS"
@@ -12367,15 +12424,6 @@ msgstr "Назва кешу"
msgid "Object Count"
msgstr "Кількість об’єктів"
-msgid "imagery fade"
-msgstr "затемнювання фону"
-
-msgid "Fade Color: "
-msgstr "Колір затемнювання: "
-
-msgid "Fade amount: "
-msgstr "Ступінь затемнювання: "
-
msgid "Soft"
msgstr "М’яко"
@@ -12424,6 +12472,9 @@ msgstr "Фонове зображення: Типове"
msgid "Available default entries:"
msgstr "Доступні типові записи:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr "Нові типові елементи можна додати у <a href=\"{0}\">Wiki</a>."
+
msgid "Selected entries:"
msgstr "Обрані записи:"
@@ -13706,6 +13757,9 @@ msgstr "Необов’язкові атрибути:"
msgid "Unknown requisite: {0}"
msgstr "Невідомий запит: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "Некоректний вираз: {0}"
@@ -14989,6 +15043,9 @@ msgstr "замінений новим втулком {0}"
msgid "no longer required"
msgstr "більше не потрібно"
+msgid "Plugin information"
+msgstr "Інформація про втулок"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -15230,9 +15287,6 @@ msgstr ""
"Втулок був вилучений з конфігурації. Будь ласка, перезавантажте JOSM, щоб "
"вивантажити втулок."
-msgid "Plugin information"
-msgstr "Інформація про втулок"
-
msgid "no description available"
msgstr "немає опису"
@@ -16159,16 +16213,36 @@ msgid "farmland"
msgstr "поля"
msgctxt "landuse"
+msgid "farmyard"
+msgstr "двір ферми"
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr "цвинтар"
+
+msgctxt "landuse"
msgid "residential"
msgstr "житловий район"
msgctxt "landuse"
msgid "greenfield"
-msgstr ""
+msgstr "нова ділянка під забудову"
msgctxt "landuse"
msgid "village_green"
-msgstr ""
+msgstr "сільский майдан"
+
+msgctxt "landuse"
+msgid "quarry"
+msgstr "карʼєр"
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr "сади/городи"
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr "виноградник"
msgctxt "natural"
msgid "scrub"
@@ -16180,7 +16254,31 @@ msgstr "дерева"
msgctxt "natural"
msgid "grassland"
-msgstr ""
+msgstr "лукопасовищне"
+
+msgctxt "natural"
+msgid "wetland"
+msgstr "болото"
+
+msgctxt "natural"
+msgid "heath"
+msgstr "верес"
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr "пожежна частина"
+
+msgctxt "leisure"
+msgid "park"
+msgstr "парк"
+
+msgctxt "leisure"
+msgid "track"
+msgstr "бігова доріжка"
+
+msgctxt "building"
+msgid "industrial"
+msgstr "промисловість"
msgctxt "Relation type"
msgid "associatedStreet"
@@ -16272,7 +16370,7 @@ msgstr "острів"
msgctxt "Place type"
msgid "county"
-msgstr "графство"
+msgstr "округ"
msgctxt "Place type"
msgid "hamlet"
@@ -16538,6 +16636,16 @@ msgstr "imagico.de - знімки OSM для мапінгу: гори Пенса
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr "imagico.de - знімки OSM для мапінгу: Острів слонів/Острів Кларенс"
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr "imagico.de - знімки OSM для мапінгу: Земля Ендбері та Берег Кемпа"
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+"Знміки Sentinel-2 канали 234 (true color), Знімки Sentinel-2 Земля Ендбері "
+"та Берег Кемпа початок 2017"
+
msgid "IGN Argentina (TMS)"
msgstr "IGN Аргентина (TMS)"
@@ -16563,7 +16671,7 @@ msgid "LPI NSW Administrative Boundaries LGA"
msgstr "LPI NSW Адміністративні границі районів місцевого самоврядування"
msgid "LPI NSW Administrative Boundaries County"
-msgstr "LPI NSW Адміністративні границі графств"
+msgstr "LPI NSW Адміністративні границі окргуів"
msgid "LPI NSW Administrative Boundaries Parish"
msgstr "LPI NSW Адміністративні границі парафій"
@@ -16640,6 +16748,9 @@ msgstr "OpenStreetMap (Бельгійський стиль - голландсь
msgid "OpenStreetMap (Belgian Style - German)"
msgstr "OpenStreetMap (Бельгійський стиль - німецька)"
+msgid "Orthophoto IGN-NGI"
+msgstr "Ортофото IGN-NGI"
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr "AGIV Фландрія – найостанніші аерофотознімки"
@@ -16691,11 +16802,11 @@ msgstr "SPW(allonie) 2012-2013 аерофото"
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr "SPW(allonie) 2009-2010 аерофото"
-msgid "TEC bus lines (2014)"
-msgstr "TEC автобусні маршрути (2014)"
+msgid "TEC bus lines"
+msgstr ""
-msgid "TEC bus stops (2014)"
-msgstr "Автобусні зупинки TEC (2014)"
+msgid "TEC bus stops"
+msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
msgstr "Бенін: Котону знімки з Плеяди 2016"
@@ -16727,6 +16838,81 @@ msgstr "Лондрина - ортофото 2011"
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr "SIG Санта-Катарина - OrtoRGB 2012"
+msgid "Arapiraca AL"
+msgstr "Арапірака (штат Алагоас)"
+
+msgid "Branquinha AL"
+msgstr "Бранкінья (штат Алагоас)"
+
+msgid "Cajueiro AL"
+msgstr "Казуейру (штат Алагоас)"
+
+msgid "Campo Alegre AL"
+msgstr "Кампо Алегре (штат Алагоас)"
+
+msgid "Capela AL"
+msgstr "Капела (штат Алагоас)"
+
+msgid "Delmiro Gouveia AL"
+msgstr "Делмиро Гувея (штат Алагоас)"
+
+msgid "Estrela de Alagoas"
+msgstr "Естрела-ді-Алагоас"
+
+msgid "Girau do Ponciano"
+msgstr "Жирау ду Понсіану"
+
+msgid "Major Isidoro AL"
+msgstr "Мажор Ізідору"
+
+msgid "Mar Vermelho AL"
+msgstr "Мар-Вермелью (штат Алагоас)"
+
+msgid "Minador do Negrão"
+msgstr "Мінадор ду Негрьо"
+
+msgid "Olho d’Agua do Casado AL"
+msgstr "Олью-д’Агуа-ду-Казаду (штат Алагоас)"
+
+msgid "Palestina AL"
+msgstr "Палестина (штат Алагоас)"
+
+msgid "Palmeira dos Indios AL"
+msgstr "Палмейра-дуз-Індус (штат Алагоас)"
+
+msgid "Pão de Açucar AL"
+msgstr "Пан-ді-Асукар (штат Алагоас)"
+
+msgid "Piranhas AL"
+msgstr "Піраньяс (штат Алагоас)"
+
+msgid "Poço das Trincheiras AL"
+msgstr "Посу-дас-Тріншейрас (штат Алагоас)"
+
+msgid "Santana do Ipanema AL"
+msgstr "Сантана-ду-Іпанема (штат Алагоас)"
+
+msgid "São Miguel dos Campos AL"
+msgstr "Сан-Мігель-дус-Кампус (штат Алагоас)"
+
+msgid "Teotonio Vilela AL"
+msgstr "Теотоніу-Вілела (штат Алагоас)"
+
+msgid "União dos Palmares AL"
+msgstr "Уніан-дус-Палмаріс (штат Алагоас)"
+
+msgid "Viçosa AL"
+msgstr "Вісоза (штат Алагоас)"
+
+msgid "Alagoas Litoral 2006"
+msgstr "Літораль штата Алагоас, 2006"
+
+msgid "DER-ES"
+msgstr "DER-ES (Департамент автомобільних доріг штату Еспіріту-Санту)"
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr "IBGE-BC250-Дорожня мережа"
+
msgid "Geobase Hydrography"
msgstr "Geobase Гідрографія"
@@ -16779,6 +16965,12 @@ msgstr "Чехія RUIAN ділянки"
msgid "Czech pLPIS"
msgstr "Чехія pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr "Прага IPR свіжі ортофото"
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr "Прага IPR ортофото без рослинності"
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Агенція геоданих (Данія)"
@@ -16926,6 +17118,12 @@ msgstr "Берлін - аерофото 2015"
msgid "Berlin aerial photograph 2016"
msgstr "Берлін - аерофото 2016"
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr "Німецька залізниця Маршрути VzG Листопад 2013"
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr "Німецька залізниця Маршрути VzG Листопад 2015"
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr "Ерланген - аерофото (2016 5.0 см)"
@@ -16968,6 +17166,16 @@ msgstr ""
"imagico.de - знімки OSM для мапінгу: прибережні мілини Північної Німеччини "
"(інфрачервоні знімки)"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr "imagico.de - знімки OSM для мапінгу: узбережжя Північного моря, 2016"
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+"Канали 234 (true color), актуальні знімки з відливами на узбережжі для "
+"оновлення приливних мілин та мілководдя"
+
msgid "Saxony latest aerial imagery"
msgstr "Саксонія - свіжі знімки"
@@ -16992,6 +17200,9 @@ msgstr "Майнц - все аерофото"
msgid "Mainz latest aerial imagery"
msgstr "Майнц - остані знімки"
+msgid "Munich latest aerial imagery 60cm"
+msgstr "Мюнхен: нові аерофотознімки 60 см"
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr "imagico.de - знімки OSM для мапінгу: Касігіаннгуіт"
@@ -17040,35 +17251,44 @@ msgstr "Знімки з дронів Canaan(Гаіті) Листопад 2015"
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr "Matthew (Гаїті) - знімки з дрона, жовтень 2016"
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr "FÖMI ортофото 2000"
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr "FÖMI ортофото 2005"
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr "Сегед - ортофото 2011"
msgid "Inner part of Szeged"
msgstr "Внутрішня частина Сегеда"
-msgid "Törökbálint ortophoto 2013"
-msgstr "Терекбалінт ортофото 2013"
+msgid "Törökbálint orthophoto 2013"
+msgstr "Тьорьокбалінт - ортофото 2013"
msgid "5 cm resolution bald image"
msgstr "5 см нерозфарбоване зображення"
-msgid "Törökbálint ortophoto 2015"
-msgstr "Тьорьокбалінт - ортофото 2015"
+msgid "Törökbálint orthophoto 2015"
+msgstr "Тьорьокбалінт - ортофото 2013"
-msgid "Danube flood ortophoto 2013"
-msgstr "Розлив Дунаю - ортофото 2013"
+msgid "Danube flood orthophoto 2013"
+msgstr "Повінь на Дунаї - ортофото 2013"
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr "Русло Дунаю в Будапешті, Сентендре і Сігетмоносторе"
-msgid "Budapest district XI ortophoto 2015"
-msgstr "Будапешт, район XI - ортофото 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr "Будапешт, округ XI - ортофото 2015"
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr "Будапешт, округ XI - ортофото 2017"
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr "Шошкут, Пустазамор, Тарнок, Діошд - ортофото 2017"
+
+msgid "5 cm resolution bald image of 4 settlement"
+msgstr "Знімки 5 см без забарвлення 4-х поселень"
msgid "OpenStreetMap Hungary (hiking routes)"
msgstr "OpenStreetMap Угорщина (піші туристичні маршрути)"
@@ -17209,6 +17429,16 @@ msgstr "Аерофото PDOK 25 см (WMTS)"
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr "Шпіцберген - ортофото 2009/2011 EPSG:25833"
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr "imagico.de - знімки OSM для мапінгу: мозаїка Шпіцбергену"
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+"Sentinel-2 мозаїка Шпіцбергену, переважно Sentinel-2 2016 канали 234 (true "
+"color),"
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr "imagico.de - знімки OSM для мапінгу: Західний Каракорум"
@@ -17240,8 +17470,8 @@ msgstr ""
"imagico.de - знімки OSM для мапінгу: гори Вільканота та Крижана шапка "
"Куелччая"
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
-msgstr "Пангасінан/Булакан (Філіппіни HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: ортофото"
@@ -17390,6 +17620,16 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr "imagico.de - знімки OSM для мапінгу: космодром Східний (Восточний)"
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr "imagico.de - знімки OSM для мапінгу: узбережжя Печорського моря"
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+"канали 234 (true color), знімки Sentinel-2 узбережжя Печорського моря осінь "
+"2016"
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Автомобільна"
@@ -17465,6 +17705,9 @@ msgstr "Кантон Аргау 25 см (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Кантон Аргау 25 см (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr "Кантон Аргау 25см (AGIS 2016)"
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr "Кантон Цюрих - ортофото 2014/2015 10см"
@@ -17481,10 +17724,10 @@ msgid "Stadt Zürich Luftbild 2011"
msgstr "Місто Цюрих Вид з повітря 2011"
msgid "Canton Solothurn latest aerial imagery SOGIS RGB"
-msgstr ""
+msgstr "Кантон Золотурн - останні аерофотознімки SOGIS RGB"
msgid "Canton Solothurn latest aerial imagery SOGIS Infrared"
-msgstr ""
+msgstr "Кантон Золотурн останні аерофотознімки SOGIS ІЧ"
msgid "Canton de Génève 5cm (SITG 2011)"
msgstr "Кантон Женева 5 см (SITG 2011)"
@@ -17571,33 +17814,78 @@ msgstr "TIGER 2012 шар доріг"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr "Нові та неперевірені дороги TIGER (2015)"
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Ділянки"
msgid "NC Latest Orthoimagery"
msgstr "Північна Кароліна: останні ортознімки"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr "Дороги лісової служби США"
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr "imagico.de - знімки OSM для мапінгу: діапазон Аляски"
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr "NJ 2015 аерофото (інфрачервоний діапазон)"
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr "NJ 2015 аерофото (природні кольори)"
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr "Міська агломерація Сан-Хуан: ортофото USACE 2013"
msgid "WA 2013 aerial imagery for San Juan County"
-msgstr "Графство Сан-Хуан (Вашингтон) - аерофото 2013"
+msgstr "Округ Сан-Хуан (Вашингтон) - аерофото 2013"
+
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr "Округ Сан-Хуан (Вашингтон) - аерофото 2016"
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+"Знімки, що є громадським надбанням, були зроблені в травні, червні, липні в "
+"Сан-Хуан (Вашингтон), та мають розподільчу здатність 6 дюймів."
msgid "WA Vector Streetmap for San Juan County"
msgstr "Сан-Хуан (Вашингтон) векторна мапа вулиць"
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr "Техас ортофото"
@@ -17607,12 +17895,25 @@ msgstr "Филадельфия – знімки 2015"
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr "MD Свіжі 6 дюймі аерофото"
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr "Меріленд: знімки 3 дюйми"
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr "Меріленд: базова мапа транспорту"
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr "Делавер - ортофото 2012"
@@ -17944,9 +18245,11 @@ msgstr ""
"для полегшення мапінгу будівель з фонового шару. Оптимізовано для basemap.at."
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
+"Автоматично присвоює адреси виділеним обʼєктам в Австрії. Дані: © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgid ""
"Allows the user to correct angle of buildings to 90 degrees, and aligns all "
@@ -17997,7 +18300,7 @@ msgstr ""
"circle тощо)"
msgid "Tool for conflating data (matching and merging)."
-msgstr ""
+msgstr "Інструмент для обʼєднання даних (пошук збігів та їх поєднання)"
msgid "Downloads new data when you pan/zoom"
msgstr "Завантажує дані під час масштабування/пересування мапою"
@@ -18124,9 +18427,6 @@ msgstr ""
"База даних зміщень фонових зображень: поширення та встановлення зміщень "
"фонових зображень однією кнопкою."
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "WMSPlugin-подібний втулок для підлаштування фонового зображення"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18146,6 +18446,9 @@ msgid ""
"Extends ImproveWayAccuracy mode with helpers to place nodes at accurate "
"distances and angles."
msgstr ""
+"Розширює можливості інструмента ImproveWayAccuracy (покращення точності "
+"ліній), засобами для розташування точок з дотриманням певної відстані та "
+"кутів між ними."
msgid "This plugin simplifies the mapping and editing of indoor corridors."
msgstr ""
@@ -18367,6 +18670,9 @@ msgid ""
"Expand a simple intersection to a roundabout in gradual steps. Select an "
"intersection node or a roundabout and press Crtl-Shift-R"
msgstr ""
+"Поступово перетворює просте перехрестя в перехрестя з круговим рухом. "
+"Виділіть точку перехрестя або перехрестя з круговим рухом та натискайте "
+"Ctrl+Shift+R"
msgid ""
"Plugin for tagging of objects based on a selection of road signs. The dialog "
@@ -20149,26 +20455,33 @@ msgstr "Велодоріжка/Смуга"
msgid "Cycleway"
msgstr "Велодоріжка"
+msgctxt "cycleway"
msgid "lane"
msgstr "смуга"
+msgctxt "cycleway"
msgid "track"
-msgstr "бігова доріжка"
+msgstr "доріжка"
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "зворотня_смуга"
+msgstr "смуга в протилежному напрямку"
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "зворотній_трек"
+msgstr "доріжка в протилежному напрямку"
+msgctxt "cycleway"
msgid "opposite"
-msgstr "зворотній напрямок"
+msgstr "в протилежному напрямку"
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "разом з автобусами"
+msgstr "разом з громадським транспортом"
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "спільна смуга"
+msgstr "суміщена смуга"
msgid "Cycleway left"
msgstr "Велодоріжка ліворуч"
@@ -21343,6 +21656,9 @@ msgstr "Членська картка"
msgid "Wash"
msgstr "Мийка"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Автомобільний дилер"
@@ -23158,10 +23474,6 @@ msgid "garages"
msgstr "гаражі"
msgctxt "building"
-msgid "industrial"
-msgstr "промисловість"
-
-msgctxt "building"
msgid "school"
msgstr "школа"
@@ -24564,6 +24876,21 @@ msgstr "палац"
msgid "Archaeological Site"
msgstr "Археологічні пам’ятки"
+msgid "tumulus"
+msgstr "курган"
+
+msgid "megalith"
+msgstr "мегаліт"
+
+msgid "fortification"
+msgstr "військове укріплення"
+
+msgid "settlement"
+msgstr "поселення"
+
+msgid "necropolis"
+msgstr "некрополь"
+
msgid "Battlefield"
msgstr "Поле бою"
@@ -25321,7 +25648,7 @@ msgid "Region"
msgstr "Область"
msgid "County"
-msgstr "Район"
+msgstr "Округ"
msgid "City"
msgstr "Місто (понад 100 000)"
@@ -26130,6 +26457,21 @@ msgstr "Адміністративний центр"
msgid "Label point"
msgstr "Мітка з назвою"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "Місцевість"
@@ -26842,7 +27184,7 @@ msgstr ""
"обʼєктів використовуйте {1} + {2}."
msgid "node connects highway and building"
-msgstr ""
+msgstr "точка приєднує дорогу до будівлі"
msgid "abbreviated street name"
msgstr "скорочене позначення вулиці"
@@ -26989,53 +27331,68 @@ msgid ""
"wikipedia tag has no language given, use ''wikipedia''=''language:page "
"title''"
msgstr ""
+"у теґа wikipedia не вказано мову, використовуйте формат ''wikipedia'' = "
+"''код мови:назва сторінки''"
msgid "wikipedia tag has an unknown language prefix"
-msgstr ""
+msgstr "у теґа wikipedia вказано невідомий префікс мови"
msgid "wikipedia tag format is deprecated"
-msgstr ""
+msgstr "застарілий формат теґу wikipedia"
msgid "''wikipedia''=''language:page title''"
msgstr "''wikipedia''=''мова:назва сторінки''"
msgid "wikipedia ''{0}'' language is obsolete, use ''{1}'' instead"
msgstr ""
+"мовний код \"{0}\" теґу wikipedia є застарілим, використовуйте \"{1}\" "
+"замість нього"
msgid "wikipedia ''{0}'' language is invalid, use ''{1}'' instead"
msgstr ""
+"мовний код \"{0}\" теґу wikipedia є помилковим, використовуйте \"{1}\" "
+"замість нього"
msgid "{0} tag should not have URL-encoded values like ''%27''"
msgstr ""
+"значення теґу {0} не повинно містити URL-кодованих символів, наприклад "
+"\"%27\""
msgid "wikipedia title should not start with a space after language code"
msgstr ""
+"Назва сторінки у Вікіпедії не повинна відокремлюватись пробілом від коду мови"
msgid "wikipedia title should not have ''{0}'' prefix"
-msgstr ""
+msgstr "Назва сторінки у Вікіпедії не повинна мати префікс \"{0}\""
msgid "wikipedia page title should have first letter capitalized"
-msgstr ""
+msgstr "Назва сторінки у Вікіпедії повинна починатись з великої літери"
msgid ""
"wikipedia page title should have spaces instead of underscores (''_''→'' '')"
msgstr ""
+"Назва сторінки у Вікіпедії повинна мати пробіли замість символів "
+"підкреслювання (\"_\"→\" \")"
msgid "wikipedia language seems to be duplicated, e.g. en:en:Foo"
-msgstr ""
+msgstr "Дублювання коду мови в значені теґа wikipedia – en:en:Foo"
msgid "wikidata tag must be in Qnnnn format, where n is a digit"
-msgstr ""
+msgstr "Формат теґу wikidata – Qnnn, де n – цифри"
msgid ""
"wikipedia tag is set, but there is no wikidata tag. Wikipedia plugin might "
"help with wikidata id lookups"
msgstr ""
+"теґ wikipedia встановлено, але відсутній теґ wikidata. Втулок wikipedia може "
+"допомогти з пошуком ідентифікатора Вікіданих"
msgid ""
"wikipedia tag is not set, but a ''{0}'' tag is. Make sure to use "
"wikipedia=language:value together with wikidata tag."
msgstr ""
+"теґ wikipedia не встановлено, проте є теґ \"{0}\". Переконайтесь, що ви "
+"використовуєте wikipedia=код мови:назва сторінки разом з wikidata"
msgid "Hide icons at low zoom"
msgstr "Приховувати значки на малому масштабі"
@@ -27669,10 +28026,10 @@ msgid "images"
msgstr "знімків"
msgid "Mapillary object layer"
-msgstr ""
+msgstr "Шар обʼєктів Mapillary"
msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
+msgstr "Показує шар з обʼєктами, що були виявлені Mapillary"
msgid "Mapillary"
msgstr "Mapillary"
@@ -27704,15 +28061,6 @@ msgstr "Імпортувати локальні знімкки"
msgid "Import pictures into Mapillary layer"
msgstr "Імпортувати знімки до шару Mapillary"
-msgid "Select pictures"
-msgstr "Виберіть знімки"
-
-msgid "Import pictures into sequence"
-msgstr "Імпорт зображень з послідовності"
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "Імпорт зображень в шар Mapillary з послідовності"
-
msgid "Join mode"
msgstr "Режим з’єднування"
@@ -27863,7 +28211,7 @@ msgid "No image selected"
msgstr "Не обрано жодного зображення"
msgid "Press \"{0}\" to download images"
-msgstr ""
+msgstr "Натисніть \"{0}\" для завантаження зображень"
msgid "Mapillary picture"
msgstr "Знімок Mapillary"
@@ -27924,7 +28272,7 @@ msgid "Preview images when hovering its icon"
msgstr "Попередній перегляд зображень при наведенні курсору на їх значок"
msgid "Cut off sequences at download bounds"
-msgstr ""
+msgstr "Обмежити послідовність межами завантаженої ділянки"
msgid "Download mode"
msgstr "Режим завантаження"
@@ -27960,6 +28308,43 @@ msgstr "Йти за виділеним знімком"
msgid "Go forward"
msgstr "Вперед"
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "Імпортувати"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr "Теґ з ключем <i>{0}</i> вже присутній у виділеного обʼєкта OSM."
@@ -28001,6 +28386,9 @@ msgstr "Відомості про зображення"
msgid "Displays detail information on the currently selected Mapillary image"
msgstr "Показує докладну інформацію про поточний знімок Mapillary"
+msgid "Show detections on top of image"
+msgstr "Показувати виявлені образи поверх зображення"
+
msgid "View in browser"
msgstr "Подивитись в оглядачі"
@@ -28010,6 +28398,9 @@ msgstr "Копіювати ключ"
msgid "Add Mapillary tag"
msgstr "Додати теґ Mapillary"
+msgid "Image detections"
+msgstr "Розпізнавання образів"
+
msgid "Image actions"
msgstr "Дії над знімком"
@@ -28019,20 +28410,38 @@ msgstr "Ключ знімка"
msgid "Sequence key"
msgstr "Ключ послідовності"
+msgid "{0} detections"
+msgstr "{0} образів"
+
msgid "image has no key"
msgstr "знімок не має ключа"
+msgid "unknown user"
+msgstr "невідомий користувач"
+
msgid "sequence has no key"
msgstr "послідовність не має ключа"
msgid "Could not open the URL {0} in a browser"
msgstr "Не можливо відкрити URL {0} в оглядачі"
+msgid "Downloading map objects…"
+msgstr "Завантаження обʼєктів мапи…"
+
+msgid "All map objects loaded."
+msgstr "Всі обʼєкти мапи завантажено."
+
+msgid "Too many map objects, zoom in to see all."
+msgstr "Забагато обʼєктів, треба наблизитись, щоб побачити їх всі."
+
+msgid "Downloading map objects failed!"
+msgstr "Збій завантаження обʼєктів мапи!"
+
msgid "Mapillary objects"
-msgstr ""
+msgstr "Обʼєкти Mapillary"
msgid "Displays objects detected by Mapillary from their street view imagery"
-msgstr ""
+msgstr "Показує обʼєкти, які були виявлені Mapillary на їх знімках"
msgid "Deleted {0} image"
msgid_plural "Deleted {0} images"
@@ -28064,8 +28473,17 @@ msgstr[2] "Обернуто {0} зображень"
msgid "2 images unjoined"
msgstr "2 зображення роз’єднано"
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr "Неможливо зчитати за посиланням URL {0}!"
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
+"{0}\n"
+"Не вийшло отримати обʼєкти мапи за посиланням URL\n"
+"{1}!"
msgid "everything in the visible area"
msgstr "все, що є у видимій області"
@@ -28083,9 +28501,6 @@ msgstr ""
"Завантажена ділянка з даними OSM завелика. Режим завантаження змінено до "
"ділянки даних з OSM до наступного перезапуску шару."
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr "Завантаження"
@@ -28891,22 +29306,25 @@ msgstr ""
"В режимі відлагодження будут створені зображення для кожного кроку оробки."
msgid "Fetch Address"
-msgstr ""
+msgstr "Отримати адресу"
msgid "Austria Address Helper<br>Please select exactly one object."
-msgstr ""
+msgstr "Austria Address Helper<br>Будь ласка, оберіть тільки один обʼєкт."
msgid "Austria Address Helper"
-msgstr ""
+msgstr "Austria Address Helper"
msgid "Successfully added address to selected object:"
-msgstr ""
+msgstr "Адресу було додано до виділеного обʼєкта:"
+
+msgid "Distance between building center and address coordinates:"
+msgstr "Відстань між центром будівлі та координатами адреси:"
msgid "No address was found for this object."
-msgstr ""
+msgstr "Для цього обʼєкта адресу не знайдено."
msgid "An unexpected exception occurred:"
-msgstr ""
+msgstr "Виникла неочікувана помилка:"
msgid "Building Generalization"
msgstr "Узагальнення будівель"
@@ -29699,7 +30117,7 @@ msgid "Conflation: {0}"
msgstr "Злиття: {0}"
msgid "Conflate {0} objects"
-msgstr ""
+msgstr "Обʼєднати {0} обʼєктів"
msgid "Conflate ({0})"
msgstr "Обʼєднати ({0})"
@@ -29742,102 +30160,144 @@ msgstr[2] "Додано {0} об’єктів до підлеглого шару
msgid "Moved {0} conflation match to unmatched list"
msgid_plural "Moved {0} conflation matches to unmatched list"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} збіг переміщено до переліку невідповіднестей"
+msgstr[1] "{0} збіги переміщено до переліку невідповіднестей"
+msgstr[2] "{0} збігв переміщено до переліку невідповіднестей"
msgid "Delete {0} conflation match"
msgid_plural "Delete {0} conflation matches"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} збіг вилучено"
+msgstr[1] "{0} збіги вилучено"
+msgstr[2] "{0} збігів вилучено"
msgid "Remove {0} unmatched objects"
msgstr "Вилучити {0} об’єктів, що не мають збігів"
msgid "Interrupted Sequence ({0}/{1}): {2}"
-msgstr ""
+msgstr "Перервана послідовність ({0}/{1}): {2}"
msgid " Max: "
-msgstr ""
+msgstr " Макс: "
msgid "Filter by area. Min: "
-msgstr ""
+msgstr "Фільтр за площею. Мін.: "
msgid "Filter by window. Buffer: "
-msgstr ""
+msgstr "Фільтрувати по вікну. Буфер: "
msgid "Union up to "
-msgstr ""
+msgstr "Приєднувати до "
msgid " adjacent Reference features"
-msgstr ""
+msgstr " суміжні Еталоні обʼєкти"
msgid "Weight"
msgstr "Вага"
msgid "Standard Distance"
-msgstr ""
+msgstr "Звичайна відстань"
msgid "below"
-msgstr ""
+msgstr "менше"
msgid "Maximum Distance"
-msgstr ""
+msgstr "Максимальна відстань"
msgid "Centroid Distance"
-msgstr ""
+msgstr "Відстань між центроїдами"
msgid "Hausdorff Distance (Centroids Aligned)"
-msgstr ""
+msgstr "Відстань Гаусдорфа (між впорядкованими центроїдами)"
msgid "Symmetric Difference"
-msgstr ""
+msgstr "Симетрична різниця"
msgid "Symmetric Difference (Centroids Aligned)"
-msgstr ""
+msgstr "Симетрична різниця (між впорядкованими центроїдами)"
msgid "Compactness"
-msgstr ""
+msgstr "Щільність"
msgid "Angle Histogram. Bins: "
-msgstr ""
+msgstr "Кутова гістограма. Діапазони: "
msgid "Tags (Exact Match): "
-msgstr ""
+msgstr "Теґи (Точний збіг): "
msgid "Tags (Levenshtein Distance): "
-msgstr ""
+msgstr "Теґи (відстань Левенштейна): "
msgid "List of tags to match"
-msgstr ""
+msgstr "Перелік теґів для порівняння"
+
+msgid "Identical Elements Filter"
+msgstr "Фільтр пошуку ідентичних елементів"
+
+msgid "Avoid matching an element with itself"
+msgstr "Запобігає порівнюванню елемента з самим собою"
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
"used to weed out very small and very large features."
msgstr ""
+"Фільтрація дозволить прискорити процес пошуку збігів. Фільтр по Вікну "
+"відсіює збіги між обʼєктами, чиї огинаючи не перекривають одна іншу. Фільтр "
+"за площею використовується для відсіювання дуже маленьких та дуже великих "
+"обʼєктів"
msgid ""
"Better matches may be found by creating temporary unions of features sharing "
"a common edge."
msgstr ""
+"Кращі результати можна отримати шляхом тимчасових обʼєднань обʼєктів зі "
+"спільними сторонами."
msgid "Matching"
-msgstr ""
+msgstr "Порівняння"
msgid "Filtering"
-msgstr ""
+msgstr "Фільтрування"
msgid "Unioning"
+msgstr "Поєднання"
+
+msgid "Programming"
+msgstr "Програмування"
+
+msgid "Replace Geometry"
+msgstr "Замінити геометрію"
+
+msgid "Merge Tags"
+msgstr "Обʼєднати теґи:"
+
+msgid "List of tags to merge"
+msgstr "Перелік теґів для злиття"
+
+msgid "except"
+msgstr "за винятком"
+
+msgid "List of tags to NOT merge (they will be ignored)"
+msgstr "Перелік теґів, які НЕ треба зливати (вони будуть проігноровані)"
+
+msgid "Overwrite tags without confirmation"
+msgstr "Замінювати теґи без підтвердження"
+
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
+"Перелік теґів, які будуть перезаписані у разі конфлікту зі зразковим шаром, "
+"без отримання підтвердження"
msgid "Simple Example"
-msgstr ""
+msgstr "Простий приклад"
msgid "Advanced Example"
-msgstr ""
+msgstr "Складний приклад"
msgid "<Please select data>"
-msgstr ""
+msgstr "<Виберіть дані>"
msgid "Configure conflation settings"
msgstr "Налаштування параметрів злиття"
@@ -29845,32 +30305,14 @@ msgstr "Налаштування параметрів злиття"
msgid "Generate matches"
msgstr "Знайти збіги"
-msgid "Reference:"
-msgstr ""
-
-msgid "Subject:"
-msgstr ""
-
-msgid "Programming"
-msgstr ""
-
msgid "Merging"
-msgstr ""
-
-msgid "Replace Geometry"
-msgstr "Замінити геометрію"
-
-msgid "Merge Tags"
-msgstr ""
-
-msgid "List of tags to merge"
-msgstr ""
+msgstr "Злиття"
-msgid "Overwrite tags without confirmation"
-msgstr ""
+msgid "Reference:"
+msgstr "Зразок:"
-msgid "List of tags to overwrite without confirmation"
-msgstr ""
+msgid "Subject:"
+msgstr "Підмет:"
msgid "Selections must be made for both reference and subject."
msgstr "Потрібно виділити основний та підлеглий об’єкти"
@@ -29902,26 +30344,33 @@ msgstr "Нічого не виділено"
msgid "Freeze reference selection"
msgstr "Зафіксувати виділення в довідковому шарі"
-msgid "Disambiguating"
+msgid "Reference and subject sets should better be different."
+msgstr "Набори зразків та підметів повинні відрізнятись"
+
+msgid "Relations are not supported yet, please do not select them."
msgstr ""
+"Звʼязки поки що не підтримуються, будь ласка, не включайте їх в перелік."
+
+msgid "Disambiguating"
+msgstr "Усунення неоднозначностей"
msgid "One to One"
-msgstr ""
+msgstr "Один до одного"
msgid "Distance"
-msgstr ""
+msgstr "Відстань"
msgid "Standard"
-msgstr ""
+msgstr "Стандартне"
msgid "Centroid"
-msgstr ""
+msgstr "Центроїд"
msgid "Hausdorff"
-msgstr ""
+msgstr "Гаусдорф"
msgid "List of tags to match (default: none)"
-msgstr ""
+msgstr "Перелік теґів для порівняння (типово: немає)"
msgid "Download OSM data continuously"
msgstr "Безперервно завантажувати дані з OSM"
@@ -30302,9 +30751,6 @@ msgstr "Імпорт Globalsat"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Імпорт даних з Globalsat Datalogger DG100 у шар GPX."
-msgid "Import"
-msgstr "Імпортувати"
-
msgid "GPS Blams"
msgstr "GPS \"бах!\""
@@ -30818,9 +31264,6 @@ msgstr "Завантаження зсуву фону…"
msgid "Error processing XML response: {0}"
msgstr "Помилка обробки XML-відповіді: {0}"
-msgid "Offset"
-msgstr "Зсув"
-
msgid "Imagery Offset Database"
msgstr "База зсувів знімків"
@@ -30955,24 +31398,6 @@ msgstr "Надсилання нового зсуву…"
msgid "This string should be 3 to 200 letters long."
msgstr "Цей рядок повинен бути від 3 до 200 знаків в довжину."
-msgid "Adjust imagery"
-msgstr "Підлаштувати фон"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Налаштування положення вибраного фонового шару"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Будь ласка, оберіть шар для налаштування."
-
-msgid "Start adjusting"
-msgstr "Почати налаштування"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "Відсутній шар з фоновим зображенням для налаштування."
-
-msgid "No layers to adjust"
-msgstr "Відсутні шари для налаштування"
-
msgid "Normal"
msgstr "Звичайний"
@@ -30985,12 +31410,21 @@ msgstr "Повернути на 180°"
msgid "Rotate 270"
msgstr "Повернути на 270°"
-msgid "Previous image"
-msgstr "Попереднє зображення"
+msgid "WayPoint Image"
+msgstr "Зображення з маршрутної точки"
+
+msgid "Display non-geotagged photos"
+msgstr "Показати фотографії, що не мають координат"
+
+msgid "Imported Images"
+msgstr "Імпортовані зображення"
msgid "Next image"
msgstr "Наступне зображення"
+msgid "Previous image"
+msgstr "Попереднє зображення"
+
msgid "Rotate left"
msgstr "Повернути вліво"
@@ -31003,15 +31437,6 @@ msgstr "Повернути вправо"
msgid "Rotate image right"
msgstr "Повернути зображення праворуч"
-msgid "WayPoint Image"
-msgstr "Зображення з маршрутної точки"
-
-msgid "Display non-geotagged photos"
-msgstr "Показати фотографії, що не мають координат"
-
-msgid "Imported Images"
-msgstr "Імпортовані зображення"
-
msgid "Import vector graphics"
msgstr "Імпорт векторної графіки"
@@ -31019,31 +31444,31 @@ msgid "SVG files [ImportVec plugin] (*.svg)"
msgstr "Файли SVG [втулок ImportVec] (*.svg)"
msgid "Improve Way"
-msgstr ""
+msgstr "Покращення Ліній"
msgid "Improve Way mode"
-msgstr ""
+msgstr "Режим покращення ліній"
msgid "Mode: Enable way accuracy helpers"
-msgstr ""
+msgstr "Режим: увімкнути помічників"
msgid "improve way accuracy helper turn angle text"
-msgstr ""
+msgstr "помічник, що показує величину кута"
msgid "improve way accuracy helper distance text"
-msgstr ""
+msgstr "помічник, що показує відстань"
msgid "improve way accuracy helper arc fill"
-msgstr ""
+msgstr "помічник, що показує заливку дуг"
msgid "improve way accuracy helper arc stroke"
-msgstr ""
+msgstr "помічник, що показує контури дуг"
msgid "improve way accuracy helper perpendicular line"
-msgstr ""
+msgstr "помічник, що показує перпендикуляри"
msgid "improve way accuracy helper equal angle circle"
-msgstr ""
+msgstr "помічник, що показує однакові кути, вписані в коло"
msgid "Concourse wizard ..."
msgstr "Майстер вестибюлів …"
@@ -33238,9 +33663,6 @@ msgstr "Приєднати"
msgid "Public Transport: Join GTFS stops"
msgstr "Громадський транспорт: Приєднати зупинки GTFS"
-msgid "Id"
-msgstr "Ід."
-
msgid "State"
msgstr "Штат"
@@ -33662,10 +34084,10 @@ msgstr ""
"позиції ({1},{2}). Пропускаємо."
msgid "Create Roundabout"
-msgstr ""
+msgstr "Створити кільце"
msgid "Roundabout Expander"
-msgstr ""
+msgstr "Перетворення в кільце"
msgid "Road Sign Plugin"
msgstr "Втулок Дорожні знаки"
diff --git a/i18n/po/ur.po b/i18n/po/ur.po
index eb36d33..200713c 100644
--- a/i18n/po/ur.po
+++ b/i18n/po/ur.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2010-05-13 04:15+0000\n"
"Last-Translator: Shoaib Mirza <Unknown>\n"
"Language-Team: Urdu <ur at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:15+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:12+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: ur\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3305,6 +3305,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3313,6 +3316,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3977,6 +3985,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4033,6 +4044,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9011,46 +9025,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9165,7 +9182,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9279,9 +9302,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9292,8 +9312,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9455,16 +9478,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9594,12 +9607,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9759,6 +9782,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11175,15 +11228,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11232,6 +11276,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12407,6 +12454,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13549,6 +13599,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13747,9 +13800,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14453,6 +14503,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14464,6 +14522,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14476,6 +14546,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14831,6 +14925,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14933,6 +15035,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14984,10 +15089,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15020,6 +15125,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15072,6 +15252,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15218,6 +15404,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15257,6 +15449,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15281,6 +15481,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15325,34 +15528,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15493,6 +15705,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15521,7 +15741,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15670,6 +15890,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15745,6 +15973,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15850,33 +16081,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15886,12 +16160,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16210,8 +16497,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16352,9 +16639,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18259,24 +18543,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19449,6 +19740,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21264,10 +21558,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22668,6 +22958,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24209,6 +24514,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25705,15 +26025,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25955,6 +26266,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25990,6 +26338,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25999,6 +26350,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26008,15 +26362,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26049,7 +26421,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26066,9 +26444,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26761,6 +27136,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27599,6 +27977,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27619,46 +28003,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27691,6 +28083,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28066,9 +28464,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28553,9 +28948,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28674,42 +29066,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28722,15 +29105,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30823,9 +31197,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/vi.po b/i18n/po/vi.po
index cce7452..e3bc025 100644
--- a/i18n/po/vi.po
+++ b/i18n/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2015-05-14 20:17+0000\n"
"Last-Translator: Mạnh <laituanmanh32 at gmail.com>\n"
"Language-Team: Vietnamese <vi at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:16+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:13+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: vi\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3512,6 +3512,9 @@ msgstr "chiếu"
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3520,6 +3523,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -4222,6 +4230,9 @@ msgstr "Thử nghiệm này nếu multipolygons là hợp lệ."
msgid "Area style way is not closed"
msgstr "phong cách Area cách là không đóng cửa"
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "Không có cách nào ngoài cho multipolygon"
@@ -4281,6 +4292,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr "Không có vai trò hữu ích cho thành viên multipolygon"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "Non-Way trong multipolygon"
@@ -9608,46 +9622,49 @@ msgid "{0} object to delete:"
msgid_plural "{0} objects to delete:"
msgstr[0] "{0} đối tượng để xóa:"
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
+msgstr "Offset"
+
+msgid "Tile download projection"
msgstr ""
-msgid "Metadata "
+msgid "Tile display projection"
msgstr ""
-msgid "Load tile"
+msgid "Current zoom"
msgstr ""
-msgid "Auto zoom"
+msgid "Show tile info"
msgstr ""
-msgid "Auto load tiles"
-msgstr "gạch tải Auto"
+msgid "Tile Info"
+msgstr ""
-msgid "Show errors"
+msgid "Tile name"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile size"
msgstr ""
-msgid "Zoom to native resolution"
-msgstr "Zoom để độ phân giải gốc"
+msgid "Tile display size"
+msgstr ""
-msgid "Change resolution"
-msgstr "Thay đổi độ phân giải"
+msgid "Reprojection"
+msgstr ""
-msgid "Increase zoom"
-msgstr "Tăng zoom"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "Giảm zoom"
+msgid "Metadata "
+msgstr ""
-msgid "Flush tile cache"
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9758,8 +9775,14 @@ msgstr[0] "{0} theo dõi, "
msgid "Save GPX file"
msgstr "Lưu tập tin GPX"
-msgid "Imagery fade"
-msgstr "Hình tượng phai"
+msgid "Id"
+msgstr "Id"
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
+msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr ""
@@ -9874,9 +9897,6 @@ msgstr ""
msgid "Save OSM file"
msgstr "Lưu tập tin OSM"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "EPSG: 4326 và Mercator chiếu được hỗ trợ"
-
msgid "Validation errors"
msgstr "lỗi Validation"
@@ -9887,8 +9907,11 @@ msgid "Set WMS Bookmark"
msgstr "Đặt WMS Bookmark"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -10058,20 +10081,6 @@ msgstr "Bạn nên chọn một ca khúc GPX"
msgid "No selected GPX track"
msgstr "Không có lựa chọn GPX theo dõi"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"Lỗi trong khi phân tích múi giờ. \n"
-"Định dạng dự kiến: {0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"Lỗi khi phân tích cú pháp bù đắp. \n"
-"Định dạng dự kiến: {0}"
-
msgid "Geotagged Images"
msgstr "Những hình ảnh gắn thẻ địa lý"
@@ -10210,12 +10219,26 @@ msgstr ""
"\n"
"Thời gian GPS: {0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"Lỗi khi phân tích cú pháp bù đắp. \n"
+"Định dạng dự kiến: {0}"
+
msgid "Show thumbnails"
msgstr "Hiển thị hình thu nhỏ"
msgid "Show image thumbnails instead of icons."
msgstr "Hiển thị ảnh thu nhỏ thay vì biểu tượng."
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"Lỗi trong khi phân tích múi giờ. \n"
+"Định dạng dự kiến: {0}"
+
msgid "Choose visible tracks"
msgstr "Chọn bài hát có thể nhìn thấy"
@@ -10391,6 +10414,36 @@ msgstr "Markers Từ điểm đặt tên"
msgid "Named Trackpoints from {0}"
msgstr "Đặt tên trên đoạn đường từ {0}"
+msgid "Auto load tiles"
+msgstr "gạch tải Auto"
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr "Giảm zoom"
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr "Tăng zoom"
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr "Thay đổi độ phân giải"
+
+msgid "Zoom to native resolution"
+msgstr "Zoom để độ phân giải gốc"
+
msgid "gps marker"
msgstr "gps marker"
@@ -11949,15 +12002,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr "hình ảnh mờ dần"
-
-msgid "Fade Color: "
-msgstr "Fade Color: "
-
-msgid "Fade amount: "
-msgstr "số tiền Fade: "
-
msgid "Soft"
msgstr "Soft"
@@ -12006,6 +12050,9 @@ msgstr "Hình ảnh Background: Default"
msgid "Available default entries:"
msgstr "mục mặc định sẵn:"
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "mục chọn:"
@@ -13269,6 +13316,9 @@ msgstr "Tùy chọn thuộc tính:"
msgid "Unknown requisite: {0}"
msgstr "điều kiện tiên quyết Unknown: {0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "biểu thành viên bất hợp pháp: {0}"
@@ -14530,6 +14580,9 @@ msgstr "thay thế bằng mới {0} plugin"
msgid "no longer required"
msgstr "không còn cần thiết"
+msgid "Plugin information"
+msgstr "Plugin thông tin"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -14751,9 +14804,6 @@ msgid ""
msgstr ""
"Các plugin đã được gỡ bỏ ra. Hãy khởi động lại JOSM tớiDỡ bỏ các plugin."
-msgid "Plugin information"
-msgstr "Plugin thông tin"
-
msgid "no description available"
msgstr "không có mô tả"
@@ -15584,6 +15634,14 @@ msgid "farmland"
msgstr "đất nông nghiệp"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "dân cư"
@@ -15595,6 +15653,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr "chà"
@@ -15607,6 +15677,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "công nghiệp"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "associatedStreet"
@@ -15962,6 +16056,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -16064,6 +16166,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -16115,10 +16220,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -16151,6 +16256,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr "Geobase Thủy"
@@ -16203,6 +16383,12 @@ msgstr "Czech Ruian parcely"
msgid "Czech pLPIS"
msgstr "Czech pLPIS"
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr "Geodatastyrelsen (Đan Mạch)"
@@ -16351,6 +16537,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -16390,6 +16582,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -16414,6 +16614,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -16458,34 +16661,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -16626,6 +16838,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -16654,8 +16874,8 @@ 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ê)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
+msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
msgstr "Geoportal 2: Ortofotomapa (hình ảnh trên không)"
@@ -16803,6 +17023,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk Car"
@@ -16878,6 +17106,9 @@ msgstr "Kanton Aargau 25cm (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr "Kanton Aargau 25cm (AGIS 2014)"
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -16983,33 +17214,76 @@ msgstr "TIGER 2012 Đường Overlay"
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr "MassGIS L3 Bưu kiện"
msgid "NC Latest Orthoimagery"
msgstr "NC Orthoimagery mới nhất"
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
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 ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -17019,12 +17293,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -17350,8 +17637,8 @@ msgstr ""
"basemap.at."
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -17519,9 +17806,6 @@ msgstr ""
"Cơ sở dữ liệu của offsets hình ảnh: chia sẻ hình ảnh và aquire offsets với "
"mộtNút"
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr "điều chỉnh hình ảnh theo phong cách WMSPlugin mapmode"
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -19522,26 +19806,33 @@ msgstr "Cycle Lane / Track"
msgid "Cycleway"
msgstr "Cycleway"
+msgctxt "cycleway"
msgid "lane"
-msgstr "lane"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "theo dõi"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "opposite_lane"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "opposite_track"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
-msgstr "đối diện"
+msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "share_busway"
+msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "shared_lane"
+msgstr ""
msgid "Cycleway left"
msgstr "Cycleway trái"
@@ -20718,6 +21009,9 @@ msgstr ""
msgid "Wash"
msgstr "Rửa"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "Car Dealer"
@@ -22535,10 +22829,6 @@ msgid "garages"
msgstr "gara"
msgctxt "building"
-msgid "industrial"
-msgstr "công nghiệp"
-
-msgctxt "building"
msgid "school"
msgstr "trường học"
@@ -23941,6 +24231,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "Khảo cổ trang"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "Battlefield"
@@ -25505,6 +25810,21 @@ msgstr "Quản lý trung tâm"
msgid "Label point"
msgstr "Label điểm"
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "Site"
@@ -27047,15 +27367,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -27297,6 +27608,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "nhập khẩu"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -27332,6 +27680,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -27341,6 +27692,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -27350,15 +27704,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -27391,7 +27763,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -27408,9 +27786,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -28206,6 +28581,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -29106,6 +29484,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -29126,46 +29510,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
-msgstr ""
+msgid "Replace Geometry"
+msgstr "Thay thế Geometry"
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
-msgstr "Cấu hình cài đặt conflation"
+msgid "List of tags to merge"
+msgstr ""
-msgid "Generate matches"
-msgstr "Tạo ra các trận đấu"
+msgid "except"
+msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "Thay thế Geometry"
+msgid "Advanced Example"
+msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
+msgstr "Cấu hình cài đặt conflation"
+
+msgid "Generate matches"
+msgstr "Tạo ra các trận đấu"
+
+msgid "Merging"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -29199,6 +29591,12 @@ msgstr "lựa chọn Empty"
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -29582,9 +29980,6 @@ msgstr "Globalsat nhập khẩu"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "Nhập dữ liệu từ Globalsat Datalogger DG100 vào lớp GPX."
-msgid "Import"
-msgstr "nhập khẩu"
-
msgid "GPS Blams"
msgstr "GPS Blams"
@@ -30098,9 +30493,6 @@ msgstr "offsets tải hình ảnh ..."
msgid "Error processing XML response: {0}"
msgstr "phản ứng xử lý lỗi XML: {0}"
-msgid "Offset"
-msgstr "Offset"
-
msgid "Imagery Offset Database"
msgstr "Hình tượng offset Cơ sở dữ liệu"
@@ -30240,24 +30632,6 @@ msgstr "Tải lên mới bù đắp ..."
msgid "This string should be 3 to 200 letters long."
msgstr "Chuỗi này nên 3-200 ký tự."
-msgid "Adjust imagery"
-msgstr "Điều chỉnh hình ảnh"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "Điều chỉnh vị trí của lớp hình ảnh được lựa chọn"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "Hãy chọn layer hình ảnh để điều chỉnh."
-
-msgid "Start adjusting"
-msgstr "Bắt đầu điều chỉnh"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "Hiện tại không có lớp hình ảnh để điều chỉnh."
-
-msgid "No layers to adjust"
-msgstr "Không có lớp để điều chỉnh"
-
msgid "Normal"
msgstr "Normal"
@@ -30270,12 +30644,21 @@ msgstr "Rotate 180"
msgid "Rotate 270"
msgstr "Rotate 270"
-msgid "Previous image"
-msgstr "hình ảnh trước"
+msgid "WayPoint Image"
+msgstr "waypoint Image"
+
+msgid "Display non-geotagged photos"
+msgstr "Hiển thị hình ảnh không gắn thẻ địa lý"
+
+msgid "Imported Images"
+msgstr "hình ảnh nhập khẩu"
msgid "Next image"
msgstr "hình ảnh kế tiếp"
+msgid "Previous image"
+msgstr "hình ảnh trước"
+
msgid "Rotate left"
msgstr "Xoay trái"
@@ -30288,15 +30671,6 @@ msgstr "Rotate right"
msgid "Rotate image right"
msgstr "Xoay hình ảnh bên phải"
-msgid "WayPoint Image"
-msgstr "waypoint Image"
-
-msgid "Display non-geotagged photos"
-msgstr "Hiển thị hình ảnh không gắn thẻ địa lý"
-
-msgid "Imported Images"
-msgstr "hình ảnh nhập khẩu"
-
msgid "Import vector graphics"
msgstr "đồ họa vector nhập khẩu"
@@ -32477,9 +32851,6 @@ msgstr "Tham gia"
msgid "Public Transport: Join GTFS stops"
msgstr "Giao thông vận tải công cộng: Tham gia GTFS dừng lại"
-msgid "Id"
-msgstr "Id"
-
msgid "State"
msgstr "Nhà nước"
diff --git a/i18n/po/wae.po b/i18n/po/wae.po
index 37c2940..059a1ab 100644
--- a/i18n/po/wae.po
+++ b/i18n/po/wae.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL at ADDRESS>\n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2016-03-09 22:17+0000\n"
"Last-Translator: Simon Legner <Unknown>\n"
"Language-Team: Walser <wae at li.org>\n"
@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:22+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:18+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
@@ -3304,6 +3304,9 @@ msgstr ""
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3312,6 +3315,11 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
@@ -3976,6 +3984,9 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr ""
@@ -4032,6 +4043,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr ""
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr ""
@@ -9010,46 +9024,49 @@ msgid_plural "{0} objects to delete:"
msgstr[0] ""
msgstr[1] ""
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
+msgid "Offset"
msgstr ""
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
+msgid "Current zoom"
msgstr ""
-msgid "Auto load tiles"
+msgid "Show tile info"
msgstr ""
-msgid "Show errors"
+msgid "Tile Info"
msgstr ""
-msgid "Load all tiles"
+msgid "Tile name"
msgstr ""
-msgid "Load all error tiles"
+msgid "Tile URL"
msgstr ""
-msgid "Zoom to native resolution"
+msgid "Tile size"
msgstr ""
-msgid "Change resolution"
+msgid "Tile display size"
msgstr ""
-msgid "Increase zoom"
+msgid "Reprojection"
msgstr ""
-msgid "Decrease zoom"
+msgid "Reprojected tile size"
msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
+msgstr ""
+
+msgid "Load tile"
msgstr ""
msgid "Failed to create tile source"
@@ -9164,7 +9181,13 @@ msgstr[1] ""
msgid "Save GPX file"
msgstr ""
-msgid "Imagery fade"
+msgid "Id"
+msgstr ""
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
msgstr ""
msgid "Unsupported imagery type: {0}"
@@ -9278,9 +9301,6 @@ msgstr ""
msgid "Save OSM file"
msgstr ""
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr ""
@@ -9291,8 +9311,11 @@ msgid "Set WMS Bookmark"
msgstr ""
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9454,16 +9477,6 @@ msgstr ""
msgid "No selected GPX track"
msgstr ""
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-
msgid "Geotagged Images"
msgstr ""
@@ -9593,12 +9606,22 @@ msgid ""
"GPS time: {0}"
msgstr ""
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Show thumbnails"
msgstr ""
msgid "Show image thumbnails instead of icons."
msgstr ""
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+
msgid "Choose visible tracks"
msgstr ""
@@ -9758,6 +9781,36 @@ msgstr ""
msgid "Named Trackpoints from {0}"
msgstr ""
+msgid "Auto load tiles"
+msgstr ""
+
+msgid "Auto zoom"
+msgstr ""
+
+msgid "Decrease zoom"
+msgstr ""
+
+msgid "Flush tile cache"
+msgstr ""
+
+msgid "Increase zoom"
+msgstr ""
+
+msgid "Load all tiles"
+msgstr ""
+
+msgid "Load all error tiles"
+msgstr ""
+
+msgid "Show errors"
+msgstr ""
+
+msgid "Change resolution"
+msgstr ""
+
+msgid "Zoom to native resolution"
+msgstr ""
+
msgid "gps marker"
msgstr ""
@@ -11174,15 +11227,6 @@ msgstr ""
msgid "Object Count"
msgstr ""
-msgid "imagery fade"
-msgstr ""
-
-msgid "Fade Color: "
-msgstr ""
-
-msgid "Fade amount: "
-msgstr ""
-
msgid "Soft"
msgstr ""
@@ -11231,6 +11275,9 @@ msgstr ""
msgid "Available default entries:"
msgstr ""
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr ""
@@ -12406,6 +12453,9 @@ msgstr ""
msgid "Unknown requisite: {0}"
msgstr ""
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -13548,6 +13598,9 @@ msgstr ""
msgid "no longer required"
msgstr ""
+msgid "Plugin information"
+msgstr ""
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13746,9 +13799,6 @@ msgid ""
"unload the plugin."
msgstr ""
-msgid "Plugin information"
-msgstr ""
-
msgid "no description available"
msgstr ""
@@ -14452,6 +14502,14 @@ msgid "farmland"
msgstr ""
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr ""
@@ -14463,6 +14521,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr ""
@@ -14475,6 +14545,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr ""
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr ""
@@ -14830,6 +14924,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -14932,6 +15034,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -14983,10 +15088,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15019,6 +15124,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15071,6 +15251,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15217,6 +15403,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15256,6 +15448,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15280,6 +15480,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15324,34 +15527,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15492,6 +15704,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15520,7 +15740,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15669,6 +15889,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr ""
@@ -15744,6 +15972,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15849,33 +16080,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15885,12 +16159,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16209,8 +16496,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16351,9 +16638,6 @@ msgid ""
"button."
msgstr ""
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18258,24 +18542,31 @@ msgstr ""
msgid "Cycleway"
msgstr ""
+msgctxt "cycleway"
msgid "lane"
msgstr ""
+msgctxt "cycleway"
msgid "track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
msgstr ""
+msgctxt "cycleway"
msgid "opposite"
msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
msgstr ""
@@ -19448,6 +19739,9 @@ msgstr ""
msgid "Wash"
msgstr ""
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr ""
@@ -21263,10 +21557,6 @@ msgid "garages"
msgstr ""
msgctxt "building"
-msgid "industrial"
-msgstr ""
-
-msgctxt "building"
msgid "school"
msgstr ""
@@ -22667,6 +22957,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr ""
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr ""
@@ -24208,6 +24513,21 @@ msgstr ""
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr ""
@@ -25704,15 +26024,6 @@ msgstr ""
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -25954,6 +26265,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr ""
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -25989,6 +26337,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -25998,6 +26349,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26007,15 +26361,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26048,7 +26420,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26065,9 +26443,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr ""
@@ -26760,6 +27135,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27598,6 +27976,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27618,46 +28002,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Merging"
+msgstr ""
+
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27690,6 +28082,12 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28065,9 +28463,6 @@ msgstr ""
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr ""
-msgid "Import"
-msgstr ""
-
msgid "GPS Blams"
msgstr ""
@@ -28552,9 +28947,6 @@ msgstr ""
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr ""
@@ -28673,42 +29065,33 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
+msgid "Normal"
msgstr ""
-msgid "Start adjusting"
+msgid "Rotate 90"
msgstr ""
-msgid "There are currently no imagery layer to adjust."
+msgid "Rotate 180"
msgstr ""
-msgid "No layers to adjust"
+msgid "Rotate 270"
msgstr ""
-msgid "Normal"
+msgid "WayPoint Image"
msgstr ""
-msgid "Rotate 90"
+msgid "Display non-geotagged photos"
msgstr ""
-msgid "Rotate 180"
+msgid "Imported Images"
msgstr ""
-msgid "Rotate 270"
+msgid "Next image"
msgstr ""
msgid "Previous image"
msgstr ""
-msgid "Next image"
-msgstr ""
-
msgid "Rotate left"
msgstr ""
@@ -28721,15 +29104,6 @@ msgstr ""
msgid "Rotate image right"
msgstr ""
-msgid "WayPoint Image"
-msgstr ""
-
-msgid "Display non-geotagged photos"
-msgstr ""
-
-msgid "Imported Images"
-msgstr ""
-
msgid "Import vector graphics"
msgstr ""
@@ -30822,9 +31196,6 @@ msgstr ""
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr ""
-
msgid "State"
msgstr ""
diff --git a/i18n/po/zh_CN.po b/i18n/po/zh_CN.po
index 2c928d4..97fe78a 100644
--- a/i18n/po/zh_CN.po
+++ b/i18n/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
"PO-Revision-Date: 2016-10-23 14:49+0000\n"
"Last-Translator: mmyfl <Unknown>\n"
"Language-Team: 汉语 <>\n"
@@ -18,8 +18,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:20+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:16+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: zh_CN\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -3299,6 +3299,9 @@ msgstr "投影法"
msgid "Matrix set identifier"
msgstr "矩阵集标识符"
+msgid "No default layer selected, choosing first layer."
+msgstr ""
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr "getCapabilities 文档未定义图层：{0}"
@@ -3307,6 +3310,11 @@ msgid ""
msgstr "WMT S解析器错误 - 开始元素 {0} 与结束元素 {2} 名称不同"
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr "仅支持方形瓦片。服务器对 TileMatrix 标识符 {2} 返回了 {0}x{1}。"
@@ -3970,6 +3978,9 @@ msgstr "此测试将检查多重多边形是否有效。"
msgid "Area style way is not closed"
msgstr "区域类型的路径未封闭"
+msgid "No outer way for boundary"
+msgstr ""
+
msgid "No outer way for multipolygon"
msgstr "多重多边形没有外部路径"
@@ -4025,6 +4036,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr "多重多边形成员没有有用的角色"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "多重多边形内没有路径"
@@ -9036,47 +9050,50 @@ msgid "{0} object to delete:"
msgid_plural "{0} objects to delete:"
msgstr[0] "{0} 个对象要删除："
-msgid "Show tile info"
-msgstr "显示瓦片信息"
+msgid "Native projections"
+msgstr ""
-msgid "Tile Info"
-msgstr "瓦片信息"
+msgid "Offset"
+msgstr "偏移"
-msgid "Metadata "
-msgstr "元数据 "
+msgid "Tile download projection"
+msgstr ""
-msgid "Load tile"
-msgstr "加载瓦片"
+msgid "Tile display projection"
+msgstr ""
-msgid "Auto zoom"
-msgstr "自动缩放"
+msgid "Current zoom"
+msgstr ""
-msgid "Auto load tiles"
-msgstr "自动加载瓦片"
+msgid "Show tile info"
+msgstr "显示瓦片信息"
-msgid "Show errors"
-msgstr "显示错误"
+msgid "Tile Info"
+msgstr "瓦片信息"
-msgid "Load all tiles"
-msgstr "加载所有瓦片"
+msgid "Tile name"
+msgstr ""
-msgid "Load all error tiles"
-msgstr "加载所有出错瓦片"
+msgid "Tile URL"
+msgstr ""
-msgid "Zoom to native resolution"
-msgstr "缩放到原始分辨率"
+msgid "Tile size"
+msgstr ""
-msgid "Change resolution"
-msgstr "更改分辨率"
+msgid "Tile display size"
+msgstr ""
-msgid "Increase zoom"
-msgstr "增加缩放"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "减少缩放"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
-msgstr "清除瓦片缓存"
+msgid "Metadata "
+msgstr "元数据 "
+
+msgid "Load tile"
+msgstr "加载瓦片"
msgid "Failed to create tile source"
msgstr "无法创建瓦片源"
@@ -9186,8 +9203,14 @@ msgstr[0] "{0} 条轨迹， "
msgid "Save GPX file"
msgstr "保存 GPX 文件"
-msgid "Imagery fade"
-msgstr "图像淡化"
+msgid "Id"
+msgstr "Id"
+
+msgid "Min. zoom"
+msgstr ""
+
+msgid "Max. zoom"
+msgstr ""
msgid "Unsupported imagery type: {0}"
msgstr "不支持的图像类型：{0}"
@@ -9299,9 +9322,6 @@ msgstr "尚有未解决的冲突。如果您全部拒绝就不会保存冲突。
msgid "Save OSM file"
msgstr "保存 OSM 文件"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr "支持 EPSG:4326 和麦卡托投影法"
-
msgid "Validation errors"
msgstr "验证错误"
@@ -9312,9 +9332,12 @@ msgid "Set WMS Bookmark"
msgstr "设定 WMS 书签"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
-msgstr "JOSM 将使用 EPSG:4326 向服务器发出查询，但 WMS 服务器的结果可能会有所不同"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
+msgstr ""
msgid "Correlate to GPX"
msgstr "关联到 GPX"
@@ -9476,20 +9499,6 @@ msgstr "您应该选择一个 GPX 轨迹"
msgid "No selected GPX track"
msgstr "没有选定的 GPX 轨迹"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"分析时区时发生错误。\n"
-"期望的格式：{0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"在分析补偿时发生错误。\n"
-"期望的格式：{0}"
-
msgid "Geotagged Images"
msgstr "有地理标记的图片"
@@ -9626,12 +9635,26 @@ msgstr ""
"\n"
"GPS 时间：{0}"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
+msgstr ""
+"在分析补偿时发生错误。\n"
+"期望的格式：{0}"
+
msgid "Show thumbnails"
msgstr "显示缩略图"
msgid "Show image thumbnails instead of icons."
msgstr "显示缩略图代替图标"
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
+msgstr ""
+"分析时区时发生错误。\n"
+"期望的格式：{0}"
+
msgid "Choose visible tracks"
msgstr "选择可见的轨迹"
@@ -9794,6 +9817,36 @@ msgstr "已命名点的标记"
msgid "Named Trackpoints from {0}"
msgstr "{0} 的已命名轨迹点"
+msgid "Auto load tiles"
+msgstr "自动加载瓦片"
+
+msgid "Auto zoom"
+msgstr "自动缩放"
+
+msgid "Decrease zoom"
+msgstr "减少缩放"
+
+msgid "Flush tile cache"
+msgstr "清除瓦片缓存"
+
+msgid "Increase zoom"
+msgstr "增加缩放"
+
+msgid "Load all tiles"
+msgstr "加载所有瓦片"
+
+msgid "Load all error tiles"
+msgstr "加载所有出错瓦片"
+
+msgid "Show errors"
+msgstr "显示错误"
+
+msgid "Change resolution"
+msgstr "更改分辨率"
+
+msgid "Zoom to native resolution"
+msgstr "缩放到原始分辨率"
+
msgid "gps marker"
msgstr "gps 标记"
@@ -11242,15 +11295,6 @@ msgstr "缓存名称"
msgid "Object Count"
msgstr "对象计数"
-msgid "imagery fade"
-msgstr "淡化图像"
-
-msgid "Fade Color: "
-msgstr "淡化颜色： "
-
-msgid "Fade amount: "
-msgstr "淡化量： "
-
msgid "Soft"
msgstr "柔和"
@@ -11299,6 +11343,9 @@ msgstr "背景图像：默认"
msgid "Available default entries:"
msgstr "可用的预置项目："
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "选择的项目："
@@ -12490,6 +12537,9 @@ msgstr "额外属性："
msgid "Unknown requisite: {0}"
msgstr "不明的必需品：{0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr "非法成员表达式:{0}"
@@ -13635,6 +13685,9 @@ msgstr "以新的 {0} 插件取代"
msgid "no longer required"
msgstr "不再需要"
+msgid "Plugin information"
+msgstr "插件信息"
+
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
"The following plugins are no longer necessary and have been deactivated:"
@@ -13827,9 +13880,6 @@ msgid ""
"unload the plugin."
msgstr "该插件已从配置中删除。请重新启动 JOSM 以卸载插件。"
-msgid "Plugin information"
-msgstr "插件信息"
-
msgid "no description available"
msgstr "没有描述可用"
@@ -14557,6 +14607,14 @@ msgid "farmland"
msgstr "农田"
msgctxt "landuse"
+msgid "farmyard"
+msgstr ""
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr ""
+
+msgctxt "landuse"
msgid "residential"
msgstr "住宅"
@@ -14568,6 +14626,18 @@ msgctxt "landuse"
msgid "village_green"
msgstr ""
+msgctxt "landuse"
+msgid "quarry"
+msgstr ""
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr ""
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr ""
+
msgctxt "natural"
msgid "scrub"
msgstr "灌木"
@@ -14580,6 +14650,30 @@ msgctxt "natural"
msgid "grassland"
msgstr ""
+msgctxt "natural"
+msgid "wetland"
+msgstr ""
+
+msgctxt "natural"
+msgid "heath"
+msgstr ""
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr ""
+
+msgctxt "leisure"
+msgid "park"
+msgstr ""
+
+msgctxt "leisure"
+msgid "track"
+msgstr ""
+
+msgctxt "building"
+msgid "industrial"
+msgstr "住宅"
+
msgctxt "Relation type"
msgid "associatedStreet"
msgstr "关联的街道"
@@ -14935,6 +15029,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
+msgstr ""
+
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
+msgstr ""
+
msgid "IGN Argentina (TMS)"
msgstr ""
@@ -15037,6 +15139,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15088,10 +15193,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15124,6 +15229,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr ""
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15176,6 +15356,12 @@ msgstr ""
msgid "Czech pLPIS"
msgstr ""
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
+msgstr ""
+
msgid "Geodatastyrelsen (Denmark)"
msgstr ""
@@ -15322,6 +15508,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15361,6 +15553,14 @@ msgid ""
"(infrared)"
msgstr ""
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
+msgstr ""
+
msgid "Saxony latest aerial imagery"
msgstr ""
@@ -15385,6 +15585,9 @@ msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
+msgid "Munich latest aerial imagery 60cm"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15429,34 +15632,43 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
+msgstr ""
+
+msgid "Budapest district XI orthophoto 2017"
+msgstr ""
+
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
+msgstr ""
+
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
msgid "OpenStreetMap Hungary (hiking routes)"
@@ -15597,6 +15809,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15625,7 +15845,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15774,6 +15994,14 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
+msgstr ""
+
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
+msgstr ""
+
msgid "Freemap.sk Car"
msgstr "Freemap.sk 汽车"
@@ -15849,6 +16077,9 @@ msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2014)"
msgstr ""
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr ""
+
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
msgstr ""
@@ -15954,33 +16185,76 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
msgstr ""
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
+msgstr ""
+
msgid "U.S. Forest Service roads"
msgstr ""
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Natural Color)"
msgstr ""
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
+msgstr ""
+
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
+msgstr ""
+
msgid "Texas Orthophoto"
msgstr ""
@@ -15990,12 +16264,25 @@ msgstr ""
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -16314,8 +16601,8 @@ msgid ""
msgstr "允许选择图层中的一块区域并自动生成多边形路径。用于方便地从底图中勾绘建筑物。"
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16458,9 +16745,6 @@ msgid ""
"button."
msgstr "图像偏移数据库：一个按钮，分享和获取图像偏移。"
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -18365,26 +18649,33 @@ msgstr "自行车道/车径"
msgid "Cycleway"
msgstr "自行车路"
+msgctxt "cycleway"
msgid "lane"
-msgstr "车道"
+msgstr ""
+msgctxt "cycleway"
msgid "track"
-msgstr "车径"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr "对向车道"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr "对向车径"
+msgstr ""
+msgctxt "cycleway"
msgid "opposite"
-msgstr "反向"
+msgstr ""
+msgctxt "cycleway"
msgid "share_busway"
-msgstr "与公交车道共享"
+msgstr ""
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr "与车道共享"
+msgstr ""
msgid "Cycleway left"
msgstr "左侧自行车道"
@@ -19555,6 +19846,9 @@ msgstr "会员卡"
msgid "Wash"
msgstr "洗车"
+msgid "Self Service"
+msgstr ""
+
msgid "Car Dealer"
msgstr "汽车经销商"
@@ -21370,10 +21664,6 @@ msgid "garages"
msgstr "复合车库"
msgctxt "building"
-msgid "industrial"
-msgstr "住宅"
-
-msgctxt "building"
msgid "school"
msgstr "学校"
@@ -22774,6 +23064,21 @@ msgstr ""
msgid "Archaeological Site"
msgstr "考古学地区"
+msgid "tumulus"
+msgstr ""
+
+msgid "megalith"
+msgstr ""
+
+msgid "fortification"
+msgstr ""
+
+msgid "settlement"
+msgstr ""
+
+msgid "necropolis"
+msgstr ""
+
msgid "Battlefield"
msgstr "战场"
@@ -24315,6 +24620,21 @@ msgstr "行政中心"
msgid "Label point"
msgstr ""
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
+msgstr ""
+
msgid "Site"
msgstr "地点"
@@ -25819,15 +26139,6 @@ msgstr "导入本地图片"
msgid "Import pictures into Mapillary layer"
msgstr ""
-msgid "Select pictures"
-msgstr "选择图片"
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr ""
-
msgid "Join mode"
msgstr ""
@@ -26069,6 +26380,43 @@ msgstr ""
msgid "Go forward"
msgstr ""
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "输入"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
+msgstr ""
+
msgid ""
"A tag with key <i>{0}</i> is already present on the selected OSM object."
msgstr ""
@@ -26104,6 +26452,9 @@ msgstr ""
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
+msgid "Show detections on top of image"
+msgstr ""
+
msgid "View in browser"
msgstr ""
@@ -26113,6 +26464,9 @@ msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26122,15 +26476,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr ""
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26160,7 +26532,13 @@ msgstr[1] ""
msgid "2 images unjoined"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid "Could not read from URL {0}!"
+msgstr ""
+
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26177,9 +26555,6 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
msgstr "正在下载"
@@ -26945,6 +27320,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr ""
+
msgid "No address was found for this object."
msgstr ""
@@ -27812,6 +28190,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27832,46 +28216,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
+msgstr "替换几何图形"
+
+msgid "Merge Tags"
msgstr ""
-msgid "<Please select data>"
+msgid "List of tags to merge"
msgstr ""
-msgid "Configure conflation settings"
+msgid "except"
msgstr ""
-msgid "Generate matches"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Reference:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Subject:"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Programming"
+msgid "Simple Example"
msgstr ""
-msgid "Merging"
+msgid "Advanced Example"
msgstr ""
-msgid "Replace Geometry"
-msgstr "替换几何图形"
+msgid "<Please select data>"
+msgstr ""
-msgid "Merge Tags"
+msgid "Configure conflation settings"
msgstr ""
-msgid "List of tags to merge"
+msgid "Generate matches"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Merging"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Reference:"
+msgstr ""
+
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27904,6 +28296,12 @@ msgstr "空选择范围"
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
@@ -28285,9 +28683,6 @@ msgstr "Globalsat 输入"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "从 Globalsat Datalogger DG100 输入数据到 GPX 图层。"
-msgid "Import"
-msgstr "输入"
-
msgid "GPS Blams"
msgstr "GPS Blams"
@@ -28780,9 +29175,6 @@ msgstr "正在加载图像偏移..."
msgid "Error processing XML response: {0}"
msgstr "处理 XML 回应时发生错误：{0}"
-msgid "Offset"
-msgstr "偏移"
-
msgid "Imagery Offset Database"
msgstr "图像偏移数据库"
@@ -28901,24 +29293,6 @@ msgstr "上传新偏移..."
msgid "This string should be 3 to 200 letters long."
msgstr "字符串应该为 3 至 200 个字符。"
-msgid "Adjust imagery"
-msgstr "调整图像"
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr "调整所选图像图层的位置"
-
-msgid "Please select the imagery layer to adjust."
-msgstr "请选择图像图层来调整。"
-
-msgid "Start adjusting"
-msgstr "开始调整"
-
-msgid "There are currently no imagery layer to adjust."
-msgstr "当前没有图层可用来调整。"
-
-msgid "No layers to adjust"
-msgstr "没有图层可用来调整"
-
msgid "Normal"
msgstr "一般"
@@ -28931,12 +29305,21 @@ msgstr "旋转 180 度"
msgid "Rotate 270"
msgstr "旋转 270 度"
-msgid "Previous image"
-msgstr "上一幅图片"
+msgid "WayPoint Image"
+msgstr "路点图片"
+
+msgid "Display non-geotagged photos"
+msgstr "显示无地理标记的相片"
+
+msgid "Imported Images"
+msgstr "输入的图片"
msgid "Next image"
msgstr "下一幅图片"
+msgid "Previous image"
+msgstr "上一幅图片"
+
msgid "Rotate left"
msgstr "向左旋转"
@@ -28949,15 +29332,6 @@ msgstr "向右旋转"
msgid "Rotate image right"
msgstr "将图片向右旋转"
-msgid "WayPoint Image"
-msgstr "路点图片"
-
-msgid "Display non-geotagged photos"
-msgstr "显示无地理标记的相片"
-
-msgid "Imported Images"
-msgstr "输入的图片"
-
msgid "Import vector graphics"
msgstr "导入矢量图形"
@@ -31048,9 +31422,6 @@ msgstr "联结"
msgid "Public Transport: Join GTFS stops"
msgstr ""
-msgid "Id"
-msgstr "Id"
-
msgid "State"
msgstr "省/州"
diff --git a/i18n/po/zh_TW.po b/i18n/po/zh_TW.po
index 6299373..05a6461 100644
--- a/i18n/po/zh_TW.po
+++ b/i18n/po/zh_TW.po
@@ -7,16 +7,16 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-23 03:37+0100\n"
-"PO-Revision-Date: 2017-03-05 16:51+0000\n"
-"Last-Translator: Supaplex <Unknown>\n"
+"POT-Creation-Date: 2017-05-03 03:42+0200\n"
+"PO-Revision-Date: 2017-04-30 22:15+0000\n"
+"Last-Translator: Wayne Su <Unknown>\n"
"Language-Team: Traditional Chinese\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2017-03-24 05:19+0000\n"
-"X-Generator: Launchpad (build 18334)\n"
+"X-Launchpad-Export-Date: 2017-05-03 05:15+0000\n"
+"X-Generator: Launchpad (build 18366)\n"
"Language: zh_TW\n"
msgid "{0}: option ''{1}'' is ambiguous"
@@ -38,7 +38,7 @@ msgid "{0}: unrecognized option ''{1}{2}''"
msgstr "{0}：無法理解的選項「{1}{2}」"
msgid "{0}: illegal option -- {1}"
-msgstr "{0}：不合法的選項 -- {1}"
+msgstr "{0}：不合規定的選項 -- {1}"
msgid "{0}: invalid option -- {1}"
msgstr "{0}：無效的選項 -- {1}"
@@ -47,7 +47,7 @@ msgid "{0}: option requires an argument -- {1}"
msgstr "{0}：選項需要一個參數 -- {1}"
msgid "Invalid value {0} for parameter ''has_arg''"
-msgstr "參數「has_arg」無效值 {0}"
+msgstr "「has_arg」參數有無效數值 {0}"
msgid "Background Terms of Use"
msgstr "背景使用條款"
@@ -137,7 +137,7 @@ msgid "Contribution"
msgstr "貢獻者"
msgid "License"
-msgstr "授權"
+msgstr "授權許可"
msgid "Plugins"
msgstr "外掛"
@@ -179,7 +179,7 @@ msgid "Click to abort launching external browsers"
msgstr "請點選以放棄執行外部瀏覽器"
msgid "Please select at least one already uploaded node, way, or relation."
-msgstr "請至少選擇一個已上傳的節點、路徑或關係。"
+msgstr "請至少選擇一個已上傳的節點、路徑或關聯。"
msgid "Please select the target layer."
msgstr "請選擇目標圖層。"
@@ -324,28 +324,28 @@ msgid "No conflicts to zoom to"
msgstr "沒有要縮放的衝突"
msgid "Changeset Manager"
-msgstr "變更組合管理程式"
+msgstr "變更集管理程式"
msgid "Toggle visibility of Changeset Manager window"
-msgstr "切換變更組合管理視窗的可視性"
+msgstr "切換變更集管理視窗的可視性"
msgid "Close open changesets"
-msgstr "關閉開放的變更組合"
+msgstr "關閉開放的變更集"
msgid "Closes open changesets"
-msgstr "關閉開放的變更組合"
+msgstr "關閉開放的變更集"
msgid "File: {0}"
msgstr "檔案: {0}"
msgid "There are no open changesets"
-msgstr "已沒有開放的變更組合"
+msgstr "已沒有開放的變更集"
msgid "No open changesets"
-msgstr "沒有開放的變更組合"
+msgstr "沒有開放的變更集"
msgid "Downloading open changesets ..."
-msgstr "正在下載開放的變更組合..."
+msgstr "正在下載開放的變更集..."
msgid "Combine Way"
msgstr "合併路徑"
@@ -418,7 +418,7 @@ msgid "No data loaded."
msgstr "沒有載入資料。"
msgid "You must select at least one way."
-msgstr "您必須選擇至少一條路徑。"
+msgstr "你必須選擇至少一條路徑。"
msgid "Delete"
msgstr "刪除"
@@ -465,13 +465,13 @@ msgstr "從 OSM 主機下載圖資"
msgid ""
"<html>This action will require {0} individual<br>download requests. Do you "
"wish<br>to continue?</html>"
-msgstr "<html>這個動作會發出 {0} 個<br>個別的下載要求。您是否希望<br>繼續？</html>"
+msgstr "<html>這個動作會發出 {0} 個<br>個別的下載要求。你是否希望<br>繼續？</html>"
msgid "Download data"
msgstr "下載資料"
msgid "Download notes in current view"
-msgstr "在目前檢視下載筆記"
+msgstr "目前畫面裏下載的註解"
msgid "Download in current view"
msgstr "下載當前檢視"
@@ -486,7 +486,7 @@ msgid "Download OSM object by ID."
msgstr "依 ID 下載 OSM 物件。"
msgid "Download parent ways/relations..."
-msgstr "下載上層路徑/關係..."
+msgstr "下載上層路徑/關聯..."
msgid "Download objects referring to one of the selected objects"
msgstr "下載參照到選取物件中的物件"
@@ -540,7 +540,7 @@ msgid "History"
msgstr "歷史紀錄"
msgid "Display history information about OSM ways, nodes, or relations."
-msgstr "顯示 OSM 路徑、節點或關係的歷史紀錄資訊。"
+msgstr "顯示 OSM 路徑、節點或關聯的歷史紀錄資訊。"
msgid "Show history"
msgstr "顯示歷史紀錄"
@@ -551,7 +551,7 @@ msgstr "歷史 (網頁)"
msgid ""
"Display history information about OSM ways, nodes, or relations in web "
"browser."
-msgstr "在網頁瀏覽器中顯示關於 OSM 路徑、節點或關係的歷史資訊。"
+msgstr "在網頁瀏覽器中顯示關於 OSM 路徑、節點或關聯的歷史資訊。"
msgid "New offset"
msgstr "新偏移"
@@ -560,7 +560,7 @@ msgid "Adjust the position of this imagery layer"
msgstr "調整圖片圖層的位置"
msgid "Adjust imagery offset"
-msgstr ""
+msgstr "調整影像偏移"
msgid ""
"Use arrow keys or drag the imagery layer with mouse to adjust the imagery "
@@ -569,8 +569,8 @@ msgid ""
"If you want to save the offset as bookmark, enter the bookmark name below"
msgstr ""
"使用方向鍵或用滑鼠拖曳圖片圖層來調整圖片位移。\n"
-"您也可以在 {0} 坐標中輸入東方和北方的位移。\n"
-"如果您想要將位移儲存成書籤，請在下面輸入書籤名稱"
+"你也可以在 {0} 坐標中輸入東方和北方的位移。\n"
+"如果你想要將位移儲存成書籤，請在下面輸入書籤名稱"
msgid "Offset: "
msgstr "位移： "
@@ -589,7 +589,7 @@ msgstr "進階資訊"
msgid ""
"Display advanced object information about OSM nodes, ways, or relations."
-msgstr "顯示關於 OSM 路徑、節點或關係的進階物件資訊。"
+msgstr "顯示關於 OSM 路徑、節點或關聯的進階物件資訊。"
msgid "Advanced info (web)"
msgstr "進階資訊 (網頁)"
@@ -597,7 +597,7 @@ msgstr "進階資訊 (網頁)"
msgid ""
"Display object information about OSM nodes, ways, or relations in web "
"browser."
-msgstr "在網頁瀏覽器中顯示關於 OSM 路徑、節點或關係的物件資訊。"
+msgstr "在網頁瀏覽器中顯示關於 OSM 路徑、節點或關聯的物件資訊。"
msgid "Join overlapping Areas"
msgstr "連結重疊的區域"
@@ -624,7 +624,7 @@ msgid "This can lead to nodes being deleted accidentally."
msgstr "這樣可能會造成節點被意外的刪除。"
msgid "Are you really sure to continue?"
-msgstr "您確定要繼續嗎？"
+msgstr "你真的要繼續嗎？"
msgid "Please abort if you are not sure"
msgstr "如果不確定請放棄"
@@ -633,10 +633,10 @@ msgid "The selected area is incomplete. Continue?"
msgstr "選取的區域並不完整。要繼續嗎？"
msgid "No intersection found. Nothing was changed."
-msgstr "找不到交叉點。沒有東西變更。"
+msgstr "找不到交叉點。沒有變更任何東西。"
msgid "Move tags from ways to relations"
-msgstr "把路徑的tag移到關係中"
+msgstr "把路徑的標籤移到關聯去"
msgid "Reverting changes"
msgstr "回復變更"
@@ -651,7 +651,7 @@ msgid "Assemble new polygons"
msgstr "組合新的多邊形"
msgid "Delete relations"
-msgstr "刪除關係"
+msgstr "刪除關聯"
msgid "Delete Ways that are not part of an inner multipolygon"
msgstr "刪除不屬於內部多重多邊形一部分的路徑"
@@ -662,32 +662,32 @@ msgstr "已連結重疊的區域"
msgid ""
"Some of the ways were part of relations that have been modified.<br>Please "
"verify no errors have been introduced."
-msgstr "一些編輯過的路徑屬於關係的一部分，<br>請檢查這之中有沒有編輯錯誤。"
+msgstr "一些編輯過的路徑屬於關聯的一部分，<br>請檢查這之中有沒有編輯錯誤。"
msgid "Fix tag conflicts"
msgstr "修正標籤的衝突"
msgid "Split ways into fragments"
-msgstr "將路徑分割為幾部分"
+msgstr "將路徑分段"
msgid "Sorry. Cannot handle multipolygon relations with multiple outer ways."
-msgstr "抱歉。不能處理有多重外部路徑的多重多邊形關係。"
+msgstr "抱歉。不能處理有多重外部路徑的多重多邊形關聯。"
msgid ""
"Sorry. Cannot handle way that is outer in multiple multipolygon relations."
-msgstr "抱歉。不能處理多重多邊形關係外部的路徑。"
+msgstr "抱歉。不能處理多重多邊形關聯外部的路徑。"
msgid ""
"Sorry. Cannot handle way that is both inner and outer in multipolygon "
"relations."
-msgstr "抱歉。不能處理多重多邊形關係的內部和外部路徑。"
+msgstr "抱歉。不能處理多重多邊形關聯的內部和外部路徑。"
msgid ""
"Sorry. Cannot handle way that is inner in multiple multipolygon relations."
-msgstr "抱歉。不能處理多重多邊形關係內部的路徑。"
+msgstr "抱歉。不能處理多重多邊形關聯內部的路徑。"
msgid "Removed Element from Relations"
-msgstr "從關係中移除元件"
+msgstr "從關聯中移除元件"
msgid "Remove tags from inner ways"
msgstr "移除內部路徑的標籤"
@@ -723,7 +723,7 @@ msgid "Enter Lat/Lon to jump to position."
msgstr "輸入要跳至地點的經/緯。"
msgid "You can also paste an URL from www.openstreetmap.org"
-msgstr "您也可以貼上 www.openstreetmap.org 的 URL"
+msgstr "你也可以貼上 www.openstreetmap.org 的 URL"
msgid "Latitude"
msgstr "緯度"
@@ -732,7 +732,7 @@ msgid "Longitude"
msgstr "經度"
msgid "Zoom (in metres)"
-msgstr "縮放（以公尺計）"
+msgstr "縮放 (以公尺計)"
msgid "URL"
msgstr "URL"
@@ -852,8 +852,8 @@ msgid ""
"data</b>.<br />You should instead check and merge each object, <b>one by "
"one</b>.<br /><br />Are you sure you want to continue?"
msgstr ""
-"您正要合併layers\"{0}\"與layers\"{1}\"上的多個物件，<br /><br /><b>但並不建議合併這樣的資料</b>，<br "
-"/>您應該<b>逐一<b>再次確認要合併的物件。<br /><br />您確定要繼續合併嗎？"
+"你正準備合併 圖層 \"{0}\" 與 \"{1}\" 上的多個物件，<br /><br /><b>但並不建議合併這樣的資料</b>，<br "
+"/>你應該<b>逐一<b>再次確認要合併的物件。<br /><br />你確定要繼續合併嗎？"
msgid "Mirror"
msgstr "鏡射"
@@ -950,7 +950,7 @@ msgid "Ok"
msgstr "確定"
msgid "Open Location..."
-msgstr "開啟位址..."
+msgstr "開啟位置..."
msgid "Open an URL."
msgstr "開啟 URL"
@@ -995,8 +995,8 @@ msgid ""
"shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
msgstr ""
"<h3>當選取一或多個路徑後，形狀會被調整，使所有的角都是 90 或 180 "
-"度。</h3>您可以在選擇區域中加入兩個節點。這樣子它的方向就會被這兩個參考節點所修正。（之後，您可以復原某些節點的移動：<br>選擇它們並按下 直角化 "
-"/ 復原 的捷徑鍵。預設值為 Shift-Q。）"
+"度。</h3>你可以在選擇區域中加入兩個節點。這樣子它的方向就會被這兩個參考節點所修正。 (之後，你可以復原某些節點的移動：<br>選擇它們並按下 "
+"直角化 / 復原 的捷徑鍵。預設值為 Shift-Q )"
msgid "Orthogonalize Shape"
msgstr "形狀直角化"
@@ -1023,8 +1023,8 @@ msgid ""
"undesirable results when doing rectangular alignments.<br>Change your "
"projection to get rid of this warning.<br>Do you want to continue?</html>"
msgstr ""
-"<html>您使用的 EPSG:4326 "
-"投影法會導致在進行<br>矩形排列時產生不想要的結果。<br>改變您的投影法可以去除這項警告。<br>是否要繼續？</html>"
+"<html>你使用的 EPSG:4326 "
+"投影法會導致在進行<br>矩形排列時產生不想要的結果。<br>改變你的投影法可以去除這項警告。<br>是否要繼續？</html>"
msgid "Orthogonalize"
msgstr "直角化"
@@ -1147,7 +1147,7 @@ msgid "Could not rename file ''{0}''"
msgstr "無法重新命名檔案「{0}」"
msgid "Report a ticket to JOSM bugtracker"
-msgstr "回報給JOSM錯誤追蹤"
+msgstr "回報至 JOSM 錯誤追蹤工具"
msgid "Restart"
msgstr "重新啟動"
@@ -1192,16 +1192,16 @@ msgid "Save the current data to a new file."
msgstr "將目前的資料儲存為新的檔案。"
msgid "Search Notes..."
-msgstr "搜尋筆記…"
+msgstr "搜尋註解…"
msgid "Download notes from the note search API"
-msgstr "從筆記搜尋 API 下載筆記"
+msgstr "從註解搜尋 API 下載註記"
msgid "Search the OSM API for notes containing words:"
msgstr "利用 OSM API 搜尋含有以下字詞的註解："
msgid "Search for notes"
-msgstr "搜尋筆記"
+msgstr "搜尋註解"
msgid "You must enter a search term"
msgstr "你必須輸入一組關鍵字"
@@ -1310,7 +1310,7 @@ msgstr "取消操作"
msgid ""
"The selection contains {0} ways. Are you sure you want to simplify them all?"
-msgstr "選擇範圍中包含 {0} 個路徑。您確定要簡化它們全部嗎？"
+msgstr "選擇範圍中包含 {0} 個路徑。你確定要簡化它們全部嗎？"
msgid "Simplify ways?"
msgstr "是否要簡化路徑？"
@@ -1321,7 +1321,7 @@ msgstr[0] "簡化 {0} 路徑"
msgid "Simplify Way (remove {0} node)"
msgid_plural "Simplify Way (remove {0} nodes)"
-msgstr[0] "簡化路徑（移除 {0} 個節點）"
+msgstr[0] "簡化路徑 (移除 {0} 個節點)"
msgid "Split Way"
msgstr "切割路徑"
@@ -1366,17 +1366,17 @@ msgstr "你必須選擇兩個以上的節點來切割一個環狀路徑"
msgid ""
"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
"middle of the way.)"
-msgstr "此路徑不能從選取的節點分割。（提示：選取的節點在路徑的中央。）"
+msgstr "此路徑不能從選取的節點分割。 (提示：選取的節點在路徑的中央。)"
msgid ""
"A role based relation membership was copied to all new ways.<br>You should "
"verify this and correct it when necessary."
-msgstr "關係成員的腳色全部複雜到新的路徑上。<br>必要時你應該檢核和修正。"
+msgstr "關聯成員的角色全部複製到新的路徑上。<br>必要時你應該查驗和修正。"
msgid ""
"A relation membership was copied to all new ways.<br>You should verify this "
"and correct it when necessary."
-msgstr "關係成員全部複雜到新的路徑上。<br>必要時你應該檢核和修正。"
+msgstr "關聯成員全部複雜到新的路徑上。<br>必要時你應該檢核和修正。"
msgid "Split way {0} into {1} part"
msgid_plural "Split way {0} into {1} parts"
@@ -1392,7 +1392,7 @@ msgid "Toggles the global setting ''{0}''."
msgstr "切換全城設定值「{0}」。"
msgid "Discourage upload"
-msgstr ""
+msgstr "取消上傳"
msgid "UnGlue Ways"
msgstr "取消黏合路徑"
@@ -1491,11 +1491,11 @@ msgstr "你要剝離不完整的物件。<br>這麼做可能因為看不到的
msgid "Unglueing affected {0} relation: {1}"
msgid_plural "Unglueing affected {0} relations: {1}"
-msgstr[0] "分拆{0} 個受影響關係: {1}"
+msgstr[0] "分拆{0} 個受影響關聯: {1}"
msgid "Ensure that the relation has not been broken!"
msgid_plural "Ensure that the relations have not been broken!"
-msgstr[0] "請確保關係沒有受損！"
+msgstr[0] "請確保關聯沒有受損！"
msgid "Disconnect Node from Way"
msgstr "從路徑中分離節點"
@@ -1548,7 +1548,7 @@ msgstr "更新已修改的"
msgid ""
"Updates the currently modified objects from the server (re-downloads data)"
-msgstr "從伺服器更新目前已修改的物件（重新下載資料）"
+msgstr "從伺服器更新目前已修改的物件 (重新下載資料)"
msgid "No current dataset found"
msgstr "找不到目前的資料組合"
@@ -1561,7 +1561,7 @@ msgstr "更新選擇區域"
msgid ""
"Updates the currently selected objects from the server (re-downloads data)"
-msgstr "從伺服器更新目前選取的物件（重新下載資料）"
+msgstr "從伺服器更新目前選取的物件 (重新下載資料)"
msgid "There are no selected objects to update."
msgstr "沒有選取的物件需要更新。"
@@ -1578,7 +1578,7 @@ msgstr "將使用中圖層的所有變更上傳至 OSM 伺服器"
msgid ""
"<html>The data to be uploaded participates in unresolved conflicts of layer "
"''{0}''.<br>You have to resolve them first.</html>"
-msgstr "<html>要上傳的資料影響到的圖層「{0}」仍未調解衝突。<br>您必須先調解它們。</html>"
+msgstr "<html>要上傳的資料影響到的圖層「{0}」仍未調解衝突。<br>你必須先調解它們。</html>"
msgid "Upload discouraged"
msgstr "不推薦上傳"
@@ -1602,7 +1602,7 @@ msgid "Nothing to upload. Get some data first."
msgstr "沒有要上傳的項目。請先取得一些資料。"
msgid "Upload note changes to server"
-msgstr "上傳變動註解至伺服器"
+msgstr "上傳註解的變更至伺服器"
msgid "Upload notes"
msgstr "上傳註解"
@@ -1677,7 +1677,7 @@ msgid "Zoom to the object the first selected member refers to"
msgstr "縮放至第一個選取成員所參照的物件"
msgid "Zooming disabled because layer of this relation is not active"
-msgstr "縮放已停用，因為這個關係的圖層未使用"
+msgstr "縮放已停用，因為這個關聯的圖層未使用"
msgid "Zooming disabled because there is no selected member"
msgstr "縮放已停用，因為尚未選取成員"
@@ -1750,25 +1750,25 @@ msgid "Slower Forward"
msgstr "慢速快轉"
msgid "Downloading changeset content"
-msgstr "下載變更組合內容"
+msgstr "正在下載變更集內容"
msgid "({0}/{1}) Downloading changeset {2}..."
-msgstr "({0}/{1}) 正在下載變更組合 {2}..."
+msgstr "({0}/{1}) 正在下載變更集 {2}..."
msgid "({0}/{1}) Downloading content for changeset {2}..."
-msgstr "({0}/{1}) 正在下載變更組合 {2} 的內容..."
+msgstr "({0}/{1}) 正在下載變更集 {2} 的內容..."
msgid "Download changesets"
-msgstr "下載變更組合"
+msgstr "下載變更集"
msgid "Querying and downloading changesets"
-msgstr "查詢並下載變更組合"
+msgstr "查詢並下載變更集"
msgid "Determine user id for current user..."
msgstr "判斷目前使用者的 id..."
msgid "Query and download changesets ..."
-msgstr "查詢並下載變更組合..."
+msgstr "查詢並下載變更集..."
msgid "Errors during download"
msgstr "下載時發生錯誤"
@@ -1789,10 +1789,10 @@ msgid "Download OSM Notes"
msgstr "下載 OSM 註解"
msgid "Downloading Notes"
-msgstr "下載註解"
+msgstr "正在下載註解"
msgid "Notes"
-msgstr "備註"
+msgstr "註解"
msgid "{0} note has been downloaded."
msgid_plural "{0} notes have been downloaded."
@@ -1807,7 +1807,7 @@ msgid ""
msgstr "請選擇較小的區域以便下載所有註解。"
msgid "More notes to download"
-msgstr "更多註解需要下載"
+msgstr "更多註解要下載"
msgid "Download OSM Notes within Bounds"
msgstr "下載邊界内的 OSM 註解"
@@ -1835,7 +1835,7 @@ msgstr "正在下載資料"
msgid ""
"Ignoring exception because download has been canceled. Exception was: {0}"
-msgstr "忽略例外，因為下載已取消。例外為：{0}"
+msgstr "忽略異常，因為下載已取消。異常為：{0}"
msgid "No data found in this area."
msgstr "在這個區域中找不到資料。"
@@ -1867,10 +1867,10 @@ msgid "({0}/{1}) Loading parents of way {2}"
msgstr "({0}/{1}) 正在載入路徑 {2} 的上層項目"
msgid "({0}/{1}) Loading parents of relation {2}"
-msgstr "({0}/{1}) 正在載入關係 {2} 的上層項目"
+msgstr "({0}/{1}) 正在載入關聯 {2} 的上層項目"
msgid "Download session"
-msgstr "下載階段"
+msgstr "下載作業階段"
msgid "Download {0} of {1} ({2} left)"
msgstr "下載 {0} / {1} (剩下 {2})"
@@ -1884,7 +1884,7 @@ msgstr "檢查伺服器"
msgid ""
"Click to check whether objects in your local dataset are deleted on the "
"server"
-msgstr "點選以檢查在您本地端資料組合中的物件是否在伺服器中已被刪除"
+msgstr "點選以檢查在你本地端資料組合中的物件是否在伺服器中已被刪除"
msgid "Ignore"
msgstr "忽略"
@@ -1921,10 +1921,10 @@ msgid "Error during download"
msgstr "下載時發生錯誤"
msgid "Add a new Note"
-msgstr "添加新的註解"
+msgstr "加入新的註解"
msgid "Add note mode"
-msgstr "添加註解模式"
+msgstr "加入註解模式"
msgid "Click the location where you wish to create a new note"
msgstr "點撃欲建立註解的位置"
@@ -1936,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 "刪除模式"
@@ -2029,7 +2029,7 @@ msgid "Show helper geometry"
msgstr "顯示輔助線"
msgid "Snap to node projections"
-msgstr "貼齊節點投影法"
+msgstr "貼齊節點投影點"
msgid "Disable"
msgstr "停用"
@@ -2106,7 +2106,7 @@ msgid "Click on the way to start improving its shape."
msgstr "點選路徑開始改善它的形狀。"
msgid "Select a way that you want to make more accurate."
-msgstr "選擇您想要讓它更準確的路徑。"
+msgstr "選擇你想要讓它更準確的路徑。"
msgid ""
"Click to add a new node. Release Ctrl to move existing nodes or hold Alt to "
@@ -2131,7 +2131,7 @@ msgid "Cannot delete node that has tags"
msgstr "不能刪除有標籤的節點"
msgid "make parallel helper line"
-msgstr ""
+msgstr "製作平行輔助線"
msgid "Parallel"
msgstr "平行線"
@@ -2142,7 +2142,7 @@ msgstr "製作路徑的平行複本"
msgid ""
"Select ways as in Select mode. Drag selected ways or a single way to create "
"a parallel copy (Alt toggles tag preservation)"
-msgstr ""
+msgstr "跟在選取模式一樣選取路徑，再推拉選取的路徑來建立平行的複製 (按住 Alt 可保留原標籤)"
msgid "Hold Ctrl to toggle snapping"
msgstr "按住 Ctrl 切換貼齊"
@@ -2151,6 +2151,8 @@ msgid ""
"ParallelWayAction\n"
"The ways selected must form a simple branchless path"
msgstr ""
+"平行路徑操作\n"
+"選取的路徑必須是單一無分岔"
msgid "Drag play head"
msgstr "拖放播放開頭"
@@ -2166,7 +2168,7 @@ msgstr "選擇、移動、縮放和旋轉物件"
msgid ""
"Are you sure that you want to move elements with attached ways that are "
"hidden by filters?"
-msgstr ""
+msgstr "你確定要移動附加路徑被過濾條件隱藏的元件？"
msgid ""
"You moved more than {0} element. Moving a large number of elements is often "
@@ -2227,40 +2229,40 @@ msgid "Add all objects selected in the current dataset after the last member"
msgstr "將目前資料組合中所有物件加入到最後一個成員之後"
msgid "Add selection to relation"
-msgstr ""
+msgstr "加入選取的到關聯裏"
msgid ""
"{0}Add selection to relation{1}: Verify every single relation to avoid "
"damage!"
-msgstr ""
+msgstr "{0} 加入選取的到關聯 {1} 裏：逐一檢查每個關聯以避免損壞！"
msgid "Add selection to {0} relation"
msgid_plural "Add selection to {0} relations"
-msgstr[0] "添加所選項目至 {0} 項關係"
+msgstr[0] "將選取項目加入 {0} 個關聯"
msgid "Delete the selected relation"
-msgstr "刪除選取的關係"
+msgstr "刪除選取的關聯"
msgid "Download all members of the selected relations"
-msgstr "下載已選取關係的所有成員"
+msgstr "下載已選取關聯的所有成員"
msgid "Download members"
msgstr "下載成員"
msgid "Download incomplete members of selected relations"
-msgstr "下載已選取關係的不完整成員"
+msgstr "下載已選取關聯的不完整成員"
msgid "Download incomplete members"
msgstr "下載不完整的成員"
msgid "Create a copy of this relation and open it in another editor window"
-msgstr "建立這個關係的複本並且在另一個編輯器視窗開啟它"
+msgstr "建立這個關聯的複本並且在另一個編輯器視窗開啟它"
msgid "Edit"
msgstr "編輯"
msgid "Call relation editor for selected relation"
-msgstr "開啓選取關係的關係編輯器"
+msgstr "呼叫關聯編輯器處理選取的關聯"
msgid ""
"You are about to open <b>{0}</b> different relation editor "
@@ -2268,50 +2270,49 @@ msgid ""
msgid_plural ""
"You are about to open <b>{0}</b> different relation editors "
"simultaneously.<br/>Do you want to continue?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "你正要同時開啟 <b>{0}</b> 個不同的關聯編輯器，<br/>你確定要繼續？"
msgid "Confirmation"
msgstr "確認"
msgid "List of recent relations"
-msgstr "最近編輯的關係列表"
+msgstr "最近處理過的關聯清單"
msgid "Open recent relation"
-msgstr "打開最近編輯的關係"
+msgstr "開啟最近處理過的關聯"
msgid "Relation Editor: {0}"
-msgstr "關係編輯器：{0}"
+msgstr "關聯編輯器：{0}"
msgid "Select in relation list"
-msgstr "在關係清單中選擇"
+msgstr "在關聯清單中選取"
msgid "Select relation in relation list."
-msgstr "在關係清單中選擇。"
+msgstr "在關聯清單中選擇。"
msgid "Add the members of all selected relations to current selection"
-msgstr "將所有選取關係的成員加入目前的選擇範圍"
+msgstr "將所有選取關聯係的成員加入目前的選取範圍"
msgid "Select the members of all selected relations"
-msgstr "選擇所有已選取關係的成員"
+msgstr "選取所有已選取關聯的成員"
msgid "Select members (add)"
-msgstr "選擇成員 (增選)"
+msgstr "選取成員 (增選)"
msgid "Select members"
-msgstr "選擇成員"
+msgstr "選取成員"
msgid "Add the selected relations to the current selection"
-msgstr "將選取的關係加入目前的選擇範圍"
+msgstr "將選取的關聯加入目前的選擇範圍"
msgid "Set the current selection to the list of selected relations"
-msgstr "將目前的選擇區域設定到選取關係的清單"
+msgstr "將目前的選取區域設定到選取關聯的清單"
msgid "Select relation (add)"
-msgstr "選擇關係 (增選)"
+msgstr "選擇關聯 (增選)"
msgid "Select relation"
-msgstr "選擇關係"
+msgstr "選擇關聯"
msgid "<not>"
msgstr "<非>"
@@ -2320,7 +2321,7 @@ msgid "<or>"
msgstr "<或>"
msgid "<xor>"
-msgstr "<xor>"
+msgstr "<互斥或>"
msgid "<left parent>"
msgstr ""
@@ -2329,7 +2330,7 @@ msgid "<right parent>"
msgstr ""
msgid "<colon>"
-msgstr ""
+msgstr "<冒號>"
msgid "<equals>"
msgstr "<等於>"
@@ -2341,7 +2342,7 @@ msgid "<question mark>"
msgstr "<問號>"
msgid "<end-of-file>"
-msgstr ""
+msgstr "<檔案尾端>"
msgid "Search..."
msgstr "搜尋..."
@@ -2383,13 +2384,13 @@ msgid "Also include incomplete and deleted objects in search."
msgstr "搜尋也包含不完整和已刪除的物件。"
msgid "standard"
-msgstr ""
+msgstr "標準"
msgid "regular expression"
msgstr "正規表示式"
msgid "MapCSS selector"
-msgstr ""
+msgstr "MapCSS 選擇工具"
msgid "add toolbar button"
msgstr "加入工具列按鈕"
@@ -2437,25 +2438,25 @@ msgid "basics"
msgstr "基本"
msgid "''valuefragment'' anywhere in ''key''"
-msgstr ""
+msgstr "「設定鍵」裏有「數值片段」"
msgid "''valuefragment'' nowhere in ''key''"
-msgstr ""
+msgstr "「設定鍵」裏沒有「數值片段」"
msgid "''key'' with exactly ''value''"
-msgstr ""
+msgstr "「設定鍵」與完全相同的「數值」"
msgid "''key'' with any value"
-msgstr ""
+msgstr "「設定鍵」與任何數值"
msgid "''value'' in any key"
-msgstr ""
+msgstr "任何設定鍵的「數值」"
msgid "matches if ''key'' exists"
-msgstr ""
+msgstr "如果「設定鍵」存在就符合"
msgid "matches if ''key'' is greater than ''value'' (analogously, less than)"
-msgstr ""
+msgstr "如果「設定鍵」大於 (或小於)「數值」就符合"
msgid ""
"to quote operators.<br>Within quoted strings the <b>\"</b> and <b>\\</b> "
@@ -2464,7 +2465,7 @@ msgid ""
msgstr ""
msgid "combinators"
-msgstr ""
+msgstr "結合"
msgid "logical and (both expressions have to be satisfied)"
msgstr "邏輯 AND (所有正規表示式都要滿足)"
@@ -2473,7 +2474,7 @@ msgid "logical or (at least one expression has to be satisfied)"
msgstr "邏輯 OR (至少一個正規表示式要滿足)"
msgid "logical not"
-msgstr ""
+msgstr "邏輯反相"
msgid "use parenthesis to group expressions"
msgstr ""
@@ -2482,19 +2483,19 @@ msgid "objects"
msgstr "物件"
msgid "all nodes"
-msgstr ""
+msgstr "全部節點"
msgid "all ways"
msgstr "所有路徑"
msgid "all relations"
-msgstr "所有關係"
+msgstr "所有關聯"
msgid "all closed ways"
msgstr "所有封閉的路徑"
msgid "object without useful tags"
-msgstr ""
+msgstr "物件缺少有用的標籤"
msgid "metadata"
msgstr "中繼資料"
@@ -2509,33 +2510,33 @@ msgid "objects with given version"
msgstr "具有指定版本的物件"
msgid "objects with given changeset ID"
-msgstr "具有指定變更組合 ID 的物件"
+msgstr "具有指定變更集 ID 的物件"
msgid "objects with last modification timestamp within range"
-msgstr ""
+msgstr "區間裏有上次變更時間戳記的元件"
msgid "properties"
msgstr "屬性"
msgid ""
"ways with at least 20 nodes, or relations containing at least 20 nodes"
-msgstr ""
+msgstr "有至少 20 個節點的路徑，或是有至少 20 個節點的關聯"
msgid ""
"nodes with at least 3 referring ways, or relations containing at least 3 ways"
-msgstr ""
+msgstr "有至少 3 個相連路徑的節點，或是至少有 3 個路徑的關聯"
msgid "objects having 5 to 10 tags"
msgstr "具有 5 到 10 個標籤的物件"
msgid "objects with given role in a relation"
-msgstr "具有指定關係中角色的物件"
+msgstr "具有指定關聯中角色的物件"
msgid "closed ways with an area of 100 m²"
msgstr "區域面積為 100 m² 的封閉路徑"
msgid "ways with a length of 200 m or more"
-msgstr "長度超過 200 米的路徑"
+msgstr "長度超過 200 公尺的路徑"
msgid "state"
msgstr "狀態"
@@ -2553,28 +2554,28 @@ msgid "all incomplete objects"
msgstr "所有不完整的物件"
msgid "all deleted objects (checkbox <b>{0}</b> must be enabled)"
-msgstr ""
+msgstr "所有已刪除的物件 (必須勾選 <b>{0}</b>)"
msgid "related objects"
-msgstr ""
+msgstr "相關物件"
msgid "all children of objects matching the expression"
-msgstr ""
+msgstr "所有符合運算的下層物件"
msgid "all parents of objects matching the expression"
-msgstr ""
+msgstr "所有符合運算的上層物件"
msgid "relation containing a member of role <i>stop</i>"
-msgstr ""
+msgstr "關聯裏有個成員的角色是 <i>stop</i>"
msgid "objects being part of a relation as role <i>stop</i>"
-msgstr ""
+msgstr "物件是一個關聯裏的一部分、角色為 <i>stop</i>"
msgid "n-th member of relation and/or n-th node of way"
-msgstr ""
+msgstr "關聯的第 n 個成員 與/或 路徑的第 n 個節點"
msgid "every n-th member of relation and/or every n-th node of way"
-msgstr ""
+msgstr "關聯的每第 n 個成員 與/或 路徑的每第 n 個節點"
msgid "view"
msgstr "檢視"
@@ -2583,13 +2584,13 @@ msgid "objects in current view"
msgstr "目前檢視中的物件"
msgid "objects (and all its way nodes / relation members) in current view"
-msgstr ""
+msgstr "目前視窗下的物件 (與所有 路徑節點/關聯成員)"
msgid "objects in downloaded area"
msgstr "已下載區域中的物件"
msgid "objects (and all its way nodes / relation members) in downloaded area"
-msgstr ""
+msgstr "已下載區域的物件 (與所有 路徑節點/關聯成員)"
msgid "No match found for ''{0}''"
msgstr "找不到「{0}」的符合項"
@@ -2611,8 +2612,7 @@ msgstr "正在搜尋"
msgid "Searching in {0} object"
msgid_plural "Searching in {0} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "正在搜尋 {0} 個物件"
msgctxt "search"
msgid "CS"
@@ -2628,7 +2628,7 @@ msgstr "RX"
msgctxt "search"
msgid "CSS"
-msgstr ""
+msgstr "CSS"
msgctxt "search"
msgid "A"
@@ -2653,10 +2653,10 @@ msgstr ""
"{1}"
msgid "Cannot parse timestamp ''{0}''"
-msgstr ""
+msgstr "無法分析時間戳記「{0}」"
msgid "Expecting {0} after {1}"
-msgstr ""
+msgstr "{1} 後面應該有 {0}"
msgid "Range of primitive ids expected"
msgstr ""
@@ -2683,7 +2683,7 @@ msgid "Unexpected token. Expected {0}, found {1}"
msgstr "未預期的記號。應該為 {0}，卻發現 {1}"
msgid "Failed to parse MapCSS selector"
-msgstr ""
+msgstr "無法解析 MapCSS 選擇工具"
msgid "Unexpected token: {0}"
msgstr "未預期的記號：{0}"
@@ -2715,7 +2715,7 @@ msgid "API Capabilities Violation"
msgstr "違反 API 能力"
msgid "Cyclic dependency between relations:"
-msgstr "在關係間有循環相依性："
+msgstr "在關聯間有循環相依性："
msgid "Removed obsolete tags"
msgstr "已移除逾期標籤"
@@ -2728,25 +2728,25 @@ msgid ""
"cannot upload them. Please edit the relations and remove the cyclic "
"dependency.</html>"
msgstr ""
-"<html>{0} 關係形成一個循環，因為它們互相參照對方。<br>JOSM 不能上傳它們。請編輯這個關係並移除掉這個循環相依性。</html>"
+"<html>{0} 關聯形成一個循環，因為它們互相參照對方。<br>JOSM 不能上傳它們。請編輯這個關聯並移除掉這個循環相依性。</html>"
msgid "Relation ..."
-msgstr "關係..."
+msgstr "關聯..."
msgid "... refers to relation"
-msgstr "... 參照到關係"
+msgstr "... 參照到關聯"
msgid "Cycling dependencies"
msgstr "循環相依性"
msgid "Uploading modified notes"
-msgstr ""
+msgstr "正在上傳修改過的註記"
msgid "Note {0} failed: {1}"
-msgstr ""
+msgstr "註解 {0} 失敗：{1}"
msgid "Notes failed to upload"
-msgstr ""
+msgstr "上傳註解失敗"
msgid ""
"The following are results of automatic validation. Try fixing these, but be "
@@ -2786,14 +2786,14 @@ msgid "Add way {0}"
msgstr "加入路徑 {0}"
msgid "Add relation {0}"
-msgstr "加入關係 {0}"
+msgstr "加入關聯 {0}"
msgid "Added {0} object"
msgid_plural "Added {0} objects"
msgstr[0] "已加入 {0} 個物件"
msgid "New way {0} has 0 nodes"
-msgstr ""
+msgstr "新路徑 {0} 為 0 個節點"
msgid "Change node {0}"
msgstr "改變節點 {0}"
@@ -2802,7 +2802,7 @@ msgid "Change way {0}"
msgstr "改變路徑 {0}"
msgid "Change relation {0}"
-msgstr "改變關係 {0}"
+msgstr "改變關聯 {0}"
msgid "Change nodes of {0}"
msgstr "更改 {0} 内的節點"
@@ -2814,7 +2814,7 @@ msgid "Remove \"{0}\" for way ''{1}''"
msgstr "從路徑「{1}」移除「{0}」"
msgid "Remove \"{0}\" for relation ''{1}''"
-msgstr "從關係「{1}」移除「{0}」"
+msgstr "從關聯「{1}」移除「{0}」"
msgid "Set {0}={1} for node ''{2}''"
msgstr "在節點「{2}」設定 {0}={1}"
@@ -2823,7 +2823,7 @@ msgid "Set {0}={1} for way ''{2}''"
msgstr "在路徑「{2}」設定 {0}={1}"
msgid "Set {0}={1} for relation ''{2}''"
-msgstr "在關係「{2}」設定 {0}={1}"
+msgstr "在關聯「{2}」設定 {0}={1}"
msgid "Remove \"{0}\" for {1} object"
msgid_plural "Remove \"{0}\" for {1} objects"
@@ -2831,8 +2831,7 @@ msgstr[0] "自 {1} 項物件移除 \"{0}\""
msgid "Set {0}={1} for {2} object"
msgid_plural "Set {0}={1} for {2} objects"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "在 {2} 個物件設定 {0}={1}"
msgid "Deleted {0} tags for {1} object"
msgid_plural "Deleted {0} tags for {1} objects"
@@ -2850,7 +2849,7 @@ msgid_plural "objects"
msgstr[0] "物件"
msgid "Change relation member role for {0} {1}"
-msgstr "改變 {0} {1} 的關係成員角色"
+msgstr "改變 {0} {1} 的關聯成員角色"
msgid "Deleted ''{0}''"
msgstr "已刪除「{0}」"
@@ -2865,7 +2864,7 @@ msgid "Delete way {0}"
msgstr "刪除路徑 {0}"
msgid "Delete relation {0}"
-msgstr "刪除關係 {0}"
+msgstr "刪除關聯 {0}"
msgid "Delete {0} object"
msgid_plural "Delete {0} objects"
@@ -2881,7 +2880,7 @@ msgstr[0] "刪除 {0} 個路徑"
msgid "Delete {0} relation"
msgid_plural "Delete {0} relations"
-msgstr[0] "刪除 {0} 個關係"
+msgstr[0] "刪除 {0} 個關聯"
msgid "Delete confirmation"
msgstr "刪除動作確認"
@@ -2890,12 +2889,12 @@ msgid ""
"You are about to delete 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 delete?"
-msgstr "您將要刪除在下載的區域外的節點。<br>這樣有時會發生問題，因為其他物件（您沒有看到的）可能會使用它們。<br>確定要刪除嗎？"
+msgstr "你準備要刪除在下載的區域外的節點。<br>這樣有時會發生問題，因為其他物件 (你沒有看到的) 可能會使用它們。<br>真的要刪除嗎？"
msgid ""
"You are about to delete incomplete objects.<br>This will cause problems "
"because you don''t see the real object.<br>Do you really want to delete?"
-msgstr "您即將刪除不完整的物件。<br>這樣會造成問題，因為您沒有看到實際的物件。<br>您確定要刪除嗎？"
+msgstr "你即將刪除不完整的物件。<br>這樣會造成問題，因為你沒有看到實際的物件。<br>你確定要刪除嗎？"
msgid ""
"You are about to delete {0} relation: {1}<br/>This step is rarely necessary "
@@ -2909,7 +2908,7 @@ msgstr[0] ""
msgstr[1] ""
msgid "Delete relation?"
-msgstr "刪除關係？"
+msgstr "刪除關聯？"
msgid "Move {0} node"
msgid_plural "Move {0} nodes"
@@ -2971,31 +2970,28 @@ msgid "Resolve conflicts in deleted state in {0}"
msgstr "解決 {0} 刪除狀態的衝突"
msgid "Set the ''modified'' flag for node {0}"
-msgstr "在關係 {0} 設定「modified」旗標"
+msgstr "在節點 {0} 設定「modified」旗標"
msgid "Set the ''modified'' flag for way {0}"
-msgstr "在關係 {0} 設定「modified」旗標"
+msgstr "在路徑 {0} 設定「modified」旗標"
msgid "Set the ''modified'' flag for relation {0}"
-msgstr "在關係 {0} 設定「modified」旗標"
+msgstr "在關聯 {0} 設定「modified」旗標"
msgid "Resolve conflicts in member list of relation {0}"
-msgstr "解決關係 {0} 的成員清單的衝突"
+msgstr "解決關聯 {0} 的成員清單的衝突"
msgid "Resolve {0} tag conflict in node {1}"
msgid_plural "Resolve {0} tag conflicts in node {1}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "解決節點 {1} 的 {0} 個標籤衝突"
msgid "Resolve {0} tag conflict in way {1}"
msgid_plural "Resolve {0} tag conflicts in way {1}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "解決路徑 {1} 的 {0} 個標籤衝突"
msgid "Resolve {0} tag conflict in relation {1}"
msgid_plural "Resolve {0} tag conflicts in relation {1}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "解決關聯 {1} 的 {0} 個標籤衝突"
msgid "Resolve version conflict for node {0}"
msgstr "節點 {0} 的調解衝突版本"
@@ -3004,7 +3000,7 @@ msgid "Resolve version conflict for way {0}"
msgstr "路徑 {0} 的調解衝突版本"
msgid "Resolve version conflict for relation {0}"
-msgstr "關係 {0} 的調解衝突版本"
+msgstr "關聯 {0} 的調解衝突版本"
msgid "Resolve conflicts in node list of way {0}"
msgstr "解決路徑 {0} 節點清單中的版本衝突"
@@ -3024,12 +3020,12 @@ msgstr[0] ""
msgstr[1] ""
msgid "Reverse directional way."
-msgstr ""
+msgstr "將帶有方向的路徑反向。"
msgid ""
"When reversing this way, the following changes are suggested in order to "
"maintain data consistency."
-msgstr ""
+msgstr "將路徑反向時，建議做以下的變更以保持資料一致性。"
msgid "Apply selected changes"
msgstr "套用選取的變更"
@@ -3038,13 +3034,13 @@ msgid "Do not apply changes"
msgstr "不要套用變更"
msgid "Please select which changes you want to apply."
-msgstr ""
+msgstr "請選取要套用哪些變更。"
msgid "Tags of "
-msgstr ""
+msgstr "標籤在 "
msgid "Roles in relations referring to"
-msgstr "關係中的角色參照到"
+msgstr "關聯中的角色參照到"
msgid "Automatic tag correction"
msgstr "自動修正標籤"
@@ -3062,25 +3058,25 @@ msgid "Unable to delete old backup file {0}"
msgstr "無法刪除舊的備份檔案 {0}"
msgid "Your work has been saved automatically."
-msgstr ""
+msgstr "你的作業已自動儲存。"
msgid "Restoring files"
msgstr "正在還原檔案"
msgid "Unable to delete backup file {0}"
-msgstr ""
+msgstr "無法刪除備份檔案 {0}"
msgid "Unable to delete PID file {0}"
-msgstr ""
+msgstr "無法刪除 PID 檔案 {0}"
msgid "Unable to delete archived backup file {0}"
-msgstr ""
+msgstr "無法刪除壓縮的備份檔案 {0}"
msgid "Illegal latitude value ''{0}''"
-msgstr "不合法的緯度數值「{0}」"
+msgstr "不合規定的緯度數值「{0}」"
msgid "Illegal longitude value ''{0}''"
-msgstr "不合法的經度數值「{0}」"
+msgstr "不合規定的經度數值「{0}」"
msgid "Question"
msgstr "問題"
@@ -3101,33 +3097,33 @@ msgid ""
msgstr ""
msgid "Failed to create missing cache directory: {0}"
-msgstr ""
+msgstr "無法建立消失的快取目錄：{0}"
msgid "<html>Failed to create missing cache directory: {0}</html>"
msgstr "<html>無法建立缺少的快取目錄： {0}</html>"
msgid "Unable to delete temporary file {0}"
-msgstr ""
+msgstr "無法刪除暫存檔案 {0}"
msgid "Unable to set file non-readable {0}"
-msgstr ""
+msgstr "無法設定檔案為不可讀取 {0}"
msgid "Unable to set file non-writable {0}"
-msgstr ""
+msgstr "無法設定檔案為不可寫入 {0}"
msgid "Unable to set file non-executable {0}"
-msgstr ""
+msgstr "無法設定檔案為不可執行 {0}"
msgid "Unable to set file readable {0}"
-msgstr ""
+msgstr "無法設定檔案為可讀取 {0}"
msgid "Unable to set file writable {0}"
-msgstr ""
+msgstr "無法設定檔案為可寫入 {0}"
msgid ""
"Failed to initialize preferences. Preference directory ''{0}'' is not a "
"directory."
-msgstr ""
+msgstr "無法啟動偏好設定：偏好設定目錄「{0}」不是目錄。"
msgid ""
"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
@@ -3137,7 +3133,7 @@ msgstr "<html>初始化偏好設定失敗。<br>偏好設定目錄「{0}」不
msgid ""
"Failed to initialize preferences. Failed to create missing preference "
"directory: {0}"
-msgstr ""
+msgstr "無法啟動偏好設定：設定目錄「{0}」建立失敗。"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to create missing "
@@ -3145,11 +3141,11 @@ msgid ""
msgstr "<html>初始化偏好設定失敗。<br>無法建立缺少的偏好設定目錄：{0}</html>"
msgid "Missing preference file ''{0}''. Creating a default preference file."
-msgstr ""
+msgstr "偏好設定檔案「{0}」消失，正在用預設值建立新的檔案。"
msgid ""
"Replacing existing preference file ''{0}'' with default preference file."
-msgstr ""
+msgstr "用預設值替換原有偏好設定檔案「{0}」。"
msgid ""
"<html>Failed to initialize preferences.<br>Failed to reset preference file "
@@ -3173,7 +3169,7 @@ msgid "Failed to delete faulty defaults cache file: {0}"
msgstr ""
msgid "Paint style {0}: {1}"
-msgstr "繪畫樣式 {0}：{1}"
+msgstr "繪製樣式 {0}：{1}"
msgid "Layer: {0}"
msgstr "圖層：{0}"
@@ -3199,7 +3195,7 @@ msgid "Imperial"
msgstr "英制"
msgid "Nautical Mile"
-msgstr ""
+msgstr "海浬"
msgid "UNKNOWN"
msgstr "不明"
@@ -3245,55 +3241,60 @@ msgid "E"
msgstr "東"
msgid "Date of imagery: {0}"
-msgstr ""
+msgstr "影像日期：{0}"
msgid "This imagery is marked as best in this region in other editors."
msgstr ""
msgid "{0} mirror server {1}"
-msgstr ""
+msgstr "{0} 鏡像伺服器 {1}"
msgid "{0} mirror server"
-msgstr ""
+msgstr "{0} 鏡像伺服器"
msgid "Update default entries"
-msgstr ""
+msgstr "更新預設項目"
msgid "Update imagery ''{0}''"
-msgstr ""
+msgstr "更新影像「{0}」"
msgid "Drop old imagery ''{0}''"
-msgstr ""
+msgstr "捨棄舊影像「{0}」"
msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable"
msgstr "找不到投影法「{0}」，書籤「{1}」無法使用"
msgid "HTTP error {0} when loading tiles"
-msgstr ""
+msgstr "載入圖磚時發生 HTTP 錯誤 {0}"
msgid "Error downloading tiles: {0}"
-msgstr ""
+msgstr "下載圖磚時發生錯誤：{0}"
msgid "Could not load image from tile server"
-msgstr ""
+msgstr "無法從伺服器載入影像"
msgid ""
"{0} is not a valid WMS argument. Please check this server URL:\n"
"{1}"
msgstr ""
+"{0} 不是有效的 WMS 參數，請檢查伺服器 URL 網址：\n"
+"{1}"
msgid "Select WMTS layer"
-msgstr ""
+msgstr "選取 WMTS 圖層"
msgid "Layer name"
-msgstr ""
+msgstr "圖層名稱"
msgid "Projection"
-msgstr "投影方法"
+msgstr "投影法"
msgid "Matrix set identifier"
msgstr ""
+msgid "No default layer selected, choosing first layer."
+msgstr "沒有選取預設圖層，使用第一個圖層。"
+
msgid "No layers defined by getCapabilities document: {0}"
msgstr ""
@@ -3302,12 +3303,17 @@ msgid ""
msgstr ""
msgid ""
+"Can''t use layer {0} because no supported formats where found. Layer is "
+"available in formats: {1}"
+msgstr ""
+
+msgid ""
"Only square tiles are supported. {0}x{1} returned by server for TileMatrix "
"identifier {2}"
msgstr ""
msgid "Note"
-msgstr ""
+msgstr "註解"
msgid "ID > 0 expected. Got {0}."
msgstr "預期 ID > 0。收到 {0}。"
@@ -3345,7 +3351,7 @@ msgid "Missing merge target for node with id {0}"
msgstr "缺少 id {0} 節點的合併目標"
msgid "Missing merge target for relation with id {0}"
-msgstr "缺少 id {0} 關係的合併目標"
+msgstr "關聯 ID {0} 缺少合併目標"
msgid "Missing merge target of type {0} with id {1}"
msgstr "缺少 id {1} 類型 {0} 的合併目標"
@@ -3387,7 +3393,7 @@ msgstr[0] "路徑"
msgid "relation"
msgid_plural "relations"
-msgstr[0] "關係"
+msgstr[0] "關聯"
msgid "closedway"
msgstr "封閉路徑"
@@ -3461,7 +3467,7 @@ msgid "selected"
msgstr "已選取"
msgid "Relation: selected"
-msgstr "關係：已選取"
+msgstr "關聯：已選取"
msgid "Node: standard"
msgstr "節點：標準"
@@ -3500,16 +3506,16 @@ msgid "value expected"
msgstr ""
msgid "UTM projection (''+proj=utm'') requires ''+zone=...'' parameter."
-msgstr ""
+msgstr "UTM 投影法 (''+proj=utm'') 需要 ''+zone=...'' 參數。"
msgid "Expected integer value in range 1-60 for ''+zone=...'' parameter."
msgstr ""
msgid "No unit found for: {0}"
-msgstr ""
+msgstr "找不到單位：{0}"
msgid "Unknown parameter: ''{0}''."
-msgstr ""
+msgstr "不明參數：''{0}'' 。"
msgid "Value expected for parameter ''{0}''."
msgstr ""
@@ -3518,7 +3524,7 @@ msgid "No value expected for parameter ''{0}''."
msgstr ""
msgid "Parameter must begin with a ''+'' character (found ''{0}'')"
-msgstr ""
+msgstr "參數必須以「+」字元開頭 (找到「{0}」)"
msgid "Unexpected parameter format (''{0}'')"
msgstr "未預期的參數格式(「{0}」)"
@@ -3527,7 +3533,7 @@ msgid "Value ''{0}'' for option +init not supported."
msgstr ""
msgid "Ellipsoid ''{0}'' not supported."
-msgstr ""
+msgstr "不支援橢球「{0}」。"
msgid "Combination of ellipsoid parameters is not supported."
msgstr ""
@@ -3558,7 +3564,7 @@ msgid "Unexpected number of arguments for parameter ''+bounds'' (must be 4)"
msgstr ""
msgid "Unknown parameter ''{0}''"
-msgstr ""
+msgstr "不明的參數「{0}」"
msgid "Expected number argument for parameter ''{0}''"
msgstr ""
@@ -3580,7 +3586,7 @@ msgid "WGS84"
msgstr "WGS84"
msgid "Albers Equal Area"
-msgstr ""
+msgstr "亞爾勃斯等面積投影法"
msgid "Parameter ''{0}'' required."
msgstr "需要「{0}」參數。"
@@ -3589,25 +3595,25 @@ msgid "standard parallels are opposite"
msgstr ""
msgid "Cassini-Soldner"
-msgstr ""
+msgstr "卡西尼投影法"
msgid "Double Stereographic"
-msgstr ""
+msgstr "雙球極平面投影法"
msgid "Lambert Azimuthal Equal Area"
-msgstr ""
+msgstr "蘭伯特正方位等積投影法"
msgid "Lambert Conformal Conic"
-msgstr ""
+msgstr "蘭伯特正圓錐投影法"
msgid "Lat/lon (Geodetic)"
-msgstr ""
+msgstr "緯/經度 (Geodetic)"
msgid "Mercator"
-msgstr "麥卡托投影"
+msgstr "麥卡托投影法"
msgid "Oblique Mercator"
-msgstr ""
+msgstr "斜麥卡托投影法"
msgid "Unsuitable parameters ''{0}'' and ''{1}'' for two point method."
msgstr ""
@@ -3616,22 +3622,22 @@ msgid "Illegal value for parameter ''{0}'': {1}"
msgstr ""
msgid "error in initialization"
-msgstr ""
+msgstr "起始時有錯誤"
msgid "Polar Stereographic"
-msgstr ""
+msgstr "球極平面投影法"
msgid "Polar Stereographic: Parameter ''{0}'' must be 90 or -90."
-msgstr ""
+msgstr "球極平面投影法：參數 ''{0}'' 必須是 90 或 -90。"
msgid "Sinusoidal"
msgstr ""
msgid "Swiss Oblique Mercator"
-msgstr ""
+msgstr "瑞士斜麥卡托投影法"
msgid "Transverse Mercator"
-msgstr ""
+msgstr "橫麥卡托投影法"
msgid ""
"Error initializing test {0}:\n"
@@ -3653,22 +3659,22 @@ msgid "Running test {0}"
msgstr "執行測試 {0}"
msgid "E-mail address is invalid"
-msgstr ""
+msgstr "電子郵件信箱無效"
msgid "E-mail address contains an invalid username: {0}"
-msgstr ""
+msgstr "電子郵件信箱的使用者名稱無效：{0}"
msgid "E-mail address contains an invalid domain: {0}"
-msgstr ""
+msgstr "電子郵件信箱的網址無效：{0}"
msgid "Email validator"
-msgstr ""
+msgstr "電子郵件認證"
msgid "URL is invalid"
-msgstr ""
+msgstr "URL 網址無效"
msgid "URL contains an invalid protocol: {0}"
-msgstr ""
+msgstr "URL 網址的協定無效：{0}"
msgid "URL contains an invalid authority: {0}"
msgstr ""
@@ -3680,10 +3686,10 @@ msgid "URL contains an invalid query: {0}"
msgstr ""
msgid "URL contains an invalid fragment: {0}"
-msgstr ""
+msgstr "URL 網址有無效的片段：{0}"
msgid "URL validator"
-msgstr ""
+msgstr "URL 網址認證"
msgid "Addresses"
msgstr "地址"
@@ -3707,7 +3713,7 @@ msgid "Multiple street names in relation"
msgstr ""
msgid "House number too far from street"
-msgstr ""
+msgstr "房屋號碼離街道太遠"
msgid "API Capabilities"
msgstr "API 能力"
@@ -3750,7 +3756,7 @@ msgid "Reversed coastline"
msgstr "反方向的海岸線"
msgid "invalid coastline"
-msgstr ""
+msgstr "無效的海岸線"
msgid "Conditional Keys"
msgstr ""
@@ -3768,13 +3774,13 @@ msgid "Wrong syntax in {0} key"
msgstr ""
msgid "Error in {0} value: {1}"
-msgstr ""
+msgstr "{0} 有錯誤，值：{1}"
msgid "Crossing ways"
msgstr "路徑交叉"
msgid "Crossing buildings"
-msgstr "跨越建築物"
+msgstr "穿越建築物"
msgid "Crossing waterways"
msgstr "跨越水路"
@@ -3839,18 +3845,18 @@ msgid "Nodes at same position"
msgstr "節點在同一個地點"
msgid "Duplicated relations"
-msgstr "重複的關係"
+msgstr "重複的關聯"
msgid ""
"This test checks that there are no relations with same tags and same members "
"with same roles."
-msgstr "這個測試會檢查有沒有具有相同標籤、成員和角色的關係。"
+msgstr "這個測試會檢查有沒有具有相同標籤、成員和角色的關聯。"
msgid "Relations with same members"
-msgstr "有相同成員的關係"
+msgstr "有相同成員的關聯"
msgid "Delete duplicate relations"
-msgstr "刪除重複的關係"
+msgstr "刪除重複的關聯"
msgid "Duplicated ways"
msgstr "重複的路徑"
@@ -3885,7 +3891,7 @@ msgid "Highway link is not linked to adequate highway/link"
msgstr ""
msgid "Missing pedestrian crossing information"
-msgstr ""
+msgstr "缺少行人穿越道資訊"
msgid "Unknown country code: {0}"
msgstr ""
@@ -3894,25 +3900,25 @@ msgid "Unknown source:maxspeed context: {0}"
msgstr ""
msgid "Internet tags"
-msgstr ""
+msgstr "網際網路標籤"
msgid "Checks for errors in internet-related tags."
-msgstr ""
+msgstr "檢查網際網路相關標籤的錯誤。"
msgid "''{0}'': {1}"
-msgstr ""
+msgstr "''{0}''：{1}"
msgid "Lane tags"
-msgstr ""
+msgstr "車道標籤"
msgid "Test that validates ''lane:'' tags."
-msgstr ""
+msgstr "測試「lane:」標籤是否正確。"
msgid "Number of {0} greater than {1}"
-msgstr ""
+msgstr "{0} 的數字比 {1} 大"
msgid "{0}+{1}"
-msgstr ""
+msgstr "{0}+{1}"
msgid "Number of lane dependent values inconsistent"
msgstr ""
@@ -3965,6 +3971,9 @@ msgstr "這個測試會檢查多邊形是否合格。"
msgid "Area style way is not closed"
msgstr "區域類型的路徑並未封閉"
+msgid "No outer way for boundary"
+msgstr "邊界沒有外緣路徑"
+
msgid "No outer way for multipolygon"
msgstr "多重多邊形沒有外部路徑"
@@ -4007,7 +4016,7 @@ msgid "Multipolygon rings are equal"
msgstr ""
msgid "Role for ''{0}'' should be ''{1}''"
-msgstr ""
+msgstr "''{0}'' 的角色應該是 ''{1}''"
msgid "Multipolygon inner way is outside"
msgstr "多重多邊形的內部路徑超出外圍"
@@ -4021,6 +4030,9 @@ msgstr ""
msgid "No useful role for multipolygon member"
msgstr "多重多邊形成員沒有有用的角色"
+msgid "Non-Way in boundary"
+msgstr ""
+
msgid "Non-Way in multipolygon"
msgstr "多重多邊形內沒有路徑"
@@ -4127,13 +4139,13 @@ msgid "Route relation contains a gap"
msgstr ""
msgid "Stop position not part of route"
-msgstr ""
+msgstr "停車位置不是路線的一部分"
msgid "Role verification problem"
msgstr "角色驗證問題"
msgid "Relation checker"
-msgstr "關係檢查程式"
+msgstr "關聯檢查工具"
msgid "Checks for errors in relations."
msgstr ""
@@ -4143,10 +4155,10 @@ msgid ""
msgstr ""
msgid "Relation type is unknown"
-msgstr "關係類型不明"
+msgstr "關聯類型不明"
msgid "Relation is empty"
-msgstr "關係是空白的"
+msgstr "關聯是空白的"
msgid ""
"Role of relation member does not match expression ''{0}'' in template {1}"
@@ -4202,7 +4214,7 @@ msgid "Invalid spellcheck line: {0}"
msgstr "無效的拼字檢查行：{0}"
msgid "Adding {0} to spellchecker"
-msgstr ""
+msgstr "將 {0} 加入拼字檢查工具"
msgid ""
"Could not access data file(s):\n"
@@ -4314,10 +4326,10 @@ msgid "Could not find warning level"
msgstr "找不到警告等級"
msgid "Illegal expression ''{0}''"
-msgstr "不合法的辭句「{0}」"
+msgstr "不合規定的辭句「{0}」"
msgid "Illegal regular expression ''{0}''"
-msgstr "不合法的正規表示式「{0}」"
+msgstr "不合規定的正規表示式「{0}」"
msgid "Turnrestrictions"
msgstr "轉彎限制"
@@ -4410,7 +4422,7 @@ msgid "boundary type {0}"
msgstr "邊界類型 {0}"
msgid "building"
-msgstr "建築"
+msgstr "建築物"
msgid "area"
msgstr "區域"
@@ -4485,7 +4497,7 @@ msgid "Unnamed junction"
msgstr "未命名的匯集點"
msgid "Untagged ways (commented)"
-msgstr "未加標籤路徑 (有註解)"
+msgstr "未加標籤的路徑 (有評論)"
msgid "Untagged ways"
msgstr "未加標籤的路徑"
@@ -4515,16 +4527,16 @@ msgid "Reversed land: land not on left side"
msgstr "反轉的陸地：陸地不在左側"
msgid "Show this dialog again the next time"
-msgstr ""
+msgstr "下次再顯示這個對話方塊"
msgid "Do not show again (this operation)"
-msgstr ""
+msgstr "不再顯示 (本次作業)"
msgid "Do not show again (this session)"
-msgstr ""
+msgstr "不再顯示 (本次作業階段)"
msgid "Do not show again (remembers choice)"
-msgstr "不要再顯示（記住選擇）"
+msgstr "別再顯示 (記住這次選擇)"
msgid "incomplete"
msgstr "不完整"
@@ -4562,25 +4574,25 @@ msgid "public transport"
msgstr "大眾運輸"
msgid "Changeset {0}"
-msgstr "變更組合 {0}"
+msgstr "變更集 {0}"
msgid "Precondition violation"
msgstr "違反先決條件"
msgid "Security exception"
-msgstr "安全性例外"
+msgstr "安全性異常"
msgid "Network exception"
-msgstr "網路例外"
+msgstr "網路異常"
msgid "IO Exception"
-msgstr "IO 例外"
+msgstr "IO 異常"
msgid "Illegal Data"
-msgstr "無效的資料"
+msgstr "不合規定的資料"
msgid "Offline mode"
-msgstr ""
+msgstr "離線模式"
msgid "Internal Server Error"
msgstr "內部伺服器錯誤"
@@ -4667,16 +4679,16 @@ msgid "Download the bounding box"
msgstr "下載此綁定方塊"
msgid "Download the location at the URL (with lat=x&lon=y&zoom=z)"
-msgstr ""
+msgstr "下載 URL 網址的位置 (用 lat=x&lon=y&zoom=z )"
msgid "Open a file (any file type that can be opened with File/Open)"
-msgstr "開啟檔案（任何可以使用 檔案/開啟 來開啟的檔案類型）"
+msgstr "開啟檔案 (任何可以使用 檔案/開啟 來開啟的檔案類型)"
msgid "Download the bounding box as raw GPS"
msgstr ""
msgid "Download the location at the URL (with lat=x&lon=y&zoom=z) as raw GPS"
-msgstr ""
+msgstr "下載 URL 網址的位置 (用 lat=x&lon=y&zoom=z ) 作為新 GPS"
msgid "Select with the given search"
msgstr "選取指定的搜尋"
@@ -4703,7 +4715,7 @@ msgid "Print debugging messages to console"
msgstr ""
msgid "Skip loading plugins"
-msgstr ""
+msgstr "跳過載入插件"
msgid "Disable access to the given resource(s), separated by comma"
msgstr ""
@@ -4712,36 +4724,36 @@ msgid "options provided as Java system properties"
msgstr "選項提供為 Java 系統屬性"
msgid "Change the JOSM directory name"
-msgstr ""
+msgstr "變更 JOSM 目錄名稱"
msgid "/PATH/TO/JOSM/PREF "
-msgstr ""
+msgstr "/PATH/TO/JOSM/PREF "
msgid "Set the preferences directory"
-msgstr ""
+msgstr "設定偏好設定目錄"
msgid "Default: {0}"
-msgstr ""
+msgstr "預設：{0}"
msgid "/PATH/TO/JOSM/USERDATA"
-msgstr ""
+msgstr "/PATH/TO/JOSM/USERDATA"
msgid "Set the user data directory"
-msgstr ""
+msgstr "設定使用者資料目錄"
msgid "/PATH/TO/JOSM/CACHE "
-msgstr ""
+msgstr "/PATH/TO/JOSM/CACHE "
msgid "Set the cache directory"
-msgstr ""
+msgstr "設定快取目錄"
msgid "/PATH/TO/JOSM/HOMEDIR "
-msgstr ""
+msgstr "/PATH/TO/JOSM/HOMEDIR "
msgid ""
"Set the preferences+data+cache directory (cache directory will be "
"josm.home/cache)"
-msgstr ""
+msgstr "設定 偏好設定+資料+快取 目錄 快取目錄是 josm.home/cache)"
msgid ""
"-Djosm.home has lower precedence, i.e. the specific setting overrides the "
@@ -4766,16 +4778,16 @@ msgid ""
msgstr "參數 --download、 --downloadgps 和 --selection 會以這個順序處理。"
msgid "Make sure you load some data if you use --selection."
-msgstr "如果您使用 --selection 請確定已載入某些資料。"
+msgstr "如果你使用 --selection 請確定已載入某些資料。"
msgid "Log level is at {0} ({1}, {2})"
-msgstr ""
+msgstr "記錄等級是 {0} ({1}, {2})"
msgid "Plugin loading skipped"
-msgstr ""
+msgstr "已跳過載入插件"
msgid "Enabled detailed debug level (trace)"
-msgstr ""
+msgstr "啟用詳細除錯層級 (追查用)"
msgid "Initializing"
msgstr "初始化"
@@ -4807,8 +4819,7 @@ msgid ""
"JOSM is running in offline mode. This resource will not be available: {0}"
msgid_plural ""
"JOSM is running in offline mode. These resources will not be available: {0}"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "JOSM 正執行在離線模式下，資源無法使用：{0}"
msgid ""
"Detected useable IPv6 network, prefering IPv6 over IPv4 after next restart."
@@ -4837,13 +4848,13 @@ msgstr[0] "JOSM 發現 {0} 個未儲存的 osm 資料圖層。 "
msgid ""
"It looks like JOSM crashed last time. Would you like to restore the data?"
-msgstr "看起來 JOSM 上次當機了。您想要還原資料嗎？"
+msgstr "看起來 JOSM 上次當機了。你想要還原資料嗎？"
msgid "Change proxy settings"
-msgstr ""
+msgstr "變更代理伺服器設定"
msgid "Proxy errors occurred"
-msgstr ""
+msgstr "發生代理伺服器錯誤"
msgid ""
"JOSM tried to access the following resources:<br>{0}but <b>failed</b> to do "
@@ -4852,7 +4863,7 @@ msgid ""
msgstr ""
msgid "Network errors occurred"
-msgstr ""
+msgstr "發生網路錯誤"
msgid ""
"JOSM tried to access the following resources:<br>{0}but <b>failed</b> to do "
@@ -4941,7 +4952,7 @@ msgid "Audio"
msgstr "聲音"
msgid "Do not hide toolbar"
-msgstr ""
+msgstr "不隱藏工具列"
msgid "Hide this button"
msgstr "隱藏這個按鈕"
@@ -4968,7 +4979,7 @@ msgid "Move up"
msgstr "上移"
msgid "Move down"
-msgstr "下移(_D"
+msgstr "下移"
msgid "Zoom in"
msgstr "拉近"
@@ -4980,22 +4991,22 @@ msgid "scale"
msgstr "縮放"
msgid "Status bar background"
-msgstr ""
+msgstr "狀態列背景"
msgid "Status bar background: active"
-msgstr ""
+msgstr "狀態列背景：啟動"
msgid "Status bar foreground"
-msgstr ""
+msgstr "狀態列前景"
msgid "Status bar foreground: active"
-msgstr ""
+msgstr "狀態列前景：啟動"
msgid "{0} ({1})"
msgstr "{0} ({1})"
msgid "The (compass) heading of the line segment being drawn."
-msgstr "繪出線段的（指南針）箭頭。"
+msgstr "繪出線段的 (指南針) 箭頭。"
msgid "The angle between the previous and the current way segment."
msgstr "前一個路徑區段與目前區段之間的角度。"
@@ -5042,13 +5053,13 @@ msgid "Username"
msgstr "使用者名稱"
msgid "Created date"
-msgstr ""
+msgstr "已建立的資料"
msgid "Last change date"
-msgstr ""
+msgstr "上次變更資料"
msgid "Select note sorting method"
-msgstr ""
+msgstr "選取註解排序方法"
msgid "Click to cancel the current operation"
msgstr "點選以取消目前的操作"
@@ -5063,10 +5074,10 @@ msgid " ({0})"
msgstr " ({0})"
msgid "Enlarge"
-msgstr ""
+msgstr "放大"
msgid "Shrink"
-msgstr ""
+msgstr "精簡"
msgid ""
"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
@@ -5238,7 +5249,7 @@ msgstr "合併的版本"
msgid ""
"List of merged elements. They will replace the list of my elements when the "
"merge decisions are applied."
-msgstr ""
+msgstr "已合併元件的清單：當決定套用時，他們會替換掉「我的元件」清單。"
msgid "Their version"
msgstr "他們的版本"
@@ -5314,13 +5325,13 @@ msgid "Up"
msgstr "上"
msgid "Move up the selected entries by one position."
-msgstr ""
+msgstr "選取的項目往上移動一個位置"
msgid "Down"
msgstr "下"
msgid "Move down the selected entries by one position."
-msgstr "將選取的項目向下移動一個位置"
+msgstr "選取的項目往下移動一個位置"
msgid "Remove"
msgstr "移除"
@@ -5391,7 +5402,7 @@ msgstr "沒有待解決的標籤衝突"
msgid "Tags({0} conflict)"
msgid_plural "Tags({0} conflicts)"
-msgstr[0] "標籤（{0} 衝突）"
+msgstr[0] "標籤 ({0} 衝突)"
msgid "{0} pending tag conflict to be resolved"
msgid_plural "{0} pending tag conflicts to be resolved"
@@ -5416,13 +5427,13 @@ msgstr "成員(已解決)"
msgid ""
"Merged member list frozen. No pending conflicts in the member list of this "
"relation"
-msgstr "合併的節點清單已凍結。這個關係的成員清單中沒有待解決的衝突"
+msgstr "合併的節點清單已凍結。這個關聯的成員清單中沒有待解決的衝突"
msgid "Members(with conflicts)"
msgstr "成員(有衝突)"
msgid "Pending conflicts in the member list of this relation"
-msgstr "這個關係的成員清單中待解決的衝突"
+msgstr "這個關聯的成員清單中待解決的衝突"
msgid "No pending property conflicts"
msgstr "沒有待解決的衝突"
@@ -5463,7 +5474,7 @@ msgid "Referenced by:"
msgstr "參照於："
msgid "(none)"
-msgstr "（沒有）"
+msgstr "(沒有)"
msgid "deleted"
msgstr "已刪除"
@@ -5517,10 +5528,10 @@ msgid "Value"
msgstr "數值"
msgid "My version (local dataset)"
-msgstr "我的版本（本地端資料組合）"
+msgstr "我的版本 (本地端資料組合)"
msgid "Their version (server dataset)"
-msgstr "他們的版本（伺服器資料組合）"
+msgstr "他們的版本 (伺服器資料組合)"
msgid "Keep the selected key/value pairs from the local dataset"
msgstr "保留本地端資料組合中選取的設定鍵/數值配對"
@@ -5574,7 +5585,7 @@ msgstr[0] ""
msgstr[1] ""
msgid "Combine confirmation"
-msgstr ""
+msgstr "確認組合"
msgid ""
"You are about to combine {0} objects, but the following tags are used "
@@ -5605,7 +5616,7 @@ msgid "all"
msgstr "全部"
msgid "sum"
-msgstr ""
+msgstr "加總"
msgid "Please decide which values to keep"
msgstr "請決定要保留的數值"
@@ -5615,7 +5626,7 @@ msgstr "數值「{0}」即將接受鍵值「{1}」"
msgid ""
"All numeric values sumed as ''{0}'' are going to be applied for key ''{1}''"
-msgstr ""
+msgstr "所有數字數值加總為「{0}」後會套用到「{1}」設定鍵"
msgid "The key ''{0}'' and all its values are going to be removed"
msgstr "鍵值「{0}」和它所有的數值都會移除"
@@ -5636,7 +5647,7 @@ msgid "Tags from ways"
msgstr "路徑的標籤"
msgid "Tags from relations"
-msgstr "關係的標籤"
+msgstr "關聯的標籤"
msgid "Conflicts in pasted tags"
msgstr "衝突發生於貼上的標籤"
@@ -5660,19 +5671,19 @@ msgstr[0] "{0} 路徑"
msgid "{0} relation"
msgid_plural "{0} relations"
-msgstr[0] "{0} 關係"
+msgstr[0] "{0} 個關聯"
msgid "Position {0} is out of range. Current number of members is {1}."
msgstr "位置 {0} 超出範圍。目前的成員數為 {1}。"
msgid "Remove this relation member from the relation"
-msgstr "從關係中移除這個關係成員"
+msgstr "從關聯中移除這個關聯成員"
msgid "Keep"
msgstr "保留"
msgid "Keep this relation member for the target object"
-msgstr "保留目標物件的這個關係成員"
+msgstr "保留目標物件的這個關聯成員"
msgid "Undecided"
msgstr "未決定"
@@ -5684,15 +5695,15 @@ msgid "Role:"
msgstr "角色："
msgid "Enter a role for all relation memberships"
-msgstr "輸入所有關係成員的角色"
+msgstr "輸入所有關聯成員的角色"
msgid "Tag modified relations with "
-msgstr "標籤修改的關係為 "
+msgstr "標籤修改的關聯為 "
msgid ""
"<html>Select to enable entering a tag which will be applied<br>to all "
"modified relations.</html>"
-msgstr "<html>選擇以啟用輸入一個標籤可套用到<br>所有修改的關係。</html>"
+msgstr "<html>選擇以啟用輸入一個標籤可套用到<br>所有修改的關聯。</html>"
msgctxt "tag"
msgid "Key:"
@@ -5751,7 +5762,7 @@ msgid "Apply?"
msgstr "是否接受？"
msgid "Relation"
-msgstr "關係"
+msgstr "關聯"
msgid "Old role"
msgstr "舊的角色"
@@ -5789,7 +5800,7 @@ msgid ""
"The copied data contains incomplete objects. When pasting the incomplete "
"objects are removed. Do you want to paste the data without the incomplete "
"objects?"
-msgstr "複製的資料包含不完整的物件。在貼上時會移除不完整的物件。您想要貼上沒有不完整物件的資料嗎？"
+msgstr "複製的資料包含不完整的物件。在貼上時會移除不完整的物件。你想要貼上沒有不完整物件的資料嗎？"
msgid "For selected objects only"
msgstr "只用於選取的物件"
@@ -5798,38 +5809,38 @@ msgid ""
"<html>Select to show changesets for the currently selected objects "
"only.<br>Unselect to show all changesets for objects in the current data "
"layer.</html>"
-msgstr "<html>選擇此項以顯示目前選取物件的變更組合。<br>不選擇此項則會顯示目前資料圖層中所有物件的變更組合。</html>"
+msgstr "<html>選擇此項以顯示目前選取物件的變更集。<br>不選擇此項則會顯示目前資料圖層中所有物件的變更集。</html>"
msgid "Changesets"
-msgstr "變更組合"
+msgstr "變更集"
msgid "Open the list of changesets in the current layer."
-msgstr "開啟在目前圖層中變更組合的清單。"
+msgstr "開啟在目前圖層中變更集的清單。"
msgid "Select all objects assigned to the currently selected changesets"
-msgstr "選擇所有在目前選取變更組合中指派的物件"
+msgstr "選擇所有在目前選取變更集中指派的物件"
msgid "Download"
msgstr "下載"
msgid ""
"Download information about the selected changesets from the OSM server"
-msgstr "從 OSM 伺服器下載關於已選取變更組合的資訊"
+msgstr "從 OSM 伺服器下載關於已選取變更集的資訊"
msgid "Closes the selected open changesets"
-msgstr "關閉選取的開放變更組合"
+msgstr "關閉選取的開放變更集"
msgid "Show info"
msgstr "顯示資訊"
msgid "Open a web page for each selected changeset"
-msgstr "開啟每個已選取變更組合的網頁"
+msgstr "開啟每個已選取變更集的網頁"
msgid "Details"
msgstr "詳細資料"
msgid "Opens the Changeset Manager window for the selected changesets"
-msgstr "開啟已選取變更組合的變更組合管理程式"
+msgstr "開啟已選取變更集的變更集管理程式"
msgid "Command Stack"
msgstr "指令堆疊"
@@ -5845,10 +5856,10 @@ msgstr ""
msgid ""
"Selects the objects that take part in this command (unless currently deleted)"
-msgstr "選擇用在這個指令中的物件（除非目前已被删除）"
+msgstr "選擇用在這個指令中的物件 (除非目前已被删除)"
msgid "Select and zoom"
-msgstr ""
+msgstr "選取與縮放"
msgid ""
"Selects the objects that take part in this command (unless currently "
@@ -5866,11 +5877,10 @@ msgstr "調解衝突。"
msgid "Conflict: {0} unresolved"
msgid_plural "Conflicts: {0} unresolved"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "衝突：{0} 個未解決"
msgid "Rel.:{0} / Ways:{1} / Nodes:{2}"
-msgstr ""
+msgstr "關聯：{0} / 路徑：{1} / 節點：{2}"
msgid "Resolve"
msgstr "解決"
@@ -5879,13 +5889,13 @@ msgid "Open a merge dialog of all selected items in the list above."
msgstr "開啟上列清單所有選取的項目的合併對話盒。"
msgid "Resolve to my versions"
-msgstr ""
+msgstr "以我的版本來解決"
msgid "Resolves all unresolved conflicts to ''my'' version"
msgstr ""
msgid "Resolve to their versions"
-msgstr ""
+msgstr "以他們的版本來解決"
msgid "Resolves all unresolved conflicts to ''their'' version"
msgstr ""
@@ -5926,7 +5936,7 @@ msgid ""
"applied.</strong><br>Click <strong>{1}</strong> to return to resolving "
"conflicts.</html>"
msgstr ""
-"<html>您尚未完成這個衝突中差異的合併。<br>衝突的調解只有在所有差異都<br>解決後才會套用。<br>請按 "
+"<html>你尚未完成這個衝突中差異的合併。<br>衝突的調解只有在所有差異都<br>解決後才會套用。<br>請按 "
"<strong>{0}</strong> 強制關閉路徑。<strong>已經<br>解決的差異都不會套用。</strong><br>點選 "
"<strong>{1}</strong> 則返回衝突調解。</html>"
@@ -5943,8 +5953,7 @@ msgstr[1] ""
msgid "{0} relation is affected."
msgid_plural "{0} relations are affected."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} 個關聯受到影響。"
msgid "Deleting {0} object"
msgid_plural "Deleting {0} objects"
@@ -5957,10 +5966,10 @@ msgid "To delete"
msgstr "要刪除"
msgid "From Relation"
-msgstr "從關係"
+msgstr "從關聯"
msgid "Click to close the dialog and remove the object from the relations"
-msgstr "點選以關閉此對話盒並從關係中移除此物件"
+msgstr "點選以關閉此對話盒並從關聯中移除此物件"
msgid "Click to close the dialog and to abort deleting the objects"
msgstr "點選以關閉此對話盒並放棄刪除此物件"
@@ -5975,10 +5984,10 @@ msgid "Multikey: {0}"
msgstr "多重設定鍵：{0}"
msgid "Hide filter"
-msgstr ""
+msgstr "隱藏過濾條件"
msgid "Hiding filter"
-msgstr ""
+msgstr "正在隱藏過濾條件"
msgid "Inverse filter"
msgstr "反轉過濾條件"
@@ -6075,7 +6084,7 @@ msgid "Way: "
msgstr "路徑： "
msgid "Relation: "
-msgstr "關係： "
+msgstr "關聯： "
msgid "deleted-on-server"
msgstr ""
@@ -6102,13 +6111,13 @@ msgid "Data Set: "
msgstr ""
msgid "Edited at: "
-msgstr ""
+msgstr "編輯於： "
msgid "<new object>"
msgstr "<新物件>"
msgid "Edited by: "
-msgstr ""
+msgstr "編輯者： "
msgid "Version: "
msgstr "版本： "
@@ -6160,7 +6169,7 @@ msgid "map style"
msgstr "地圖樣式"
msgid "edit counts"
-msgstr ""
+msgstr "編輯次數"
msgid "Styles Cache for \"{0}\":"
msgstr ""
@@ -6206,7 +6215,7 @@ msgstr[0] ""
msgstr[1] ""
msgid "mapcss"
-msgstr ""
+msgstr "mapcss"
msgid "unknown"
msgstr "不明"
@@ -6281,16 +6290,16 @@ msgid "Open a list of all loaded layers."
msgstr "開啟所有載入圖層的清單。"
msgid "layer is currently visible (click to hide layer)"
-msgstr "圖層目前為顯示（點選以隱藏圖層）"
+msgstr "圖層目前為顯示 (點擊可以隱藏圖層)"
msgid "layer is currently hidden (click to show layer)"
-msgstr "圖層目前為隱藏（點選以顯示圖層）"
+msgstr "圖層目前為隱藏 (點選以顯示圖層)"
msgid "this layer is the active layer"
msgstr "這個圖層是使用中的圖層"
msgid "this layer is not currently active (click to activate)"
-msgstr "這個圖層不是目前使用中的（點選可變為使用中）"
+msgstr "這個圖層不是目前使用中的 (點選可變為使用中)"
msgid "scale follows native resolution of this layer"
msgstr ""
@@ -6306,7 +6315,7 @@ msgid "Information about layer"
msgstr "關於圖層的資訊"
msgid "Map paint preferences"
-msgstr ""
+msgstr "地圖繪製偏好設定"
msgid "Map Paint Styles"
msgstr "地圖繪製樣式"
@@ -6318,7 +6327,7 @@ msgid "MapPaint"
msgstr "地圖繪製"
msgid "On/Off"
-msgstr ""
+msgstr "開/關"
msgid "Turn selected styles on or off"
msgstr "切換選取樣式的開啟或關閉"
@@ -6342,10 +6351,10 @@ msgid "Save a copy of this Style to file and add it to the list"
msgstr "儲存這個樣式的複本為檔案並將它加入清單"
msgid "Map paint style file (*.mapcss, *.zip)"
-msgstr ""
+msgstr "地圖繪製樣式檔案 (*.mapcss, *.zip)"
msgid "Map paint style file (*.xml, *.zip)"
-msgstr ""
+msgstr "地圖繪製樣式檔案 (*.xml, *.zip)"
msgid "Reloading style sources"
msgstr "重新載入樣式來源"
@@ -6387,64 +6396,64 @@ msgid "No"
msgstr "否"
msgid "Style settings"
-msgstr ""
+msgstr "樣式設定"
msgid "Customize the style"
-msgstr ""
+msgstr "自訂樣式"
msgid "Search menu items"
msgstr "搜尋選單項目"
msgid "Mini map"
-msgstr ""
+msgstr "迷你縮圖"
msgid "Displays a small map of the current edit location"
-msgstr ""
+msgstr "顯示一個目前編輯位置的小地圖"
msgid "List of notes"
-msgstr ""
+msgstr "註解清單"
msgid "Add comment"
-msgstr ""
+msgstr "加入評論"
msgid "Comment"
-msgstr "備註"
+msgstr "評論"
msgid "Comment on note"
-msgstr ""
+msgstr "評論註解"
msgid "Add comment to note:"
-msgstr ""
+msgstr "對評論加入註解："
msgid "Close note"
-msgstr ""
+msgstr "關閉註解"
msgid "Close note with message:"
-msgstr ""
+msgstr "用此訊息關閉評論："
msgid "Create a new note"
-msgstr ""
+msgstr "建立新註解："
msgid "Create"
msgstr "建立"
msgid "Reopen note"
-msgstr ""
+msgstr "重新開啟註解"
msgid "Reopen"
-msgstr ""
+msgstr "重新開啟"
msgid "Reopen note with message:"
-msgstr ""
+msgstr "用此訊息重新開啟評論："
msgid "Sort notes"
-msgstr ""
+msgstr "排序註解："
msgid "Sort"
msgstr "排序"
msgid "Open the note in an external browser"
-msgstr ""
+msgstr "在外部瀏覽器開啟註解"
msgid "Object type:"
msgstr "物件類型："
@@ -6479,16 +6488,16 @@ msgid ""
msgstr ""
msgid "Relations"
-msgstr "關係"
+msgstr "關聯"
msgid "Open a list of all relations."
-msgstr "開啓所有關係的清單。"
+msgstr "開啓所有關聯的清單。"
msgid "Relation list filter"
msgstr ""
msgid "Create a new relation"
-msgstr "建立新的關係"
+msgstr "建立新的關聯"
msgid "New"
msgstr "新增"
@@ -6497,7 +6506,7 @@ msgid "Relations: {0}/{1}"
msgstr ""
msgid "Relations: {0}"
-msgstr "關係：{0}"
+msgstr "關聯：{0}"
msgid "Selection"
msgstr "選擇區域"
@@ -6530,13 +6539,13 @@ msgid "Selection: {0}"
msgstr "選擇區域：{0}"
msgid "Always shown"
-msgstr ""
+msgstr "永遠顯示"
msgid "Dynamic"
-msgstr ""
+msgstr "動態"
msgid "Always hidden"
-msgstr ""
+msgstr "永遠隱藏"
msgid "Toggle dynamic buttons"
msgstr "切換動態按鈕"
@@ -6549,13 +6558,13 @@ msgstr "解鎖面板"
msgid ""
"Close this panel. You can reopen it with the buttons in the left toolbar."
-msgstr "關閉這個面板。您可以用左側工具列的按鈕重新開啟它。"
+msgstr "關閉這個面板。你可以用左側工具列的按鈕重新開啟它。"
msgid "Click to minimize/maximize the panel content"
msgstr "點選以最小化/最大化面板內容"
msgid "Side buttons"
-msgstr ""
+msgstr "側邊按鈕"
msgid "Authors"
msgstr "作者"
@@ -6634,25 +6643,25 @@ msgid "anonymous"
msgstr "匿名"
msgid "Display the basic properties of the changeset"
-msgstr "顯示這個變更組合的基本屬性"
+msgstr "顯示這個變更集的基本特性"
msgid "Display the tags of the changeset"
-msgstr "顯示這個變更組合的標籤"
+msgstr "顯示這個變更集的標籤"
msgid "Content"
msgstr "內容"
msgid "Display the objects created, updated, and deleted by the changeset"
-msgstr "顯示由這個變更組合建立、更新和刪除的物件"
+msgstr "顯示由這個變更集建立、更新和刪除的物件"
msgid "Discussion"
-msgstr ""
+msgstr "討論"
msgid "Display the public discussion around this changeset"
-msgstr ""
+msgstr "檢視關於這個變更集的公開討論"
msgid "Changeset Management Dialog"
-msgstr "變更組合管理對話盒"
+msgstr "變更集管理對話框"
msgid "Close the dialog"
msgstr "關閉這個對話盒"
@@ -6661,49 +6670,49 @@ msgid "Query"
msgstr "查詢"
msgid "Launch the dialog for querying changesets"
-msgstr "執行對話盒以查詢變更組合"
+msgstr "執行對話盒以查詢變更集"
msgid "Remove from cache"
msgstr "從快取中移除"
msgid "Remove the selected changesets from the local cache"
-msgstr "從本地端快取中移除選取的變更組合"
+msgstr "從本地端快取中移除選取的變更集"
msgid "Close the selected changesets"
-msgstr "關閉選取的變更組合"
+msgstr "關閉選取的變更集"
msgid "Update changeset"
-msgstr "更新變更組合"
+msgstr "更新變更集"
msgid "Updates the selected changesets with current data from the OSM server"
-msgstr "以目前的資料更新 OSM 伺服器上選取的變更組合"
+msgstr "以目前的資料更新 OSM 伺服器上選取的變更集"
msgid "Download changeset content"
-msgstr "下載變更組合內容"
+msgstr "下載變更集內容"
msgid "Download the content of the selected changesets from the server"
-msgstr "從伺服器下載關於已選取變更組合的內容"
+msgstr "從伺服器下載關於已選取變更集的內容"
msgid "Download changed objects"
-msgstr ""
+msgstr "下載變更過的物件"
msgid ""
"Download the current version of the changed objects in the selected "
"changesets"
-msgstr ""
+msgstr "下載選取變更集裏變更過元件的現在版本"
msgid "My changesets"
-msgstr "我的變更組合"
+msgstr "我的變更集"
msgid "Download my changesets from the OSM server (max. 100 changesets)"
-msgstr "從 OSM 伺服器下載我的變更組合（最多 100 個變更組合）"
+msgstr "從 OSM 伺服器下載我的變更集 (最多 100 個變更集)"
msgid ""
"<html>JOSM is currently running with an anonymous user. It cannot "
"download<br>your changesets from the OSM server unless you enter your OSM "
"user name<br>in the JOSM preferences.</html>"
msgstr ""
-"<html>JOSM 目前是以匿名使用者執行。它無法從<br> OSM 伺服器下載您的變更組合，除非在 JOSM 偏好設定<br>輸入您的 OSM "
+"<html>JOSM 目前是以匿名使用者執行。它無法從<br> OSM 伺服器下載你的變更集，除非在 JOSM 偏好設定<br>輸入你的 OSM "
"使用者名稱。</html>"
msgctxt "changeset.upload-comment"
@@ -6734,7 +6743,7 @@ msgid "Closed at"
msgstr "關閉於"
msgid "Discussions"
-msgstr ""
+msgstr "討論"
msgid ""
"<html>The selected object is not available in the current<br>edit layer "
@@ -6751,7 +6760,7 @@ msgid "Download objects"
msgstr "下載物件.."
msgid "Download the current version of the selected objects"
-msgstr ""
+msgstr "下載選取元件的目前版本"
msgid "Select in layer"
msgstr "在圖層中選擇"
@@ -6772,13 +6781,13 @@ msgid "Nothing to zoom to"
msgstr "沒有可縮放的"
msgid "The content of this changeset is not downloaded yet."
-msgstr "這個變更組合的內容尚未下載。"
+msgstr "這個變更集的內容尚未下載。"
msgid "Download now"
msgstr "立即下載"
msgid "Download the changeset content"
-msgstr "立即下載變更組合內容"
+msgstr "立即下載變更集內容"
msgid "Created"
msgstr "已建立"
@@ -6796,7 +6805,7 @@ msgid "ID:"
msgstr "ID："
msgid "Comment:"
-msgstr "註解："
+msgstr "評論："
msgid "Open/Closed:"
msgstr "開放/已關閉："
@@ -6811,31 +6820,31 @@ msgid "Closed on:"
msgstr "關閉於："
msgid "Remove the changeset in the detail view panel from the local cache"
-msgstr "從本地端快取移除詳細資料檢視面板中的變更組合"
+msgstr "從本地端快取移除詳細資料檢視面板中的變更集"
msgid "Update the changeset from the OSM server"
-msgstr "從 OSM 伺服器更新變更組合"
+msgstr "從 OSM 伺服器更新變更集"
msgid ""
"Select the primitives in the content of this changeset in the current data "
"layer"
-msgstr "選擇在目前資料圖層中這個變更組合的內容裡的原型"
+msgstr "選擇在目前資料圖層中這個變更集的內容裡的原型"
msgid ""
"<html>None of the objects in the content of changeset {0} is available in "
"the current<br>edit layer ''{1}''.</html>"
-msgstr "<html>在目前編輯圖層「{1}」變更組合 {0} 的內容<br>中沒有物件可用。</html>"
+msgstr "<html>在目前編輯圖層「{1}」變更集 {0} 的內容<br>中沒有物件可用。</html>"
msgid ""
"Zoom to the objects in the content of this changeset in the current data "
"layer"
-msgstr "縮放到目前資料圖層中這個變更組合內容的物件"
+msgstr "縮放到目前資料圖層中這個變更集內容的物件"
msgid "Update changeset discussion"
-msgstr ""
+msgstr "更新變更集的討論"
msgid "Update the changeset discussion from the OSM server"
-msgstr ""
+msgstr "從 OSM 伺服器更新變更集的討論"
msgid "Date"
msgstr "日期"
@@ -6853,57 +6862,57 @@ msgid "Download content"
msgstr "下載內容"
msgid "Download the changeset content from the OSM server"
-msgstr "從 OSM 伺服器下載變更組合內容"
+msgstr "從 OSM 伺服器下載變更集內容"
msgid "Update content"
msgstr "更新內容"
msgid "Update the changeset content from the OSM server"
-msgstr "從 OSM 伺服器更新變更組合內容"
+msgstr "從 OSM 伺服器更新變更集內容"
msgid "Changeset ID: "
-msgstr "變更組合 ID： "
+msgstr "變更集 ID： "
msgid "Enter a changeset id"
-msgstr "請輸入變更組合 id"
+msgstr "請輸入變更集 id"
msgid ""
"Download the changeset with the specified id, including the changeset content"
-msgstr "以指定的 id 下載變更組合，包含變更組合的內容"
+msgstr "以指定的 id 下載變更集，包含變更集的內容"
msgid "Select changesets owned by specific users"
-msgstr "選擇由指定使用者擁有的變更組合"
+msgstr "選擇由指定使用者擁有的變更集"
msgid "Select changesets depending on whether they are open or closed"
-msgstr "根據變更組合是開放或關閉來選擇"
+msgstr "根據變更集是開放或關閉來選擇"
msgid ""
"Select changesets based on the date/time they have been created or closed"
-msgstr "根據變更組合建立或關閉的日期/時刻來選擇"
+msgstr "根據變更集建立或關閉的日期/時刻來選擇"
msgid "Select only changesets related to a specific bounding box"
-msgstr "只選擇與指定的綁定方塊相關的變更組合"
+msgstr "只選擇與指定的綁定方塊相關的變更集"
msgid ""
"Cannot restrict the changeset query to a specific bounding box. The input is "
"invalid."
-msgstr "不能將變更組合查詢限制在指定的綁定方塊。輸入是無效的。"
+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>"
+msgstr "<html>請輸入有效的經度 /緯度數值來將變更集查詢<br>限制在指定的綁定方塊。</html>"
msgid "Invalid bounding box"
msgstr "無效的綁定方塊"
msgid "Download my changesets only"
-msgstr "只下載我的變更組合"
+msgstr "只下載我的變更集"
msgid ""
"<html>Select to restrict the query to your changesets only.<br>Unselect to "
"include all changesets in the query.</html>"
-msgstr "<html>選擇只查詢您的變更組合。<br>不選擇這項就會查詢所有的變更組合。</html>"
+msgstr "<html>選擇只查詢你的變更集。<br>不選擇這項就會查詢所有的變更集。</html>"
msgid ""
"<html>Please select one the following <strong>standard "
@@ -6911,27 +6920,27 @@ msgid ""
"only want to download changesets created by yourself.<br>Note that JOSM will "
"download max. 100 changesets.</html>"
msgstr ""
-"<html>請在下列<strong>標準查詢</strong>中選擇一項。如果您只想下載由自己建立的變更組合，請選擇<strong>只下載我的變更組合</"
-"strong>。<br>注意 JOSM 最多只能下載 100 個變更組合。</html>"
+"<html>請在下列<strong>標準查詢</strong>中選擇一項。如果你只想下載由自己建立的變更集，請選擇<strong>只下載我的變更集</st"
+"rong>。<br>注意 JOSM 最多只能下載 100 個變更集。</html>"
msgid "<html>Download the latest changesets</html>"
-msgstr "<html>下載最新的變更組合</html>"
+msgstr "<html>下載最新的變更集</html>"
msgid ""
"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
"user name in the preferences first.</em></html>"
-msgstr "<html>下載我的開放變更組合<br><em>已停用。請先在偏好設定中輸入您的 OSM 使用者名稱。</em></html>"
+msgstr "<html>下載我的開放變更集<br><em>已停用。請先在偏好設定中輸入你的 OSM 使用者名稱。</em></html>"
msgid "<html>Download my open changesets</html>"
-msgstr "<html>下載我的開放變更組合</html>"
+msgstr "<html>下載我的開放變更集</html>"
msgid ""
"<html>Download changesets in the current map view.<br><em>Disabled. There is "
"currently no map view active.</em></html>"
-msgstr "<html>下載在目前地圖檢視中的變更組合。<br><em>已停用。目前並沒有使用中的地圖檢視。</em></html>"
+msgstr "<html>下載在目前地圖檢視中的變更集。<br><em>已停用。目前並沒有使用中的地圖檢視。</em></html>"
msgid "<html>Download changesets in the current map view</html>"
-msgstr "<html>下載在目前地圖檢視中的變更組合</html>"
+msgstr "<html>下載在目前地圖檢視中的變更集</html>"
msgid ""
"Unexpected value for preference ''{0}'', got ''{1}''. Resetting to default "
@@ -6939,54 +6948,54 @@ msgid ""
msgstr ""
msgid "Cannot create changeset query for open changesets of anonymous user"
-msgstr "對匿名使用者不能建立開放變更組合的建立變更組合查詢"
+msgstr "對匿名使用者不能建立開放變更集的建立變更集查詢"
msgid "Basic"
msgstr "基本"
msgid "Download changesets using predefined queries"
-msgstr "使用預先定義查詢來下載變更組合"
+msgstr "使用預先定義查詢來下載變更集"
msgid "From URL"
-msgstr "從 URL"
+msgstr "從 URL 網址"
msgid "Query changesets from a server URL"
-msgstr "從伺服器 URL 查詢變更組合"
+msgstr "從伺服器 URL 網址查詢變更集"
msgid "Advanced"
msgstr "進階"
msgid "Use a custom changeset query"
-msgstr "使用自訂的變更組合查詢"
+msgstr "使用自訂的變更集查詢"
msgid "Query changesets"
-msgstr "查詢變更組合"
+msgstr "查詢變更集"
msgid "Query and download changesets"
-msgstr "查詢並下載變更組合"
+msgstr "查詢並下載變更集"
msgid "Please enter a valid changeset query URL first."
-msgstr "請先輸入有效的變更組合查詢 URL。"
+msgstr "請先輸入有效的變更集查詢 URL。"
msgid "Illegal changeset query URL"
-msgstr "不合法的變更組合查詢 URL"
+msgstr "不合規定的變更集查詢 URL"
msgid "Close the dialog and abort querying of changesets"
-msgstr "關閉此對話盒並放棄變更組合的查詢"
+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>"
+msgstr "請以你所在地區常用的格式輸入日期。<br>範例：{0}<br>範例：{1}<br>範例：{2}<br>範例：{3}<br>"
msgid "Query open changesets only"
-msgstr "只查詢開放的變更組合"
+msgstr "只查詢開放的變更集"
msgid "Query closed changesets only"
-msgstr "只查詢已關閉的變更組合"
+msgstr "只查詢已關閉的變更集"
msgid "Query both open and closed changesets"
-msgstr "查詢開放與關閉的變更組合"
+msgstr "查詢開放與關閉的變更集"
msgid "Date: "
msgstr "日期： "
@@ -7004,15 +7013,15 @@ msgid "Created before - "
msgstr "建立早於 - "
msgid "Only changesets closed after the following date/time"
-msgstr "只有在下列日期/時刻後關閉的變更組合"
+msgstr "只有在下列日期/時刻後關閉的變更集"
msgid "Only changesets closed after and created before a specific date/time"
-msgstr "只有在指定的日期/時刻後關閉或在這之前建立的變更組合"
+msgstr "只有在指定的日期/時刻後關閉或在這之前建立的變更集"
msgid ""
"Cannot build changeset query with time based restrictions. Input is not "
"valid."
-msgstr "不能建立以時刻限制為基礎的變更組合查詢。輸入是無效的。"
+msgstr "不能建立以時刻限制為基礎的變更集查詢。輸入是無效的。"
msgid ""
"<html>Please enter valid date/time values to restrict<br>the query to a "
@@ -7025,7 +7034,7 @@ 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>"
+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"
@@ -7035,10 +7044,10 @@ msgid "Please enter an integer value > 0"
msgstr "請輸入大於 0 的整數值"
msgid "URL: "
-msgstr "URL: "
+msgstr "URL： "
msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
-msgstr "請輸入或貼上從 OSM API 取回變更組合的 URL。"
+msgstr "請輸入或貼上從 OSM API 取回變更集的 URL。"
msgid "Examples"
msgstr "範例"
@@ -7046,13 +7055,13 @@ 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 路徑、主機和連接埠。"
+msgstr "請注意變更集查詢目前永遠送出到「{0}」，不管下列輸入的 URL 路徑、主機和連接埠。"
msgid "This changeset query URL is invalid"
-msgstr "這個變更組合查詢 URL 是無效的"
+msgstr "這個變更集查詢 URL 是無效的"
msgid "Only changesets owned by myself"
-msgstr "只有我自己擁有的變更組合"
+msgstr "只有我自己擁有的變更集"
msgid "User ID:"
msgstr "使用者 ID："
@@ -7061,26 +7070,26 @@ msgid "User name:"
msgstr "使用者名稱："
msgid "Only changesets owned by the user with the following user ID"
-msgstr "只有由下列使用者 ID 擁有的變更組合"
+msgstr "只有由下列使用者 ID 擁有的變更集"
msgid "Only changesets owned by the user with the following user name"
-msgstr "只有由下列使用者名稱擁有的變更組合"
+msgstr "只有由下列使用者名稱擁有的變更集"
msgid ""
"Only changesets owned by myself (disabled. JOSM is currently run by an "
"anonymous user)"
-msgstr "只有我自己擁有的變更組合 (已停用。JOSM 目前以匿名使用者執行)"
+msgstr "只有我自己擁有的變更集 (已停用。JOSM 目前以匿名使用者執行)"
msgid ""
"Cannot restrict changeset query to the current user because the current user "
"is anonymous"
-msgstr "不能限制變更組合的查詢為目前的使用者，因為目前的使用者是匿名的"
+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}」"
+msgstr "不能限制變更集的查詢為使用者名稱「{0}」"
msgid "Please enter a valid user ID"
msgstr "請輸入有效的使用者 ID"
@@ -7101,13 +7110,13 @@ msgid "Activate the selected layer"
msgstr "使用選取的圖層"
msgid "Activate layer"
-msgstr ""
+msgstr "使用圖層"
msgid "Delete the selected layers."
msgstr "刪除選取的圖層。"
msgid "Duplicate this layer"
-msgstr "重製這個圖層"
+msgstr "複製這個圖層"
msgid "Copy of {0}"
msgstr "{0} 的複本"
@@ -7116,34 +7125,34 @@ msgid "Copy {1} of {0}"
msgstr "{0} 的複本 {1}"
msgid "Change visibility of the selected layer."
-msgstr ""
+msgstr "變更選取圖層的可見性。"
msgid "Show layer"
-msgstr ""
+msgstr "顯示圖層"
msgid "Adjust opacity of the layer."
-msgstr "調整圖層的透明度。"
+msgstr "整圖層的透明度。"
msgid "Opacity"
msgstr "透明度"
msgid "Adjust gamma value of the layer."
-msgstr ""
+msgstr "調整這個圖層的 gamma 值。"
msgid "Gamma"
-msgstr ""
+msgstr "Gamma"
msgid "Adjust sharpness/blur value of the layer."
-msgstr ""
+msgstr "調整這個屠城的銳利/模糊值。"
msgid "Sharpness"
-msgstr ""
+msgstr "銳利度"
msgid "Adjust colorfulness of the layer."
-msgstr ""
+msgstr "調整這個圖層的彩度。"
msgid "Colorfulness"
-msgstr ""
+msgstr "彩度"
msgid "Merge this layer into another layer"
msgstr "將這個圖層合併至另一個圖層"
@@ -7176,17 +7185,15 @@ msgid "Discardable key: background"
msgstr ""
msgid "{0} ''{1}''"
-msgstr ""
+msgstr "{0} ''{1}''"
msgid "{0} different"
msgid_plural "{0} different"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} 不一樣"
msgid ", {0} unset"
msgid_plural ", {0} unset"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "，{0} 沒有設定"
msgid "Select objects for which to change tags."
msgstr "選擇要改變標籤的物件。"
@@ -7222,13 +7229,13 @@ msgid "Delete Tags"
msgstr ""
msgid "Change relation"
-msgstr "改變關係"
+msgstr "改變關聯"
msgid "Delete from relation"
-msgstr "自關係中刪除"
+msgstr "自關聯中刪除"
msgid "Really delete selection from relation {0}?"
-msgstr "確定要刪除關係 {0} 的選擇區域？"
+msgstr "確定要刪除關聯 {0} 的選擇區域？"
msgid "Add a new key/value pair to all objects"
msgstr "將新的設定鍵/數值配對加入到所有的物件"
@@ -7348,7 +7355,7 @@ msgid "Recent tags with existing key"
msgstr ""
msgid "Enable"
-msgstr ""
+msgstr "啟用"
msgid "Hide"
msgstr "隱藏"
@@ -7408,37 +7415,37 @@ msgid "You changed the value of ''{0}'' from ''{1}'' to ''{2}''."
msgstr ""
msgid "Edit the relation the currently selected relation member refers to."
-msgstr "編輯目前選取的關係成員所參照的關係。"
+msgstr "編輯目前選取的關聯成員所參照的關聯。"
msgid "Download all child relations (recursively)"
-msgstr "下載所有子關係（遞迴式）"
+msgstr "下載所有下層關聯 (遞迴式)"
msgid "Download All Children"
-msgstr "下載所有子項目"
+msgstr "下載所有下層項目"
msgid "Download selected relations"
-msgstr "下載選取的關係"
+msgstr "下載選取的關聯"
msgid "Download Selected Children"
-msgstr "下載選取的子項目"
+msgstr "下載選取的下層項目"
msgid "Conflict in data"
msgid_plural "Conflicts in data"
msgstr[0] "資料中有衝突"
msgid "Download relation members"
-msgstr "下載關係成員"
+msgstr "下載關聯成員"
msgid ""
"<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
"loaded</html>"
-msgstr "<html>子關閉<br>{0}<br>已在伺服器上刪除。它不能被載入</html>"
+msgstr "<html>下層關閉<br>{0}<br>已在伺服器上刪除。它不能被載入</html>"
msgid "Relation is deleted"
-msgstr "關係已刪除"
+msgstr "關聯已刪除"
msgid "Downloading relation {0}"
-msgstr "正在下載關係 {0}"
+msgstr "正在下載關聯 {0}"
msgid "Ignoring exception because task was canceled. Exception: {0}"
msgstr ""
@@ -7449,35 +7456,35 @@ msgstr[0] "下載 {0} 個不完整的物件"
msgid "Downloading {0} incomplete child of relation ''{1}''"
msgid_plural "Downloading {0} incomplete children of relation ''{1}''"
-msgstr[0] "正下載關係「{1}」的 {0} 不完整子項目"
+msgstr[0] "正在下載關聯「{1}」的 {0} 不完整下層項目"
msgid "Downloading {0} incomplete child of {1} parent relations"
msgid_plural "Downloading {0} incomplete children of {1} parent relations"
-msgstr[0] "下載 {1} 父關係的 {0} 不完整子項"
+msgstr[0] "下載 {1} 個上層關聯的 {0} 個不完整下層項目"
msgid "Download relations"
-msgstr "下載關係"
+msgstr "下載關聯"
msgid "({0}/{1}): Downloading relation ''{2}''..."
-msgstr "({0}/{1})：正在下載關係「{2}」..."
+msgstr "({0}/{1})：正在下載關聯「{2}」..."
msgid "Tags and Members"
msgstr "標籤與成員"
msgid "Parent Relations"
-msgstr "上層關係"
+msgstr "上層關聯"
msgid "Child Relations"
-msgstr "子關係"
+msgstr "下層關聯"
msgid "Enter a role and apply it to the selected relation members"
-msgstr "輸入一個角色並將它套用至選取的關係成員"
+msgstr "輸入一個角色並將它套用至選取的關聯成員"
msgid "Apply Role:"
msgstr "套用角色："
msgid "New Relation"
-msgstr "新關係"
+msgstr "新關聯"
msgid "Focus Relation Editor with relation ''{0}'' in layer ''{1}''"
msgstr ""
@@ -7487,14 +7494,14 @@ msgid ""
"relation itself.<br>This creates circular dependencies and is "
"discouraged.<br>How do you want to proceed with circular dependencies?</html>"
msgstr ""
-"<html>在這個關係中至少有一個成員參照到<br>這個關係自身。<br>這樣會建立循環相依關係，但是不建議這麼做。<br>您要如何處理循環相依關係？</"
+"<html>在這個關聯中至少有一個成員參照到<br>這個關聯自身。<br>這樣會建立循環相依關聯，但是不建議這麼做。<br>你要如何處理循環相依關聯？</"
"html>"
msgid "Remove them, clean up relation"
-msgstr "移除它們，清除關係"
+msgstr "移除它們，清除關聯"
msgid "Ignore them, leave relation as is"
-msgstr "忽略它們，保持關係原貌"
+msgstr "忽略它們，保持關聯原貌"
msgid "Sorry, shortcut \"{0}\" can not be enabled in Relation editor dialog"
msgstr ""
@@ -7503,7 +7510,7 @@ msgid ""
"<html>This relation already has one or more members referring to<br>the "
"object ''{0}''<br><br>Do you really want to add another relation "
"member?</html>"
-msgstr "<html>這個關係有一或多個成員參照到<br>物件「{0}」<br><br>您確定要加入另一個關係成員？</html>"
+msgstr "<html>這個關聯有一或多個成員參照到<br>物件「{0}」<br><br>你確定要加入另一個關係成員？</html>"
msgid "Multiple members referring to same object."
msgstr "多個成員參照到同樣物件。"
@@ -7512,7 +7519,7 @@ 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>您正試著將關係加入它自己。<br><br>這樣會建立循環參照，因此不建議這麼做。<br>正略過關係「{0}」。</html>"
+msgstr "<html>你正試著將關聯加入它自己。<br><br>這樣會建立循環參照，因此不建議這麼做。<br>正略過關聯「{0}」。</html>"
msgid "Select previous Gap"
msgstr ""
@@ -7536,43 +7543,43 @@ msgid "Refers to"
msgstr "參照到"
msgid "Cannot add {0} since it is not part of dataset"
-msgstr ""
+msgstr "無法加入 {0}，因為不屬於資料組合"
msgid "Download referring relations"
-msgstr "下載參照的關係"
+msgstr "下載參照的關聯"
msgid "There were {0} conflicts during import."
msgstr "匯入時有 {0} 個衝突。"
msgid "including immediate children of parent relations"
-msgstr "包含父關係的直接子項"
+msgstr "包含上層關聯的直接下層"
msgid "Load parent relations"
-msgstr "載入上層關係"
+msgstr "載入上層關聯"
msgid "Reload"
msgstr "重新載入"
msgid "Loading parent relations"
-msgstr "正在載入上層關係"
+msgstr "正在載入上層關聯"
msgid "Edit the currently selected relation"
-msgstr "編輯目前選取的關係"
+msgstr "編輯目前選取的關聯"
msgid "Apply Changes"
msgstr "套用變更"
msgid "Create new relation in layer ''{0}''"
-msgstr "在圖層「{0}」中建立一個新的關係"
+msgstr "在圖層「{0}」中建立一個新的關聯"
msgid "Edit new relation in layer ''{0}''"
-msgstr "編輯圖層「{0}」中的新關係"
+msgstr "編輯圖層「{0}」中的新關聯"
msgid "Edit relation #{0} in layer ''{1}''"
-msgstr "編輯圖層「{1}」的關係 #{0}"
+msgstr "編輯圖層「{1}」的關聯 #{0}"
msgid "Load relation"
-msgstr "載入關係"
+msgstr "載入關聯"
msgid ""
"Add all objects selected in the current dataset after the last selected "
@@ -7610,7 +7617,7 @@ msgid "Cancel, continue editing"
msgstr "否，繼續編輯"
msgid "Click to return to the relation editor and to resume relation editing"
-msgstr "點選以返回關係編輯器並繼續關係的編輯"
+msgstr "點選以返回關聯編輯器並繼續關聯的編輯"
msgid ""
"<html>The relation has been changed.<br><br>Do you want to save your "
@@ -7621,10 +7628,10 @@ msgid "Unsaved changes"
msgstr "未儲存的變更"
msgid "Delete the currently edited relation"
-msgstr "刪除目前編輯的關係"
+msgstr "刪除目前編輯的關聯"
msgid "Relation Editor: Download Members"
-msgstr "關係編輯器：下載成員"
+msgstr "關聯編輯器：下載成員"
msgid "Download all incomplete members"
msgstr "下載所有未完成的成員"
@@ -7636,16 +7643,16 @@ msgid "Download selected incomplete members"
msgstr "下載選取的未完成成員"
msgid "Edit the relation the currently selected relation member refers to"
-msgstr "編輯目前選取關係成員所參照的關係"
+msgstr "編輯目前選取關聯成員所參照的關聯"
msgid "Relation Editor: Move Down"
-msgstr "關係編輯器：下移"
+msgstr "關聯編輯器：下移"
msgid "Move the currently selected members down"
msgstr "將目前選取的成員下移"
msgid "Relation Editor: Move Up"
-msgstr "關係編輯器：上移"
+msgstr "關聯編輯器：上移"
msgid "Move the currently selected members up"
msgstr "將目前選取的成員上移"
@@ -7685,19 +7692,19 @@ msgid ""
msgstr ""
msgid "Deleted relation"
-msgstr ""
+msgstr "刪除關聯"
msgid "Relation Editor: Remove"
-msgstr "關係編輯器：移除"
+msgstr "關聯編輯器：移除"
msgid "Remove the currently selected members from this relation"
-msgstr "將目前選取的成員從這個關係中移除"
+msgstr "將目前選取的成員從這個關聯中移除"
msgid "Remove all members referring to one of the selected objects"
msgstr "移除所有參照到選取物件之一的所有成員"
msgid "Reverse the order of the relation members"
-msgstr "反轉關係成員的順序"
+msgstr "反轉關聯成員的順序"
msgid "Reverse"
msgstr "反轉"
@@ -7707,21 +7714,21 @@ msgid ""
"relation editor\n"
"was open. They have been removed from the relation members list."
msgstr ""
-"這個新關係的一或多個成員已經在開啟關係編輯器的期間被刪除了。\n"
-"它們已經從關係成員清單移除了。"
+"這個新關聯的一或多個成員已經在開啟關聯編輯器的期間被刪除了。\n"
+"它們已經從關聯成員清單移除了。"
msgid "Yes, create a conflict and close"
msgstr "是，建立衝突並關閉"
msgid "Click to create a conflict and close this relation editor"
-msgstr "點選以建立衝突項目並關閉這個關係編輯器"
+msgstr "點選以建立衝突項目並關閉這個關聯編輯器"
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>這個關係已經在此編輯器以外的地方被改變了。<br>您不能套用自己的變更後繼續編輯。<br><br>是否要建立衝突並關閉編輯器？</html>"
+"<html>這個關聯已經在此編輯器以外的地方被改變了。<br>你不能套用自己的變更後繼續編輯。<br><br>是否要建立衝突並關閉編輯器？</html>"
msgid ""
"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>Please "
@@ -7729,15 +7736,15 @@ msgid ""
msgstr "<html>圖層「{0}」已經有衝突於物件<br>「{1}」。<br>請先調解這個衝突，然後再試一次。</html>"
msgid "Select objects for selected relation members"
-msgstr "選擇已選取關係成員中的物件"
+msgstr "選擇已選取關聯成員中的物件"
msgid ""
"Select relation members which refer to objects in the current selection"
-msgstr "選取參照到目前選擇區域的關係成員"
+msgstr "選取參照到目前選擇區域的關聯成員"
msgid ""
"Select relation members which refer to {0} objects in the current selection"
-msgstr "在目前的選擇區域中選擇了參照到 {0} 的關係成員"
+msgstr "在目前的選擇區域中選擇了參照到 {0} 的關聯成員"
msgid "Sets a role for the selected members"
msgstr "為選取的成員設定角色"
@@ -7747,13 +7754,13 @@ msgstr "套用角色"
msgid "You are setting an empty role on {0} object."
msgid_plural "You are setting an empty role on {0} objects."
-msgstr[0] "您在 {0} 個物件中設定了空的角色。"
+msgstr[0] "你在 {0} 個物件中設定了空的角色。"
msgid "This is equal to deleting the roles of these objects."
msgstr "這樣等於刪除這些物件的角色。"
msgid "Do you really want to apply the new role?"
-msgstr "您確定要套用新的角色嗎？"
+msgstr "你確定要套用新的角色嗎？"
msgid "Yes, apply it"
msgstr "是，套用它"
@@ -7765,31 +7772,31 @@ msgid "Confirm empty role"
msgstr "確認空白角色"
msgid "Relation Editor: Sort"
-msgstr "關係編輯器：排序"
+msgstr "關聯編輯器：排序"
msgid "Sort the relation members"
-msgstr "排序關係成員"
+msgstr "排序關聯成員"
msgid "Sort below"
-msgstr ""
+msgstr "排序下方成員"
msgid "Sort the selected relation members and all members below"
-msgstr ""
+msgstr "排序選取的關聯成員和下方的成員"
msgid "way is connected"
msgstr "路徑已連接"
msgid "way is connected to previous relation member"
-msgstr "路徑已連接到前一個關係成員"
+msgstr "路徑已連接到前一個關聯成員"
msgid "way is connected to next relation member"
-msgstr "路徑已連接到下一個關係成員"
+msgstr "路徑已連接到下一個關聯成員"
msgid "way is not connected to previous or next relation member"
-msgstr "路徑未連接到前一個或下一個關係成員"
+msgstr "路徑未連接到前一個或下一個關聯成員"
msgid "{0} - {1} ({2})"
-msgstr ""
+msgstr "{0} - {1} ({2})"
msgid "Wrong number of arguments for bookmark"
msgstr "書籤的引數數量錯誤"
@@ -7848,7 +7855,7 @@ msgstr "清除文字區域"
msgid ""
"URL from www.openstreetmap.org (you can paste an URL here to download the "
"area)"
-msgstr "www.openstreetmap.org 的 URL (您可以在這裡貼上 URL 下載該區域)"
+msgstr "www.openstreetmap.org 的 URL (你可以在這裡貼上 URL 下載該區域)"
msgid "Bounding Box"
msgstr "綁定方塊"
@@ -7878,7 +7885,7 @@ msgid "Select to download GPS traces in the selected download area."
msgstr "選擇以下載選取下載區域中的 GPS 軌跡。"
msgid "Select to download notes in the selected download area."
-msgstr "在選取的下載區域選擇下載筆記。"
+msgstr "在選取的下載區域選擇下載註解。"
msgid "Download as new layer"
msgstr "下載為新圖層"
@@ -7894,10 +7901,10 @@ msgstr "啟動時開啟這個對話盒"
msgid ""
"<html>Autostart ''Download from OSM'' dialog every time JOSM is "
"started.<br>You can open it manually from File menu or toolbar.</html>"
-msgstr "<html>每次 JOSM 啟動時自動顯示「從 OSM 下載」對話盒。<br>您可以從檔案選單或工具列手動開啟它。</html>"
+msgstr "<html>每次 JOSM 啟動時自動顯示「從 OSM 下載」對話盒。<br>你可以從檔案選單或工具列手動開啟它。</html>"
msgid "Zoom to downloaded data"
-msgstr ""
+msgstr "縮放到下載的資料"
msgid "Select to zoom to entire newly downloaded data."
msgstr ""
@@ -7932,7 +7939,7 @@ msgid ""
msgstr ""
msgid "Download referrers (parent relations)"
-msgstr "下載參照 (父關係)"
+msgstr "下載參照 (上層關聯)"
msgid "Download object"
msgstr "下載物件"
@@ -7946,10 +7953,10 @@ msgid ""
msgstr ""
msgid "Select if the members of a relation should be downloaded as well"
-msgstr "如果關係的成員也要下載請選擇"
+msgstr "如果關聯的成員也要下載請選擇"
msgid "Download referrers (parent relations and ways)"
-msgstr "下載參照 (父關係與路徑)"
+msgstr "下載參照 (上層關聯與路徑)"
msgid "Class Type"
msgstr "類別類型"
@@ -8003,7 +8010,7 @@ msgid "JOSM Help Browser"
msgstr "JOSM 協助文件瀏覽器"
msgid "Failed to read CSS file ''help-browser.css''. Exception is: {0}"
-msgstr "讀取 CSS 檔案 ''help-browser.css'' 失敗。例外為：{0}"
+msgstr "讀取 CSS 檔案 ''help-browser.css'' 失敗。異常為：{0}"
msgid ""
"<html><p class=\"warning-header\">Help content for help topic missing</p><p "
@@ -8028,7 +8035,7 @@ msgstr ""
msgid ""
"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
"network problem, please check<br>your internet connection</html>"
-msgstr "<html>無法開啟 url {0} 的求助頁面。<br>這大部分是網路問題造成的，請檢查<br>您的網際網路連線</html>"
+msgstr "<html>無法開啟 url {0} 的求助頁面。<br>這大部分是網路問題造成的，請檢查<br>你的網際網路連線</html>"
msgid "Failed to open URL"
msgstr "無法開啟 URL"
@@ -8086,7 +8093,7 @@ msgid "History for way {0}"
msgstr "路徑 {0} 的歷史紀錄"
msgid "History for relation {0}"
-msgstr "關係 {0} 的歷史紀錄"
+msgstr "關聯 {0} 的歷史紀錄"
msgid "Reload the history from the server"
msgstr "重新載入伺服器的歷史紀錄"
@@ -8120,7 +8127,7 @@ msgid "Loading history for way {0}"
msgstr "正在載入路徑 {0} 的歷史紀錄"
msgid "Loading history for relation {0}"
-msgstr "正在載入關係 {0} 的歷史紀錄"
+msgstr "正在載入關聯 {0} 的歷史紀錄"
msgid "Node {0}"
msgstr "節點 {0}"
@@ -8141,22 +8148,22 @@ msgid "Way {0}"
msgstr "路徑 {0}"
msgid "Relation {0}"
-msgstr "關係 {0}"
+msgstr "關聯 {0}"
msgid "Object"
msgstr "物件"
msgid "Changeset comment"
-msgstr ""
+msgstr "變更集評論"
msgid "Changeset source"
-msgstr ""
+msgstr "變更集來源"
msgid "Imagery used"
msgstr "已用圖磚"
msgid "<b>Source</b>:"
-msgstr ""
+msgstr "<b>來源</b>："
msgid "<b>Imagery</b>:"
msgstr "<b>圖磚</b>:"
@@ -8171,29 +8178,28 @@ msgstr "<html>版本 <strong>{0}</strong> 建立於 <strong>{1}</strong></html>"
msgid "This changeset has {0} comment"
msgid_plural "This changeset has {0} comments"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "這個變更集有 {0} 個評論"
msgid "Changeset"
-msgstr ""
+msgstr "變更集"
msgid "Changeset info"
-msgstr "變更組合資訊"
+msgstr "變更集資訊"
msgid "Launch browser with information about the changeset"
-msgstr "執行瀏覽器觀看這個變更組合的資訊"
+msgstr "執行瀏覽器觀看這個變更集的資訊"
msgid "Show changeset {0}"
-msgstr "顯示變更組合 {0}"
+msgstr "顯示變更集 {0}"
msgid "User info"
-msgstr ""
+msgstr "使用者資訊"
msgid "Launch browser with information about the user"
-msgstr ""
+msgstr "在瀏覽器開啟關於這個使用者的資訊"
msgid "Show user {0}"
-msgstr ""
+msgstr "顯示使用者 {0}"
msgid "Ver"
msgstr "版"
@@ -8205,7 +8211,7 @@ msgid "B"
msgstr "B"
msgid "Editor"
-msgstr ""
+msgstr "編輯者"
msgid ""
"Failed to update primitive with id {0} because current edit layer is null"
@@ -8223,7 +8229,7 @@ msgid "Synchronize way {0} only"
msgstr "只同步路徑 {0}"
msgid "Synchronize relation {0} only"
-msgstr "只同步關係 {0}"
+msgstr "只同步關聯 {0}"
msgid "Synchronize entire dataset"
msgstr "同步整個資料組"
@@ -8238,8 +8244,8 @@ msgid ""
"server.<br>Click <strong>{6}</strong> to abort and continue "
"editing.<br></html>"
msgstr ""
-"<html>上傳<strong>失敗</strong>，因為伺服器上的節點、<br>路徑或關係比您的版本更新。<br>這個衝突是由於 "
-"<strong>{0}</strong> ( id <strong>{1}</strong>) 造成，<br>伺服器的版本為 {2}，您的版本為 "
+"<html>上傳<strong>失敗</strong>，因為伺服器上的節點、<br>路徑或關聯比你的版本更新。<br>這個衝突是由於 "
+"<strong>{0}</strong> ( id <strong>{1}</strong>) 造成，<br>伺服器的版本為 {2}，你的版本為 "
"{3}。<br><br>請點選 <strong>{4}</strong> 只同步有衝突的原型。<br>點選 <strong>{5}</strong> "
"會與伺服器同步整個本地端資料組合。<br>點選 <strong>{6}</strong> 則會放棄並繼續編輯。<br></html>"
@@ -8250,7 +8256,7 @@ msgid ""
"server.<br>Click <strong>{1}</strong> to abort and continue "
"editing.<br></html>"
msgstr ""
-"<html>上傳<strong>失敗</strong>，因為伺服器已有您的節點、路徑或關係<br>的新版本。<br><br>請按<strong>{0}</"
+"<html>上傳<strong>失敗</strong>，因為伺服器已有你的節點、路徑或關聯<br>的新版本。<br><br>請按<strong>{0}</"
"strong>將整個本地端資料組與伺服器同步。<br>按<strong>{1}</strong>則會放棄並繼續編輯。<br></html>"
msgid ""
@@ -8258,11 +8264,11 @@ msgid ""
"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
"again with a new or an existing open changeset.</html>"
msgstr ""
-"<html>上傳 <strong>失敗</strong>，因為您使用的<br>變更組合 {0} 已經在 {1} "
-"被關閉了。<br>請以新的或已開啟的變更組合再上傳一次。</html>"
+"<html>上傳 <strong>失敗</strong>，因為你使用的<br>變更集 {0} 已經在 {1} "
+"被關閉了。<br>請以新的或已開啟的變更集再上傳一次。</html>"
msgid "Changeset closed"
-msgstr "變更組合已關閉"
+msgstr "變更集已關閉"
msgid "Prepare conflict resolution"
msgstr "準備衝突的調解"
@@ -8299,84 +8305,84 @@ msgid "Check \"Save\" to save the layer to the file specified on the left."
msgstr ""
msgid "Provide a brief comment for the changes you are uploading:"
-msgstr "提供關於您所上傳變更的簡短註解："
+msgstr "提供關於你所上傳變更的簡短評論："
msgid "Enter an upload comment"
-msgstr "請輸入上傳備註"
+msgstr "請輸入上傳評論"
msgid "Specify the data source for the changes"
-msgstr "指定變更組合的資料來源"
+msgstr "指定變更集的資料來源"
msgid "obtain from current layers"
msgstr ""
msgid "Enter a source"
-msgstr ""
+msgstr "輸入來源"
msgid "Changeset id:"
-msgstr "變更組合 id："
+msgstr "變更集 id："
msgid "Created at:"
msgstr "建立於："
msgid "Changeset comment:"
-msgstr "變更組合註解："
+msgstr "變更集評論："
msgid "No open changeset"
-msgstr "沒有開放變更組合"
+msgstr "沒有開放變更集"
msgid ""
"Please decide what changeset the data is uploaded to and whether to close "
"the changeset after the next upload."
-msgstr "請決定要上傳哪個變更組合的資料以及在下次上傳後是否關閉變更組合。"
+msgstr "請決定要上傳哪個變更集的資料以及在下次上傳後是否關閉變更集。"
msgid "Upload to a new changeset"
-msgstr "上傳至新的變更組合"
+msgstr "上傳至新的變更集"
msgid "Open a new changeset and use it in the next upload"
-msgstr "開啟新的變更組合並在下次上傳時使用它"
+msgstr "開啟新的變更集並在下次上傳時使用它"
msgid "Upload to an existing changeset"
-msgstr "上傳至現有的變更組合"
+msgstr "上傳至現有的變更集"
msgid "Upload data to an already existing and open changeset"
-msgstr "上傳資料到已經存在且開放的變更組合"
+msgstr "上傳資料到已經存在且開放的變更集"
msgid "Select an open changeset"
-msgstr "選擇一個開放變更組合"
+msgstr "選擇一個開放變更集"
msgid "Close changeset after upload"
-msgstr "在上傳後關閉變更組合"
+msgstr "在上傳後關閉變更集"
msgid "Select to close the changeset after the next upload"
-msgstr "選擇此項會在下次上傳後關閉變更組合"
+msgstr "選擇此項會在下次上傳後關閉變更集"
msgid "Load the list of your open changesets from the server"
-msgstr "從伺服器載入您的開放變更組合清單"
+msgstr "從伺服器載入你的開放變更集清單"
msgid "Close the currently selected open changeset"
-msgstr "關閉目前選取的開放變更組合"
+msgstr "關閉目前選取的開放變更集"
msgid "<html>Please select the changesets you want to close</html>"
-msgstr "<html>請選擇您想要關閉的變更組合</html>"
+msgstr "<html>請選擇你想要關閉的變更集</html>"
msgid "Open changesets"
-msgstr "開放的變更組合"
+msgstr "開放的變更集"
msgid "Close changesets"
-msgstr "關閉的變更組合"
+msgstr "關閉的變更集"
msgid "Close the selected open changesets"
-msgstr "關閉選取的開放變更組合"
+msgstr "關閉選取的開放變更集"
msgid "Cancel closing of changesets"
-msgstr "取消變更組合的關閉"
+msgstr "取消變更集的關閉"
msgid "Closing changeset"
-msgstr "正在關閉變更組合"
+msgstr "正在關閉變更集"
msgid "Closing changeset {0}"
-msgstr "正在關閉變更組合 {0}"
+msgstr "正在關閉變更集 {0}"
msgid ""
"Failed to put Credential Dialog always on top. Caught security exception."
@@ -8398,10 +8404,10 @@ msgid "Warning: The password is transferred unencrypted."
msgstr "警告：密碼是以未加密的方式傳輸。"
msgid "Please enter the user name of your OSM account"
-msgstr "請輸入您 OSM 帳號的使用者名稱"
+msgstr "請輸入你 OSM 帳號的使用者名稱"
msgid "Please enter the password of your OSM account"
-msgstr "請輸入您 OSM 帳號的密碼"
+msgstr "請輸入你 OSM 帳號的密碼"
msgid ""
"Authenticating at the OSM API ''{0}'' failed. Please enter a valid username "
@@ -8420,10 +8426,10 @@ msgid ""
msgstr ""
msgid "Please enter the user name for authenticating at your proxy server"
-msgstr "請輸入您的代理伺服器驗證用的使用者名稱"
+msgstr "請輸入你的代理伺服器驗證用的使用者名稱"
msgid "Please enter the password for authenticating at your proxy server"
-msgstr "請輸入您的代理伺服器驗證用的密碼"
+msgstr "請輸入你的代理伺服器驗證用的密碼"
msgid ""
"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid "
@@ -8445,21 +8451,21 @@ msgid "Cancel authentication"
msgstr "取消驗證"
msgid "Downloading file"
-msgstr ""
+msgstr "正在下載檔案"
msgid "Downloading File {0}: {1} bytes..."
-msgstr ""
+msgstr "正在下載檔案 {0}：{1} byte..."
msgid "Download finished"
-msgstr ""
+msgstr "下載完成"
msgid "Unpacking {0} into {1}"
-msgstr ""
+msgstr "解開 {0} 到 {1}"
msgid ""
"Cannot download file ''{0}''. Its download link ''{1}'' is not a valid URL. "
"Skipping download."
-msgstr ""
+msgstr "無法下載檔案 ''{0}''，下載連結 ''{1}''. 是無效的 URL 網址... 取消下載。"
msgid ""
"Could not retrieve the list of your open changesets because<br>JOSM does not "
@@ -8467,8 +8473,8 @@ msgid ""
"not entitled<br>to know the identity of the user on whose behalf you are "
"working."
msgstr ""
-"無法取得您的開放變更組合清單，因為<br>JOSM "
-"不知道您的身分識別。<br>您可能是以匿名方式工作，或是您沒有以<br>您沒有目前工作的使用者名稱的身分識別。"
+"無法取得你的開放變更集清單，因為<br>JOSM "
+"不知道你的身分識別。<br>你可能是以匿名方式工作，或是你沒有以<br>你沒有目前工作的使用者名稱的身分識別。"
msgid "Missing user identity"
msgstr "遺失使用者識別"
@@ -8600,10 +8606,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 "立即刪除！"
@@ -8621,7 +8627,7 @@ msgid "Perform actions before restarting"
msgstr ""
msgid "Restart JOSM with saving. Unsaved changes are uploaded and/or saved."
-msgstr ""
+msgstr "重新啟動 JOSM 前先儲存：沒有儲存的變更會上傳或儲存。"
msgid "Perform actions before deleting"
msgstr "刪除前執行動作"
@@ -8687,22 +8693,22 @@ msgid "Initializing ways to update ..."
msgstr "正在初始化要更新的路徑 ..."
msgid "Initializing relations to update ..."
-msgstr "正在初始化要更新的關係 ..."
+msgstr "正在初始化要更新的關聯 ..."
msgid "Settings"
msgstr "設定值"
msgid "Decide how to upload the data and which changeset to use"
-msgstr "決定如何上傳資料以及要使用哪個變更組合"
+msgstr "決定如何上傳資料以及要使用哪個變更集"
msgid "Tags of new changeset"
-msgstr "新變更組合的標籤"
+msgstr "新變更集的標籤"
msgid "Apply tags to the changeset data is uploaded to"
-msgstr "將標籤套用到上傳的變更組合資料"
+msgstr "將標籤套用到上傳的變更集資料"
msgid "Manage open changesets and select a changeset to upload to"
-msgstr "管理開放的變更組合並選擇要上傳的變更組合"
+msgstr "管理開放的變更集並選擇要上傳的變更集"
msgid "Configure advanced settings"
msgstr "設定進階設定值"
@@ -8717,7 +8723,7 @@ msgid "Upload the changed primitives"
msgstr "上傳已變更的原型"
msgid "Please revise upload comment"
-msgstr "請修正上傳備註"
+msgstr "請修正上傳評論"
msgid ""
"Your upload comment is <i>empty</i>, or <i>very short</i>.<br /><br />This "
@@ -8726,9 +8732,9 @@ msgid ""
"/>to understand what is going on!<br /><br />If you spend a minute now to "
"explain your change, you will make life<br />easier for many other mappers."
msgstr ""
-"您的上傳備註是<i>空的</i>，或是<i>太過簡短</i>。<br /><br />這在技術上是允許的，但是請考慮到很多使用者<br "
-"/>在觀看他們區域的變更時都是依據有意義的變更組合備註<br />來了解發生了什麼事！<br /><br "
-"/>如果您現在花一點時間說明您的變更，就可以讓其他<br />眾多製圖者更好做事。"
+"你的上傳評論是<i>空的</i>，或是<i>太過簡短</i>。<br /><br />這在技術上是允許的，但是請考慮到很多使用者<br "
+"/>在觀看他們區域的變更時都是依據有意義的變更集評論<br />來了解發生了什麼事！<br /><br "
+"/>如果你現在花一點時間說明你的變更，就可以讓其他<br />眾多製圖者更好做事。"
msgid "Please specify a changeset source"
msgstr ""
@@ -8747,7 +8753,7 @@ msgid "Continue as is"
msgstr "仍然繼續"
msgid "Return to the previous dialog to enter a more descriptive comment"
-msgstr "回到前一個對話盒以輸入更多描述性備註"
+msgstr "回到前一個對話框以輸入更多描述性評論"
msgid "Cancel and return to the previous dialog"
msgstr "取消並返回前一個對話盒"
@@ -8756,10 +8762,10 @@ msgid "Please enter a valid chunk size first"
msgstr "請先輸入有效的區塊大小"
msgid "Illegal chunk size"
-msgstr "不合格的區塊大小"
+msgstr "不合規定的區塊大小"
msgid "{0}={1}"
-msgstr ""
+msgstr "{0}={1}"
msgid ""
"<html>The following changeset tag contains an empty "
@@ -8777,7 +8783,7 @@ msgid "Cancel the upload and resume editing"
msgstr "取消上傳並繼續編輯"
msgid "Tags of changeset {0}"
-msgstr "變更組合 {0} 的標籤"
+msgstr "變更集 {0} 的標籤"
msgid ""
"Object ''{0}'' is already deleted on the server. Skipping this object and "
@@ -8788,27 +8794,27 @@ msgid "Preparing objects to upload ..."
msgstr "正在準備要上傳的物件..."
msgid "Objects are uploaded to a <strong>new changeset</strong>."
-msgstr "物件會上傳到<strong>新的變更組合</strong>。"
+msgstr "物件會上傳到<strong>新的變更集</strong>。"
msgid ""
"Objects are uploaded to the <strong>open changeset</strong> {0} with upload "
"comment ''{1}''."
-msgstr "物件會上傳到<strong>開放變更組合</strong> {0}，上傳註解為「{1}」。"
+msgstr "物件會上傳到<strong>開放變更集</strong> {0}，上傳評論為「{1}」。"
msgid ""
"The changeset is going to be <strong>closed</strong> after this upload"
-msgstr "這個變更組合在這次上傳後會<strong>關閉</strong>"
+msgstr "這個變更集在這次上傳後會<strong>關閉</strong>"
msgid "The changeset is <strong>left open</strong> after this upload"
-msgstr "這個變更組合在這次上傳後會<strong>保持開放</strong>"
+msgstr "這個變更集在這次上傳後會<strong>保持開放</strong>"
msgid "configure changeset"
-msgstr "設定變更組合"
+msgstr "設定變更集"
msgid "Uploading <strong>{0} object</strong> to <strong>1 changeset</strong>"
msgid_plural ""
"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
-msgstr[0] "正在上傳 <strong>{0} 個物件</strong>到 <strong>1 個變更組合</strong>"
+msgstr[0] "正在上傳 <strong>{0} 個物件</strong>到 <strong>1 個變更集</strong>"
msgid ""
"Uploading <strong>{0} object</strong> to <strong>1 changeset</strong> using "
@@ -8818,14 +8824,14 @@ msgid_plural ""
"<strong>1 request</strong>"
msgstr[0] ""
"正在使用 <strong>1 次要求</strong>上傳 <strong>{0} 個物件</strong>到 <strong>1 "
-"個變更組合</strong>"
+"個變更集</strong>"
msgid ""
"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong> using "
"<strong>{1} requests</strong>"
msgstr ""
"正在使用 <strong>{1} 次要求</strong>上傳 <strong>{0} 個物件</strong>到 <strong>1 "
-"個變更組合</strong>"
+"個變更集</strong>"
msgid "advanced configuration"
msgstr "進階的組態"
@@ -8835,15 +8841,15 @@ msgid ""
"''{2}''. Please <a href=\"urn:advanced-configuration\">configure</a> how to "
"proceed with <strong>multiple changesets</strong>"
msgstr ""
-"{0} 個物件超過伺服器「{2}」變更組合最多允許的 {1} 個物件。請 <a href=\"urn:advanced-"
-"configuration\">設定</a>如何處理<strong>多個變更組合</strong>"
+"{0} 個物件超過伺服器「{2}」變更集最多允許的 {1} 個物件。請 <a href=\"urn:advanced-"
+"configuration\">設定</a>如何處理<strong>多個變更集</strong>"
msgid ""
"Uploading <strong>{0} objects</strong> to <strong>multiple "
"changesets</strong> using <strong>{1} requests</strong>"
msgstr ""
"正在使用 <strong>{1} 次要求</strong>上傳 <strong>{0} "
-"個物件</strong>到<strong>多個變更組合</strong>"
+"個物件</strong>到<strong>多個變更集</strong>"
msgid "Uploading data for layer ''{0}''"
msgstr "上傳圖層「{0}」的資料"
@@ -8852,7 +8858,7 @@ msgid "Continue uploading"
msgstr "正在繼續上傳"
msgid "Click to continue uploading to additional new changesets"
-msgstr "點選繼續以上傳到另外的新變更組合"
+msgstr "點選繼續以上傳到另外的新變更集"
msgid "Go back to Upload Dialog"
msgstr "回到上傳對話盒"
@@ -8870,7 +8876,7 @@ msgid ""
"The server reported that the current changeset was closed.<br>This is most "
"likely because the changesets size exceeded the max. size<br>of {0} objects "
"on the server ''{1}''."
-msgstr "伺服器回報目前的變更組合已關閉。<br>這很可能是由於變更組合的大小超過<br>伺服器「{1}」最大 {0} 個物件的大小。"
+msgstr "伺服器回報目前的變更集已關閉。<br>這很可能是由於變更集的大小超過<br>伺服器「{1}」最大 {0} 個物件的大小。"
msgid "There is {0} object left to upload."
msgid_plural "There are {0} objects left to upload."
@@ -8882,11 +8888,11 @@ msgid ""
"dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return to "
"map editing.<br>"
msgstr ""
-"點選「<strong>{0}</strong>」繼續上傳到另外的新變更組合。<br>點選「<strong>{1}</strong>」回到上傳對話盒。<br"
-">點選「<strong>{2}</strong>」放棄上傳並回到地圖編輯。<br>"
+"點選「<strong>{0}</strong>」繼續上傳到另外的新變更集。<br>點選「<strong>{1}</strong>」回到上傳對話盒。<br>"
+"點選「<strong>{2}</strong>」放棄上傳並回到地圖編輯。<br>"
msgid "Changeset is full"
-msgstr "變更組合已滿"
+msgstr "變更集已滿"
msgid "Node ''{0}'' is already deleted. Skipping object in upload."
msgstr ""
@@ -8906,7 +8912,7 @@ msgstr[0] "正在上傳 {0} 個物件..."
msgid ""
"Ignoring caught exception because upload is canceled. Exception is: {0}"
-msgstr "忽略捕捉到的例外，因為上傳已被取消。例外為：{0}"
+msgstr "忽略捕捉到的異常，因為上傳已被取消。異常為：{0}"
msgid "Upload successful!"
msgstr "上傳成功！"
@@ -8931,10 +8937,10 @@ msgid "Unexpected value for key ''{0}'' in preferences, got ''{1}''"
msgstr ""
msgid "Fill up one changeset and return to the Upload Dialog"
-msgstr "填滿一個變更組合並回到上傳對話盒"
+msgstr "填滿一個變更集並回到上傳對話盒"
msgid "Open and use as many new changesets as necessary"
-msgstr "開啟並依需要使用新的變更組合"
+msgstr "開啟並依需要使用新的變更集"
msgid "Please select the upload strategy:"
msgstr "請選擇上傳的方式："
@@ -8951,7 +8957,7 @@ msgstr "分別上傳每一個物件"
msgid ""
"<html>There are <strong>multiple changesets</strong> necessary in order to "
"upload {0} objects. Which strategy do you want to use?</html>"
-msgstr "<html>需要<strong>多個變更組合</strong>才能上傳 {0} 個物件。您想要使用哪種方式？</html>"
+msgstr "<html>需要<strong>多個變更集</strong>才能上傳 {0} 個物件。你想要使用哪種方式？</html>"
msgid "Upload in one request not possible (too many objects to upload)"
msgstr "以一次要求上傳是不可能的 (太多物件要上傳)"
@@ -8972,10 +8978,10 @@ msgid_plural "({0} requests)"
msgstr[0] "({0} 次要求)"
msgid "Illegal chunk size <= 0. Please enter an integer > 1"
-msgstr "不合格的區塊大小 <= 0。請輸入大於 1 的整數"
+msgstr "不合規定的區塊大小 <= 0。請輸入大於 1 的整數"
msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''"
-msgstr "區塊大小 {0} 超過最大值。伺服器「{2}」的變更組合大小為 {1}"
+msgstr "區塊大小 {0} 超過最大值。伺服器「{2}」的變更集大小為 {1}"
msgid "Please enter an integer > 1"
msgstr "請輸入大於 1 的整數值"
@@ -9004,50 +9010,53 @@ msgid "{0} object to delete:"
msgid_plural "{0} objects to delete:"
msgstr[0] "{0} 個物件要刪除："
-msgid "Show tile info"
+msgid "Native projections"
msgstr ""
-msgid "Tile Info"
-msgstr ""
+msgid "Offset"
+msgstr "偏移"
-msgid "Metadata "
+msgid "Tile download projection"
msgstr ""
-msgid "Load tile"
+msgid "Tile display projection"
msgstr ""
-msgid "Auto zoom"
-msgstr ""
+msgid "Current zoom"
+msgstr "目前縮放"
-msgid "Auto load tiles"
-msgstr "自動載入拼貼"
+msgid "Show tile info"
+msgstr "顯示圖磚資訊"
-msgid "Show errors"
-msgstr ""
+msgid "Tile Info"
+msgstr "圖磚資訊"
-msgid "Load all tiles"
-msgstr ""
+msgid "Tile name"
+msgstr "圖磚名稱"
-msgid "Load all error tiles"
-msgstr ""
+msgid "Tile URL"
+msgstr "圖磚 URL 網址"
-msgid "Zoom to native resolution"
-msgstr ""
+msgid "Tile size"
+msgstr "圖磚大小"
-msgid "Change resolution"
-msgstr "改變解析度"
+msgid "Tile display size"
+msgstr "圖轉顯示大小"
-msgid "Increase zoom"
-msgstr "增加縮放"
+msgid "Reprojection"
+msgstr ""
-msgid "Decrease zoom"
-msgstr "減少縮放"
+msgid "Reprojected tile size"
+msgstr ""
-msgid "Flush tile cache"
+msgid "Metadata "
msgstr ""
+msgid "Load tile"
+msgstr "載入圖磚"
+
msgid "Failed to create tile source"
-msgstr ""
+msgstr "無法建立圖磚來源"
msgid "zoom in to load any tiles"
msgstr "拉近以讀取任何拼貼"
@@ -9062,22 +9071,22 @@ msgid "No tiles at this zoom level"
msgstr "這個縮放等級沒有拼貼"
msgid "Current zoom: {0}"
-msgstr ""
+msgstr "目前縮放：{0}"
msgid "Display zoom: {0}"
-msgstr ""
+msgstr "顯示縮放：{0}"
msgid "Pixel scale: {0}"
-msgstr ""
+msgstr "像數比例：{0}"
msgid "Best zoom: {0}"
-msgstr ""
+msgstr "最佳縮放：{0}"
msgid "Estimated cache size: {0}"
msgstr ""
msgid "Cache stats: {0}"
-msgstr ""
+msgstr "快娶狀態：{0}"
msgid "{0} ({1}), automatically downloading in zoom {2}"
msgstr ""
@@ -9086,10 +9095,10 @@ msgid "{0} ({1}), downloading in zoom {2}"
msgstr ""
msgid "Downloaded {0}/{1} tiles"
-msgstr ""
+msgstr "已下載 {0}/{1} 個圖磚"
msgid "Save WMS file"
-msgstr ""
+msgstr "儲存 WMS 檔案"
msgid ""
"Aerial imagery \"{0}\" might be misaligned. Please check its offset using "
@@ -9103,7 +9112,7 @@ msgid "Details..."
msgstr "詳細資料…"
msgid "Do not show this message again"
-msgstr ""
+msgstr "不再顯示這個訊息"
msgid "Hide this message and never show it again"
msgstr "隱藏這個訊息並且不再顯示它"
@@ -9125,7 +9134,7 @@ msgstr "描述：{0}"
msgid "{0} track"
msgid_plural "{0} tracks"
-msgstr[0] "{0} 軌跡"
+msgstr[0] "{0} 個軌跡"
msgid "Description"
msgstr "描述"
@@ -9149,16 +9158,22 @@ msgstr[0] "{0} 航點"
msgid "{0} track, "
msgid_plural "{0} tracks, "
-msgstr[0] "{0} 軌跡， "
+msgstr[0] "{0} 個軌跡， "
msgid "Save GPX file"
msgstr "儲存 GPX 檔案"
-msgid "Imagery fade"
-msgstr "圖片淡出"
+msgid "Id"
+msgstr "ID"
+
+msgid "Min. zoom"
+msgstr "最小縮放"
+
+msgid "Max. zoom"
+msgstr "最大縮放"
msgid "Unsupported imagery type: {0}"
-msgstr ""
+msgstr "不支援的影像類型：{0}"
msgid "Next marker"
msgstr "下個標記"
@@ -9173,30 +9188,29 @@ msgid "Jump to previous marker"
msgstr ""
msgid "All projections are supported"
-msgstr ""
+msgstr "所有支援的投影法都"
msgid "The layer {0} does not support the new projection {1}."
-msgstr ""
+msgstr "圖層 {0} 不支援新的投影法 {1}。"
msgid "Supported projections are: {0}"
-msgstr ""
+msgstr "支援的投影法是：{0}"
msgid "Change the projection again or remove the layer."
-msgstr ""
+msgstr "再變更投影法或是移除這個圖層。"
msgid "Save Layer"
msgstr "儲存圖層"
msgid "{0} note"
msgid_plural "{0} notes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} 個註解"
msgid "Notes layer"
-msgstr ""
+msgstr "註解圖層"
msgid "Total notes:"
-msgstr ""
+msgstr "總註解數："
msgid "Changes need uploading?"
msgstr ""
@@ -9262,14 +9276,11 @@ msgstr "拒絕衝突項目並儲存"
msgid ""
"There are unresolved conflicts. Conflicts will not be saved and handled as "
"if you rejected all. Continue?"
-msgstr "尚有未解決的衝突。如果您全部拒絕就不會儲存衝突。是否繼續？"
+msgstr "尚有未解決的衝突。如果你全部拒絕就不會儲存衝突。是否繼續？"
msgid "Save OSM file"
msgstr "儲存 OSM 檔案"
-msgid "EPSG:4326 and Mercator projection are supported"
-msgstr ""
-
msgid "Validation errors"
msgstr "驗證的錯誤"
@@ -9280,8 +9291,11 @@ msgid "Set WMS Bookmark"
msgstr "設定 WMS 書籤"
msgid ""
-"JOSM will use EPSG:4326 to query the server, but results may vary depending "
-"on the WMS server"
+"Reprojecting layer {0} from {1} to {2}. For best image quality and "
+"performance, switch to one of the supported projections: {3}"
+msgstr ""
+
+msgid "Unable to find supported projection for layer {0}. Using {1}."
msgstr ""
msgid "Correlate to GPX"
@@ -9319,13 +9333,13 @@ msgid ""
"time.<br>Display that photo here.<br>And then, simply capture the time you "
"read on the photo and select a timezone<hr></html>"
msgstr ""
-"<html>配合您的 GPS 接收器拍照，它會顯示時刻。<br>在這裡顯示照片。<br>然後，根據您讀取到的相片時刻並選擇時區<hr></html>"
+"<html>配合你的 GPS 接收器拍照，它會顯示時刻。<br>在這裡顯示照片。<br>然後，根據你讀取到的相片時刻並選擇時區<hr></html>"
msgid "Photo time (from exif):"
msgstr "相片時刻 (取自 exif):"
msgid "Gps time (read from the above photo): "
-msgstr "Gps 時刻（自上列相片讀取）： "
+msgstr "Gps 時刻 (自上列相片讀取) ： "
msgid "I am in the timezone of: "
msgstr "我所在的時區： "
@@ -9416,10 +9430,10 @@ msgstr[0] "({0} 天的時間差異)"
msgid ""
"An error occurred while trying to match the photos to the GPX track. You can "
"adjust the sliders to manually match the photos."
-msgstr "在試著比對相片與 GPX 軌跡時發生錯誤。您可以使用滑動鈕來手動比對相片。"
+msgstr "在試著比對相片與 GPX 軌跡時發生錯誤。你可以使用滑動鈕來手動比對相片。"
msgid "Matching photos to track failed"
-msgstr "比對相片至軌跡失敗"
+msgstr "相片與軌跡配對失敗"
msgid "Adjust timezone and offset"
msgstr "調整時區並補償"
@@ -9436,28 +9450,14 @@ msgid ""
msgstr "選取的 GPX 軌跡沒有包含時間戳記。請選擇另一個。"
msgid "GPX Track has no time information"
-msgstr "GPX 軌跡沒有時刻資訊"
+msgstr "GPX 軌跡沒有時間資訊"
msgid "You should select a GPX track"
-msgstr "您應該選擇一個 GPX 軌跡"
+msgstr "你應該選擇一個 GPX 軌跡"
msgid "No selected GPX track"
msgstr "沒有選取的 GPX 軌跡"
-msgid ""
-"Error while parsing timezone.\n"
-"Expected format: {0}"
-msgstr ""
-"分析時區時發生錯誤。\n"
-"預期的格式：{0}"
-
-msgid ""
-"Error while parsing offset.\n"
-"Expected format: {0}"
-msgstr ""
-"在分析補償時發生錯誤。\n"
-"預期的格式：{0}"
-
msgid "Geotagged Images"
msgstr "有 Geotag 的圖片"
@@ -9495,8 +9495,7 @@ msgstr[0] "發現 {0} 已有 GPS 標籤。"
msgid "{0} has updated GPS data."
msgid_plural "{0} have updated GPS data."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "有 {0} 個已更新了 GPS 資料。"
msgid "Delete image file from disk"
msgstr "從磁碟刪除圖片檔"
@@ -9537,7 +9536,7 @@ msgid "Delete File from disk"
msgstr "從磁碟刪除檔案"
msgid "Copy image path"
-msgstr ""
+msgstr "複製影像目錄"
msgid "Next"
msgstr "下一幅"
@@ -9546,10 +9545,10 @@ msgid "Show next Image"
msgstr "顯示下一張圖片"
msgid "Show first Image"
-msgstr ""
+msgstr "顯示第一個影像"
msgid "Show last Image"
-msgstr ""
+msgstr "顯示最後一個影像"
msgid "Center view"
msgstr "置中檢視"
@@ -9571,6 +9570,8 @@ msgid ""
"\n"
"Speed: {0} km/h"
msgstr ""
+"\n"
+"速度：{0} 公里/小時"
msgid ""
"\n"
@@ -9583,23 +9584,41 @@ msgid ""
"\n"
"EXIF time: {0}"
msgstr ""
+"\n"
+"EXIF 時間：{0}"
msgid ""
"\n"
"GPS time: {0}"
msgstr ""
+"\n"
+"GPS 時間：{0}"
-msgid "Show thumbnails"
+msgid ""
+"Error while parsing offset.\n"
+"Expected format: {0}"
msgstr ""
+"在分析補償時發生錯誤。\n"
+"預期的格式：{0}"
+
+msgid "Show thumbnails"
+msgstr "顯示縮圖"
msgid "Show image thumbnails instead of icons."
+msgstr "以影像縮圖代替圖示。"
+
+msgid ""
+"Error while parsing timezone.\n"
+"Expected format: {0}"
msgstr ""
+"分析時區時發生錯誤。\n"
+"預期的格式：{0}"
msgid "Choose visible tracks"
msgstr ""
msgid "Select by date"
-msgstr ""
+msgstr "按日期選取"
msgid ""
"<html>Select all tracks that you want to be displayed. You can drag select a "
@@ -9614,7 +9633,7 @@ msgid "Show all"
msgstr "顯示全部"
msgid "Show selected only"
-msgstr ""
+msgstr "只顯示選取的"
msgid "Convert to data layer"
msgstr "轉換為資料圖層"
@@ -9622,25 +9641,25 @@ msgstr "轉換為資料圖層"
msgid ""
"<html>Upload of unprocessed GPS data as map data is considered "
"harmful.<br>If you want to upload traces, look here:</html>"
-msgstr "<html>上傳未經處理的 GPS 資料當作地圖資料是不適當的。<br>如果您想要上傳軌跡，請看這裡：</html>"
+msgstr "<html>上傳未經處理的 GPS 資料當作地圖資料是不適當的。<br>如果你想要上傳軌跡，請看這裡：</html>"
msgid "Customize track drawing"
msgstr "自訂軌跡繪製"
msgid "From"
-msgstr ""
+msgstr "從"
msgid "To"
-msgstr ""
+msgstr "到"
msgid "No timestamp"
-msgstr ""
+msgstr "沒有時間戳記"
msgid "Select to download OSM data."
-msgstr ""
+msgstr "選取要下載的 OSM 資料。"
msgid "Select to download GPS traces."
-msgstr ""
+msgstr "選取要下載的 GPS 軌跡。"
msgid "Download everything within:"
msgstr "下載這裡面的每個物件："
@@ -9664,19 +9683,19 @@ msgid "track and waypoints"
msgstr "軌跡與航點"
msgid "Click to download"
-msgstr ""
+msgstr "點擊下載"
msgid "Click to cancel"
-msgstr ""
+msgstr "點擊取消"
msgid "Download from OSM along this track"
-msgstr "從 OSM 沿這條軌跡下載"
+msgstr "從 OSM 下載這條軌跡沿線"
msgid "Calculating Download Area"
-msgstr ""
+msgstr "正在計算下載區域"
msgid "Precache imagery tiles along this track"
-msgstr "預先快取沿這條軌跡上的圖片拼貼"
+msgstr "預先快取沿這條軌跡上的影像"
msgid "Precaching WMS"
msgstr "預先快取 WMS"
@@ -9697,7 +9716,7 @@ msgid "gps point"
msgstr "gps 點"
msgid "HDOP"
-msgstr ""
+msgstr "HDOP"
msgid "Time"
msgstr "時刻"
@@ -9706,7 +9725,7 @@ msgid "Direction"
msgstr "方向"
msgid "Velocity, {0}"
-msgstr ""
+msgstr "Velocity, {0}"
msgid "Wave Audio files (*.wav)"
msgstr "Wave 音效檔案 (*.wav)"
@@ -9733,7 +9752,7 @@ msgstr "在圖層中沒有可用的 GPX 軌跡可供音效關聯。"
msgid ""
"Some waypoints with timestamps from before the start of the track or after "
"the end were omitted or moved to the start."
-msgstr "部分航點的時刻戳記早於軌跡起點或晚於終點會被忽略或是移至起點。"
+msgstr "部分航點的時間戳記早於軌跡起點或晚於終點會被忽略或是移至起點。"
msgid ""
"Some waypoints which were too far from the track to sensibly estimate their "
@@ -9755,6 +9774,36 @@ msgstr "已命名點的標記"
msgid "Named Trackpoints from {0}"
msgstr "{0} 的已命名軌跡點"
+msgid "Auto load tiles"
+msgstr "自動載入拼貼"
+
+msgid "Auto zoom"
+msgstr "自動縮放"
+
+msgid "Decrease zoom"
+msgstr "減少縮放"
+
+msgid "Flush tile cache"
+msgstr "清除快取"
+
+msgid "Increase zoom"
+msgstr "增加縮放"
+
+msgid "Load all tiles"
+msgstr "載入所有圖磚"
+
+msgid "Load all error tiles"
+msgstr "載入所有錯誤圖磚"
+
+msgid "Show errors"
+msgstr "顯示錯誤"
+
+msgid "Change resolution"
+msgstr "改變解析度"
+
+msgid "Zoom to native resolution"
+msgstr "縮放至原始解析度"
+
msgid "gps marker"
msgstr "gps 標記"
@@ -9780,7 +9829,7 @@ msgstr "同步音效"
msgid ""
"You need to pause audio at the moment when you hear your synchronization cue."
-msgstr "當您在聆聽同步隊列時需要暫停音效。"
+msgstr "當你在聆聽同步隊列時需要暫停音效。"
msgid "Audio synchronized at point {0}."
msgstr "音效同步於點 {0}。"
@@ -9794,17 +9843,17 @@ msgstr "在播放開頭放置聲音標記"
msgid ""
"You need to have paused audio at the point on the track where you want the "
"marker."
-msgstr "您需要在軌跡上想標記的點暫停音效。"
+msgstr "你需要在軌跡上想標記的點暫停音效。"
msgid ""
"You need to drag the play head near to the GPX track whose associated sound "
"track you were playing (after the first marker)."
-msgstr "您需要播放開頭拖放到要與播放的聲音軌關聯的 GPX 軌跡附近（在第一個標記之後）。"
+msgstr "你需要播放開頭拖放到要與播放的聲音軌關聯的 GPX 軌跡附近 (在第一個標記之後) 。"
msgid ""
"You need to SHIFT-drag the play head onto an audio marker or onto the track "
"point where you want to synchronize."
-msgstr "您需要按 SHIFT 拖放播放開頭到聲音標記或您想要同步的軌跡點上。"
+msgstr "你需要按 SHIFT 拖放播放開頭到聲音標記或你想要同步的軌跡點上。"
msgid "Unable to create new audio marker."
msgstr "無法建立新的音效標記。"
@@ -9816,7 +9865,7 @@ msgid "(URL was: "
msgstr "(URL 是： "
msgid "Select the map painting styles"
-msgstr ""
+msgstr "選取地圖繪製樣式"
msgid "loading style ''{0}''..."
msgstr "載入樣式「{0}」..."
@@ -9831,10 +9880,10 @@ msgstr[0] ""
msgstr[1] ""
msgid "Failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
+msgstr "無法從 ''{0}'' 載入地圖繪製樣式，異常：{1}"
msgid "Failed to parse Mappaint styles from ''{0}''. Error was: {1}"
-msgstr ""
+msgstr "無法從 ''{0}'' 貼上地圖繪製樣式，錯誤：{1}"
msgid "Failed to locate image ''{0}''"
msgstr ""
@@ -9872,10 +9921,10 @@ msgid "Authorize URL:"
msgstr "驗證 URL："
msgid "OSM login URL:"
-msgstr ""
+msgstr "OSM 登入 URL 網址："
msgid "OSM logout URL:"
-msgstr ""
+msgstr "OSM 登出 URL 網址："
msgid "Click to reset the OAuth settings to default values"
msgstr "按這裡將 OAuth 設定值重設為預設值"
@@ -9920,7 +9969,7 @@ msgstr ""
msgid ""
"<html>Enter an Access Token manually if it was generated and retrieved "
"outside<br>of JOSM.</html>"
-msgstr "<html>如果您是在 JOSM 之外產生並取得存取記號的話，<br>請手動輸入它。</html>"
+msgstr "<html>如果你是在 JOSM 之外產生並取得存取記號的話，<br>請手動輸入它。</html>"
msgid ""
"Please enter your OSM user name and password. The password will "
@@ -9928,8 +9977,8 @@ msgid ""
"will be submitted to the OSM server <strong>only once</strong>. Subsequent "
"data upload requests don''t use your password any more."
msgstr ""
-"請輸入您的 OSM 使用者名稱與密碼。密碼將<strong>不會</strong>以純文字儲存於 JOSM 偏好設定，它只會傳送到 OSM "
-"伺服器<strong>一次</strong>。接下來的資料上載要求就不會再要求您的密碼了。"
+"請輸入你的 OSM 使用者名稱與密碼。密碼將<strong>不會</strong>以純文字儲存於 JOSM 偏好設定，它只會傳送到 OSM "
+"伺服器<strong>一次</strong>。接下來的資料上載要求就不會再要求你的密碼了。"
msgid "Username: "
msgstr "使用者名稱： "
@@ -9951,14 +10000,14 @@ msgid ""
"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>您已經成功的從 OSM 網站取回 OAuth 存取記號。請按 <strong>{0}</strong> 套用這個記號。JOSM "
+"<html>你已經成功的從 OSM 網站取回 OAuth 存取記號。請按 <strong>{0}</strong> 套用這個記號。JOSM "
"會在往後的要求中使用它存取 OSM API。</html>"
msgid "Authorize now"
msgstr "立即驗證"
msgid "Click to redirect you to the authorization form on the JOSM web site"
-msgstr "按這裡將您重新導向至 JOSM 驗證網站"
+msgstr "按這裡將你重新導向至 JOSM 驗證網站"
msgid "Back"
msgstr "返回"
@@ -9970,10 +10019,10 @@ msgid "Test Access Token"
msgstr "測試存取記號"
msgid "Please enter your OSM password"
-msgstr "請輸入您的 OSM 密碼"
+msgstr "請輸入你的 OSM 密碼"
msgid "The password cannot be empty. Please enter your OSM password"
-msgstr "密碼不能為空白。請輸入您的 OSM 密碼"
+msgstr "密碼不能為空白。請輸入你的 OSM 密碼"
msgid "Authorize JOSM to access the OSM API"
msgstr "授權 JOSM 能存取 OSM API"
@@ -9996,7 +10045,7 @@ msgid ""
"advanced setting and try again.</html>"
msgstr ""
"<html>從 OSM 伺服器取得 OAuth 存取記號的自動程序<br>失敗了，因為 JOSM 無法建立<br> OAuth Authorize "
-"Endpoint URL ''{0}'' 的登入 URL。<br><br>請檢查您的進階設定值並再試一次。</html>"
+"Endpoint URL ''{0}'' 的登入 URL。<br><br>請檢查你的進階設定值並再試一次。</html>"
msgid ""
"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
@@ -10050,7 +10099,7 @@ 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 ""
-"使用 OAuth 您會得到以自己的身分在 JOSM 上傳地圖資料和 GPS 軌跡的權限 (<a href=\"{0}\">更多資訊...</a>)。"
+"使用 OAuth 你會得到以自己的身分在 JOSM 上傳地圖資料和 GPS 軌跡的權限 (<a href=\"{0}\">更多資訊...</a>)。"
msgid "Please select an authorization procedure: "
msgstr "請選擇一種授權程序： "
@@ -10108,36 +10157,36 @@ msgid "Allow to upload map data"
msgstr "允許上傳地圖資料"
msgid "Select to grant JOSM the right to upload map data on your behalf"
-msgstr "選擇以使 JOSM 有權以您的身分上傳地圖資料"
+msgstr "選擇以使 JOSM 有權以你的身分上傳地圖資料"
msgid "Allow to upload GPS traces"
msgstr "允許上傳 GPS 軌跡"
msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
-msgstr "選擇以使 JOSM 有權以您的身分上傳 GPS 軌跡"
+msgstr "選擇以使 JOSM 有權以你的身分上傳 GPS 軌跡"
msgid "Allow to download your private GPS traces"
-msgstr "允許下載您的私人 GPS 軌跡"
+msgstr "允許下載你的私人 GPS 軌跡"
msgid ""
"Select to grant JOSM the right to download your private GPS traces into JOSM "
"layers"
-msgstr "選擇以使 JOSM 有權下載您的私人 GPS 軌跡到 JOSM 圖層"
+msgstr "選擇以使 JOSM 有權下載你的私人 GPS 軌跡到 JOSM 圖層"
msgid "Allow to read your preferences"
-msgstr "允許讀取您的偏好設定"
+msgstr "允許讀取你的偏好設定"
msgid "Select to grant JOSM the right to read your server preferences"
-msgstr "選擇以使 JOSM 有權讀取您伺服器的偏好設定"
+msgstr "選擇以使 JOSM 有權讀取你伺服器的偏好設定"
msgid "Allow to write your preferences"
-msgstr "允許寫入您的偏好設定"
+msgstr "允許寫入你的偏好設定"
msgid "Select to grant JOSM the right to write your server preferences"
-msgstr "選擇以使 JOSM 有權寫入您伺服器的偏好設定"
+msgstr "選擇以使 JOSM 有權寫入你伺服器的偏好設定"
msgid "Allow modifications of notes"
-msgstr ""
+msgstr "允許修改註解"
msgid "Select to grant JOSM the right to modify notes on your behalf"
msgstr ""
@@ -10186,9 +10235,9 @@ msgid ""
"copy the following authorize URL and paste it into the address field of your "
"browser.</html>"
msgstr ""
-"<html>JOSM 成功的取回要求記號。JOSM 現在會在外部瀏覽器中開啟驗證網頁。請以您的 OSM "
+"<html>JOSM 成功的取回要求記號。JOSM 現在會在外部瀏覽器中開啟驗證網頁。請以你的 OSM "
"使用者名稱和密碼登入並按照指示授權給要求記號。接著切換回這個對話盒並點選 "
-"<strong>{0}</strong><br><br>如果執行外部瀏覽器失敗，您可以複製下列驗證 URL 並將它貼到瀏覽器的位址列中。</html>"
+"<strong>{0}</strong><br><br>如果執行外部瀏覽器失敗，你可以複製下列驗證 URL 並將它貼到瀏覽器的位址列中。</html>"
msgid "Go back to step 1/3"
msgstr "回到步驟 1/3"
@@ -10201,7 +10250,7 @@ msgid ""
"this token. JOSM will use it in the future for authentication and "
"authorization to the OSM server.<br><br>The access token is: </html>"
msgstr ""
-"<html>JOSM 已成功的取回存取記號。您現在可以套用這個記號。JOSM 往後會用它進行與 OSM "
+"<html>JOSM 已成功的取回存取記號。你現在可以套用這個記號。JOSM 往後會用它進行與 OSM "
"伺服器的驗證。<br><br>存取記號為：</html>"
msgid "Click to retrieve a Request Token"
@@ -10227,7 +10276,7 @@ msgid ""
"at ''{1}''.<br>You are accessing the OSM server as user ''{2}'' with id "
"''{3}''.</html>"
msgstr ""
-"<html>成功的使用存取記號「{0}」存取<br>OSM 伺服器「{1}」。<br>您現在是以使用者「{2}」id「{3}」存取 OSM "
+"<html>成功的使用存取記號「{0}」存取<br>OSM 伺服器「{1}」。<br>你現在是以使用者「{2}」id「{3}」存取 OSM "
"伺服器。</html>"
msgid "Success"
@@ -10251,7 +10300,7 @@ msgid ""
"other protected resources.</html>"
msgstr ""
"<html>存取記號「{1}」是用於 OSM "
-"伺服器「{0}」。<br>然而，以這個記號測試取回使用者詳細資料卻失敗了。<br>依據這個記號獲得的權限您仍有可能使用它<br>上傳資料、 GPS "
+"伺服器「{0}」。<br>然而，以這個記號測試取回使用者詳細資料卻失敗了。<br>依據這個記號獲得的權限你仍有可能使用它<br>上傳資料、 GPS "
"軌跡和/或存取其他受保護的資源。</html>"
msgid "Token allows restricted access"
@@ -10265,7 +10314,7 @@ msgid ""
msgstr ""
"<html>無法從 OSM "
"伺服器「{0}」取回關於目前使用者的資訊。<br>這可能是測試的存取記號造成的問題，但<br>也可能是否應伺服器組態的問題。請小心檢查伺服器<br>URL"
-" 和您的網際網路連線。</html>"
+" 和你的網際網路連線。</html>"
msgid ""
"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
@@ -10291,10 +10340,10 @@ msgid "Save the preferences and close the dialog"
msgstr "儲存偏好設定並關閉對話盒"
msgid "You have to restart JOSM for some settings to take effect."
-msgstr "您必須重新啟動 JOSM 才能讓某些設定值生效。"
+msgstr "你必須重新啟動 JOSM 才能讓某些設定值生效。"
msgid "Would you like to restart now?"
-msgstr ""
+msgstr "你想要立即重新啟動？"
msgid "Download plugins"
msgstr "下載外掛程式"
@@ -10318,7 +10367,7 @@ msgid "Version:"
msgstr "版本："
msgid "Minimum JOSM Version:"
-msgstr ""
+msgstr "最低的 JOSM 版本："
msgid "by {0}"
msgstr "由 {0}"
@@ -10330,10 +10379,10 @@ msgid "URL / File:"
msgstr "網址/檔案："
msgid "active"
-msgstr "使用中"
+msgstr "活火山"
msgid "Map paint style file (*.xml, *.mapcss, *.zip)"
-msgstr ""
+msgstr "地圖繪製樣式檔案 (*.xml, *.mapcss, *.zip)"
msgid "Preset definition file (*.xml, *.zip)"
msgstr ""
@@ -10348,10 +10397,10 @@ msgid "Entry ''{0}'' requires JOSM Version {1}. (Currently running: {2})"
msgstr ""
msgid "Continue anyway"
-msgstr ""
+msgstr "就是繼續"
msgid "Ignore warning and install style anyway"
-msgstr ""
+msgstr "忽略警告、繼續安裝樣式"
msgid "Some entries have unmet dependencies:"
msgstr ""
@@ -10384,10 +10433,10 @@ msgid "Configure toolbar"
msgstr "設定工具列"
msgid "Edit shortcut"
-msgstr ""
+msgstr "編輯快捷鍵"
msgid "Do not hide toolbar and menu"
-msgstr ""
+msgstr "不隱藏工具列與選單"
msgid "Actions"
msgstr "動作"
@@ -10432,7 +10481,7 @@ msgid "Registered toolbar action {0} overwritten: {1} gets {2}"
msgstr "註冊的工具列動作 {0} 被覆蓋：{1} 得到 {2}"
msgid "Toolbar: {0}"
-msgstr ""
+msgstr "工具列：{0}"
msgid "add entry"
msgstr "加入項目"
@@ -10489,37 +10538,38 @@ msgid ""
msgstr ""
msgid "shortcut"
-msgstr ""
+msgstr "快捷鍵"
msgid "color"
-msgstr ""
+msgstr "顏色"
msgid "toolbar"
-msgstr ""
+msgstr "工具列"
msgid "imagery"
msgstr "圖片"
msgid "Reset preferences"
-msgstr ""
+msgstr "重設偏好設定"
msgid ""
"You are about to clear all preferences to their default values<br />All your "
"settings will be deleted: plugins, imagery, filters, toolbar buttons, "
"keyboard, etc. <br />Are you sure you want to continue?"
msgstr ""
+"你正要清除所有的偏好設定、恢復成預設值<br />你所有的設定都會被刪除：插件、影像、過濾器、工具列按鈕、快捷鍵等。<br />你真的要繼續嗎？"
msgid "Load profile"
-msgstr ""
+msgstr "載入設定"
msgid "Save {0} profile"
-msgstr ""
+msgstr "儲存 {0} 設定"
msgid "All the preferences of this group are default, nothing to save"
-msgstr ""
+msgstr "這個群組的所有偏好設定都是預設值，沒有該儲存的"
msgid "Choose profile file"
-msgstr ""
+msgstr "選擇設定檔"
msgid "Change list setting"
msgstr ""
@@ -10558,22 +10608,22 @@ msgid "Please select the row to delete."
msgstr "請選擇要刪除的列。"
msgid "Advanced Background: Changed"
-msgstr ""
+msgstr "進階背景：變更過"
msgid "Advanced Background: NonDefault"
-msgstr ""
+msgstr "進階背景：非預設"
msgid "Current value is default."
-msgstr ""
+msgstr "目前的值是 預設。"
msgid "Default value is ''{0}''."
-msgstr ""
+msgstr "預設值是 ''{0}''。"
msgid "Default value currently unknown (setting has not been used yet)."
msgstr "預設值目前不明 (設定值尚未使用)"
msgid "Change string setting"
-msgstr ""
+msgstr "變更字串設定"
msgid "Value: "
msgstr "數值： "
@@ -10588,7 +10638,7 @@ msgid "Display the Audio menu."
msgstr "顯示音效選單。"
msgid "Label audio (and image and web) markers."
-msgstr "標籤音效（及圖片、網頁）標記。"
+msgstr "標籤音效 (及圖片、網頁) 標記。"
msgid "Display live audio trace."
msgstr "顯示即時音效追蹤。"
@@ -10603,10 +10653,10 @@ msgid "Named trackpoints."
msgstr "已命名的軌跡點。"
msgid "Modified times (time stamps) of audio files."
-msgstr "音效檔案的修改次數（時間戳記）。"
+msgstr "音效檔案的修改次數 (時間戳記) 。"
msgid "Start of track (will always do this if no other markers available)."
-msgstr "軌跡的開頭（如果沒有其他的標記可用就會這麼做）。"
+msgstr "軌跡的開頭 (如果沒有其他的標記可用就會這麼做) 。"
msgid "Show or hide the audio menu entry on the main menu bar."
msgstr "顯示或隱藏主要選單列的音效選單項目。"
@@ -10619,7 +10669,7 @@ msgstr "顯示會移動的圖示來顯示出目前播放的音效所記錄同步
msgid ""
"Put text labels against audio (and image and web) markers as well as their "
"button icons."
-msgstr "在音效（和圖片、網頁）標記的按鈕圖示旁放上文字標籤。"
+msgstr "在音效 (和圖片、網頁) 標記的按鈕圖示旁放上文字標籤。"
msgid "When importing audio, make markers from..."
msgstr "匯入音效時，由此製作標記..."
@@ -10630,7 +10680,7 @@ msgstr "匯入音效時，將它套用到 GPX 圖層的任何航點中。"
msgid ""
"Automatically create audio markers from trackpoints (rather than explicit "
"waypoints) with names or descriptions."
-msgstr "從軌跡點（非明確的航點）自動建立音效標記，並加上名稱或描述。"
+msgstr "從軌跡點 (非明確的航點) 自動建立音效標記，並加上名稱或描述。"
msgid ""
"Create audio markers at the position on the track corresponding to the "
@@ -10654,10 +10704,10 @@ msgstr "高速快轉倍數"
msgid ""
"Playback starts this number of seconds before (or after, if negative) the "
"audio track position requested"
-msgstr "播放會在要求的音軌位置之前的秒數開始（使用負數則為該位置之後）"
+msgstr "播放會在要求的音軌位置之前的秒數開始 (使用負數則為該位置之後)"
msgid "Lead-in time (seconds)"
-msgstr "導入時間（秒）"
+msgstr "導入時間 (秒)"
msgid "The ratio of voice recorder elapsed time to true elapsed time"
msgstr "聲音錄製器耗費時間與實際耗費時間的比例"
@@ -10728,7 +10778,7 @@ msgid "Draw rubber-band helper line"
msgstr "繪製橡皮筋輔助線"
msgid "Smooth map graphics (antialiasing)"
-msgstr "平滑化地圖圖片（反鉅齒）"
+msgstr "平滑化地圖圖片 (反鉅齒)"
msgid "Smooth map graphics in wireframe mode (antialiasing)"
msgstr "平滑化線框模式中的地圖圖形 (反鋸齒)"
@@ -10743,7 +10793,7 @@ msgid "Draw direction hints for way segments."
msgstr "繪出路徑區段的方向提示。"
msgid "Draw arrows in the direction of oneways and other directed features."
-msgstr "繪出單行道和其他有方向的物件的方向箭頭。"
+msgstr "繪出單行道此方向單行道的箭頭和其他有方向的圖徽。"
msgid "Draw the order numbers of all segments within their way."
msgstr "繪出所有區段在其路徑中的順序編號。"
@@ -10836,13 +10886,13 @@ msgid "Draw a circle from HDOP value"
msgstr "從 HDOP 值繪製圓"
msgid "Velocity (red = slow, green = fast)"
-msgstr "速率（紅 = 慢，綠 = 快）"
+msgstr "速率 (紅 = 慢，綠 = 快)"
msgid "Direction (red = west, yellow = north, green = east, blue = south)"
msgstr "方向 (紅 = 西，黃 = 北，綠 = 東，藍 = 南)"
msgid "Dilution of Position (red = high, green = low, if available)"
-msgstr "位置的準確誤差（紅 = 高，綠 = 低，如果可用的話）"
+msgstr "位置的準確誤差 (紅 = 高，綠 = 低，如果可用的話)"
msgid "Track date"
msgstr "軌跡時間"
@@ -10851,7 +10901,7 @@ msgid "Heat Map (dark = few, bright = many)"
msgstr "熱力圖 (暗=少，亮=多)"
msgid "Single Color (can be customized for named layers)"
-msgstr "單一顏色（可以為已命名的圖層自訂）"
+msgstr "單一顏色 (可以為已命名的圖層自訂)"
msgid "Car"
msgstr "汽車"
@@ -10872,7 +10922,7 @@ msgstr ""
msgctxt "Heat map"
msgid "Traffic Lights"
-msgstr ""
+msgstr "交通號誌"
msgctxt "Heat map"
msgid "Inferno"
@@ -10884,11 +10934,11 @@ msgstr ""
msgctxt "Heat map"
msgid "Wood"
-msgstr ""
+msgstr "樹林"
msgctxt "Heat map"
msgid "Heat"
-msgstr ""
+msgstr "熱力"
msgid "Use points instead of lines for heat map"
msgstr "熱力圖中使用點代替線段"
@@ -10897,7 +10947,7 @@ msgid "Create markers when reading GPX"
msgstr "讀取 GPX 時建立標記"
msgid "Fast drawing (looks uglier)"
-msgstr "快速繪製（看起來較醜）"
+msgstr "快速繪製 (看起來較醜)"
msgid "Dynamic color range based on data limits"
msgstr "以資料限制為基礎的動態顏色範圍"
@@ -10906,7 +10956,7 @@ msgid "Smooth GPX graphics (antialiasing)"
msgstr "平滑化 GPX 圖形 (反鋸齒)"
msgid "Draw with Opacity (alpha blending) "
-msgstr "不透明度繪製程度（Alpha 混合） "
+msgstr "不透明度繪製程度 (Alpha 混合) "
msgid ""
"Automatically make a marker layer from any waypoints when opening a GPX "
@@ -10919,17 +10969,17 @@ msgstr "在原始 GPS 點之間繪出線條"
msgid ""
"Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
"draw all lines."
-msgstr "繪出本地端檔案線條的最大長度（公尺）。設為「-1」則繪出所有的線條。"
+msgstr "繪出本地端檔案線條的最大長度 (公尺) 。設為「-1」則繪出所有的線條。"
msgid "Maximum length for local files (meters)"
-msgstr "本地端檔案最大長度（公尺）"
+msgstr "本地端檔案最大長度 (公尺)"
msgid ""
"Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
-msgstr "繪出線條的最大長度（公尺）。設為「-1」則繪出所有的線條。"
+msgstr "繪出線條的最大長度 (公尺) 。設為「-1」則繪出所有的線條。"
msgid "Maximum length (meters)"
-msgstr "最大長度（公尺）"
+msgstr "最大長度 (公尺)"
msgid ""
"Force drawing of lines if the imported data contain no line information."
@@ -10948,7 +10998,7 @@ msgid ""
msgstr "如果沒有距離最後一個至少這個距離就不要繪出箭頭。"
msgid "Minimum distance (pixels)"
-msgstr "最小距離（像素）"
+msgstr "最小距離 (像素)"
msgid "Draw a circle from HDOP value."
msgstr "從 HDOP 值繪製圓。"
@@ -10985,7 +11035,7 @@ msgstr ""
msgid ""
"Colors points and track segments by dilution of position (HDOP). Your "
"capture device needs to log that information."
-msgstr "為地點精度 (HDOP) 的點和軌跡區段上色。您的捕捉裝置需要能記錄這項資訊。"
+msgstr "為地點精度 (HDOP) 的點和軌跡區段上色。你的捕捉裝置需要能記錄這項資訊。"
msgid "Colors points and track segments by its timestamp."
msgstr ""
@@ -11013,7 +11063,7 @@ msgid "Adjust the gain of overlay blending."
msgstr ""
msgid "Draw all GPX traces that exceed this threshold."
-msgstr "繪製超過此閾值的所有 GPX 軌跡。"
+msgstr "繪製超過此門檻值的所有 GPX 軌跡。"
msgid ""
"Render engine uses points with simulated position error instead of lines. "
@@ -11047,7 +11097,7 @@ msgid "Show localized name in selection lists"
msgstr "在選擇清單中顯示本地化的名稱"
msgid "Modeless working (Potlatch style)"
-msgstr "無模式運作（potlath 式）"
+msgstr "無模式運作 (potlath 式)"
msgid "Dynamic buttons in side menus"
msgstr "側邊選單中動態按鈕"
@@ -11068,14 +11118,14 @@ msgid "Show localized name in selection lists, if available"
msgstr "如果可以，在選擇清單中顯示本地化的名稱"
msgid "Do not require to switch modes (potlatch style workflow)"
-msgstr "不需要切換模式（potlath 式工作流程）"
+msgstr "不需要切換模式 (potlath 式工作流程)"
msgid ""
"Display buttons in right side menus only when mouse is inside the element"
msgstr "在右邊的側邊選單中的按鈕只有在滑鼠進入元件範圍內時顯示"
msgid "ISO 8601"
-msgstr ""
+msgstr "ISO 8601"
msgid ""
"Format dates according to {0}. Today''s date will be displayed as {1} "
@@ -11109,13 +11159,13 @@ msgid "Language"
msgstr "語言"
msgid "Default (Auto determined)"
-msgstr "預設值（自動決定）"
+msgstr "預設值 (自動決定)"
msgid "Add Imagery URL"
msgstr "加入圖片 URL"
msgid "1. Enter URL"
-msgstr ""
+msgstr "1. 輸入 URL 網址"
msgid ""
"{0} is replaced by tile zoom level, also supported:<br>offsets to the zoom "
@@ -11142,13 +11192,13 @@ msgid ""
msgstr ""
msgid "2. Enter maximum zoom (optional)"
-msgstr ""
+msgstr "2. 輸入最大縮放 (可選)"
msgid "3. Verify generated TMS URL"
-msgstr ""
+msgstr "3. 查驗建立的 TMS URL 網址"
msgid "4. Enter name for this layer"
-msgstr ""
+msgstr "4. 輸入圖層的名稱"
msgid "Store WMS endpoint only, select layers at usage"
msgstr ""
@@ -11157,22 +11207,22 @@ msgid "Show bounds"
msgstr ""
msgid "1. Enter service URL"
-msgstr ""
+msgstr "1. 輸入服務的 URL 網址"
msgid "Get layers"
msgstr ""
msgid "2. Select layers"
-msgstr ""
+msgstr "2. 選取圖層"
msgid "3. Select image format"
-msgstr ""
+msgstr "3. 選取影像格式"
msgid "4. Verify generated WMS URL"
-msgstr ""
+msgstr "4. 查驗建立的 WMS URL 網址"
msgid "5. Enter name for this layer"
-msgstr ""
+msgstr "5. 輸入圖層的名稱"
msgid "Show Bounds"
msgstr "顯示邊界"
@@ -11181,28 +11231,19 @@ msgid "No bounding box was found for this layer."
msgstr "找不到這個圖層的綁定方塊。"
msgid "1. Enter getCapabilities URL"
-msgstr ""
+msgstr "1. 輸入 getCapabilities 的 URL 網址"
msgid "2. Enter name for this layer"
-msgstr ""
+msgstr "2. 輸入圖層的名稱"
msgid "{0} cache, total cache size: {1} bytes"
-msgstr ""
+msgstr "{0} 個快取，合計快取容量：{1} byte"
msgid "Cache name"
-msgstr ""
+msgstr "快取名稱"
msgid "Object Count"
-msgstr ""
-
-msgid "imagery fade"
-msgstr "淡化圖片"
-
-msgid "Fade Color: "
-msgstr "淡化顏色： "
-
-msgid "Fade amount: "
-msgstr "淡化值： "
+msgstr "物件數"
msgid "Soft"
msgstr "柔和"
@@ -11217,10 +11258,10 @@ msgid "Tile cache directory: "
msgstr "拼貼快取目錄： "
msgid "Maximum size of disk cache (per imagery) in MB: "
-msgstr ""
+msgstr "最大磁碟快取容量 (每個影像) MB： "
msgid "Tiles zoom offset:"
-msgstr ""
+msgstr "圖磚縮放偏移："
msgid "Imagery Preferences"
msgstr "圖片偏好設定"
@@ -11244,14 +11285,17 @@ msgid "Offset bookmarks"
msgstr "位移書籤"
msgid "Cache contents"
-msgstr ""
+msgstr "快取內容"
msgid "Imagery Background: Default"
-msgstr ""
+msgstr "影像背景：預設"
msgid "Available default entries:"
msgstr "可用的預設項目："
+msgid "New default entries can be added in the <a href=\"{0}\">Wiki</a>."
+msgstr ""
+
msgid "Selected entries:"
msgstr "選擇的項目："
@@ -11274,16 +11318,16 @@ msgid "Imagery URL"
msgstr "圖片 URL"
msgid "Menu Name (Default)"
-msgstr "選單名稱（預設值）"
+msgstr "選單名稱 (預設值)"
msgid "Imagery URL (Default)"
msgstr "圖片 URL (預設值)"
msgid "EULA license URL not available: {0}"
-msgstr "EULA 授權 URL 無法使用：{0}"
+msgstr "EULA 授權許可的 URL 網址無法使用：{0}"
msgid "Malformed URL for the EULA licence: {0}"
-msgstr "EULA 授權的 URL 格式錯誤：{0}"
+msgstr "EULA 授權許可的 URL 網址格式錯誤：{0}"
msgid "Layer"
msgstr "層級"
@@ -11320,13 +11364,13 @@ msgid ""
"so you can not use it. This message will not show again."
msgstr ""
"那個圖層不支援 JOSM 的任何投影法，\n"
-"因此您不能使用它。這個訊息不會再顯示。"
+"因此你不能使用它。這個訊息不會再顯示。"
msgid "Simultaneous connections:"
msgstr ""
msgid "Tile size:"
-msgstr ""
+msgstr "圖磚大小："
msgid "Auto save enabled"
msgstr "已啟用自動儲存"
@@ -11363,7 +11407,7 @@ msgid "Notification at each save"
msgstr "每次儲存時通知"
msgid "When saving, display a small notification"
-msgstr ""
+msgstr "儲存時，顯示小通知框"
msgid "File backup"
msgstr "檔案備份"
@@ -11407,10 +11451,10 @@ msgid ""
msgstr "<html>無法從這裡載入樣式來源清單：<br>「{0}」。<br><br>詳細資料 (未翻譯):<br>{1}</html>"
msgid "Warning: illegal format of entry in style list ''{0}''. Got ''{1}''"
-msgstr "警告：樣式清單「{0}」中項目的格式不正確。得到「{1}」。"
+msgstr "警告：樣式清單「{0}」中項目的格式不合規定。得到「{1}」。"
msgid "JOSM default (MapCSS)"
-msgstr ""
+msgstr "JOSM 預設 (MapCSS)"
msgid ""
"Internal style to be used as base for runtime switchable overlay styles"
@@ -11426,7 +11470,7 @@ msgid "Map Settings"
msgstr "地圖設定值"
msgid "Settings for the map projection and data interpretation."
-msgstr "地圖投影與資料轉譯設定值。"
+msgstr "地圖投影法與資料轉譯設定值。"
msgid "Could not read tagging preset source: {0}"
msgstr "無法讀取標籤預設組合來源：{0}"
@@ -11436,7 +11480,7 @@ msgid ""
"Do you want to keep it?"
msgstr ""
"無法讀取標籤預設組合來源：{0}\n"
-"您確定要保留它？"
+"你確定要保留它？"
msgid "Could not read tagging preset source {0}"
msgstr "無法讀取標籤預設組合來源 {0}"
@@ -11446,28 +11490,28 @@ msgid ""
"really want to use it?<br><br><table width=600>Error is: [{1}:{2}] "
"{3}</table></html>"
msgstr ""
-"<html>標籤預設組合來源 {0} 可以載入但是它包含錯誤。您是否確定要使用它？<br><br><table width=600>錯誤為： "
+"<html>標籤預設組合來源 {0} 可以載入但是它包含錯誤。你是否確定要使用它？<br><br><table width=600>錯誤為： "
"[{1}:{2}] {3}</table></html>"
msgid ""
"<html>Unable to parse tagging preset source: {0}. Do you really want to use "
"it?<br><br><table width=400>Error is: [{1}:{2}] {3}</table></html>"
msgstr ""
-"<html>無法分折標籤預設組合來源：{0}。您是否確定要使用它？<br><br><table width=400>錯誤為： [{1}:{2}] "
+"<html>無法分折標籤預設組合來源：{0}。你是否確定要使用它？<br><br><table width=400>錯誤為： [{1}:{2}] "
"{3}</table></html>"
msgid ""
"<html>Tagging preset source {0} can be loaded but it contains errors. Do you "
"really want to use it?<br><br><table width=600>Error is: {1}</table></html>"
msgstr ""
-"<html>標籤預設組合來源 {0} 可以載入但是它包含錯誤。您是否確定要使用它？<br><br><table "
+"<html>標籤預設組合來源 {0} 可以載入但是它包含錯誤。你是否確定要使用它？<br><br><table "
"width=600>錯誤為：{1}</table></html>"
msgid ""
"<html>Unable to parse tagging preset source: {0}. Do you really want to use "
"it?<br><br><table width=600>Error is: {1}</table></html>"
msgstr ""
-"<html>無法分折標籤預設組合來源：{0}。您是否確定要使用它？<br><br><table "
+"<html>無法分折標籤預設組合來源：{0}。你是否確定要使用它？<br><br><table "
"width=600>錯誤為：{1}</table></html>"
msgid "Sort presets menu alphabetically"
@@ -11506,10 +11550,10 @@ msgstr "從「{0}」載入預設組合來源"
msgid ""
"<html>Failed to load the list of preset sources "
"from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
-msgstr "<html>無法從下列載入預設組合來源清單<br>「{0}」.<br><br>詳細資料（未翻譯）：<br>{1}</html>"
+msgstr "<html>無法從下列載入預設組合來源清單<br>「{0}」.<br><br>詳細資料 (未翻譯) ：<br>{1}</html>"
msgid "Warning: illegal format of entry in preset list ''{0}''. Got ''{1}''"
-msgstr "警告：預設組合清單「{0}」的項目格式無效。得到「{1}」"
+msgstr "警告：預設組合清單「{0}」的項目格式不合規定。得到「{1}」"
msgid "Internal Preset"
msgstr "內部預設組合"
@@ -11660,7 +11704,7 @@ msgid ""
msgstr "請決定 JOSM 是否要在某段時間後自動更新使用中的外掛程式。"
msgid "By Code (EPSG)"
-msgstr ""
+msgstr "依代碼 (EPSG)"
msgid "Invalid projection configuration: {0}"
msgstr ""
@@ -11672,13 +11716,13 @@ msgid "Validate"
msgstr "檢驗"
msgid "Parameter information..."
-msgstr ""
+msgstr "參數資訊..."
msgid "Parameter information"
-msgstr ""
+msgstr "參數資訊"
msgid "Projection name"
-msgstr ""
+msgstr "投影法名稱"
msgid "Supported values:"
msgstr ""
@@ -11711,7 +11755,7 @@ msgid "NTv2 grid file"
msgstr ""
msgid "Built-in:"
-msgstr ""
+msgstr "內建："
msgid "Projection bounds (in degrees)"
msgstr ""
@@ -11720,7 +11764,7 @@ msgid "Sets the SRS=... parameter in the WMS request"
msgstr ""
msgid "Gauß-Krüger"
-msgstr ""
+msgstr "高斯克魯格"
msgid "GK Zone"
msgstr ""
@@ -11762,7 +11806,7 @@ msgid "LKS-92 (Latvia TM)"
msgstr "LKS-92 (拉脫維亞 TM)"
msgid "Rijksdriehoekscoördinaten (Netherlands)"
-msgstr ""
+msgstr "國家三角座標 (荷蘭)"
msgid "SWEREF99 13 30 / EPSG:3008 (Sweden)"
msgstr "SWEREF99 13 30 / EPSG:3008 (瑞典)"
@@ -11780,10 +11824,10 @@ msgid "System of measurement"
msgstr "測量的系統"
msgid "Map Projection"
-msgstr "地圖投影"
+msgstr "地圖投影法"
msgid "The projection {0} could not be activated. Using Mercator"
-msgstr "無法使用投影法 {0}。改用麥卡托投影"
+msgstr "無法使用投影法 {0}。改用麥卡托投影法"
msgid "PUWG 1992 (Poland)"
msgstr "PUWG 1992 (波蘭)"
@@ -11837,7 +11881,7 @@ msgid "South"
msgstr "南"
msgid "Hemisphere"
-msgstr "球面投影（Hemisphere）"
+msgstr "球面投影 (Hemisphere)"
msgid "Remote Control"
msgstr "遠端控制"
@@ -11866,13 +11910,13 @@ msgid "Enable remote control"
msgstr "啟用遠端控制"
msgid "Enable HTTPS support"
-msgstr ""
+msgstr "啟用 HTTPS 支援"
msgid "Install..."
-msgstr ""
+msgstr "安裝..."
msgid "Uninstall..."
-msgstr ""
+msgstr "反安裝..."
msgid "Install JOSM localhost certificate to system/browser root keystores"
msgstr ""
@@ -11921,7 +11965,7 @@ msgstr "<html>無法建立 URL「{0}」來驗證 OSM API 伺服器。<br>請檢
msgid ""
"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
"''{1}'' and your Internet connection and validate again.</html>"
-msgstr "<html>無法建立連線到 URL「{0}」。<br>請檢查「{1}」的拼字與您的網際網路連線後再驗證一次。</html>"
+msgstr "<html>無法建立連線到 URL「{0}」。<br>請檢查「{1}」的拼字與你的網際網路連線後再驗證一次。</html>"
msgid "Connection to API failed"
msgstr "連線至 API 失敗"
@@ -11931,7 +11975,7 @@ msgid ""
"at<br>''{1}''. The server responded with the return code {0} instead of "
"200.<br>Please check the spelling of ''{1}'' and validate again.</html>"
msgstr ""
-"<html>無法從這個 OSM API 伺服器取回變更組合的清單：<br>「{1}」。伺服器傳回代碼為 {0} 而非 "
+"<html>無法從這個 OSM API 伺服器取回變更集的清單：<br>「{1}」。伺服器傳回代碼為 {0} 而非 "
"200。<br>請檢查「{1}」的拼字後再驗證一次。</html>"
msgid ""
@@ -11946,14 +11990,14 @@ msgid "Authentication"
msgstr "驗證"
msgid "Configure your identity and how to authenticate at the OSM server"
-msgstr "設定您的身分識別與如何在 OSM 伺服器驗證"
+msgstr "設定你的身分識別與如何在 OSM 伺服器驗證"
msgid "Use Basic Authentication"
msgstr "使用基本驗證"
msgid ""
"Select to use HTTP basic authentication with your OSM username and password"
-msgstr "選擇以使用您的 OSM 使用者名稱和密碼進行 HTTP 驗證"
+msgstr "選擇以使用你的 OSM 使用者名稱和密碼進行 HTTP 驗證"
msgid "Use OAuth"
msgstr "使用 OAuth"
@@ -12007,11 +12051,11 @@ msgstr "儲存到偏好設定"
msgid ""
"You do not have an Access Token yet to access the OSM server using OAuth. "
"Please authorize first."
-msgstr "您還沒有能用 OAuth 存取 OSM 伺服器的存取記號。請先獲得授權。"
+msgstr "你還沒有能用 OAuth 存取 OSM 伺服器的存取記號。請先獲得授權。"
msgid ""
"You already have an Access Token to access the OSM server using OAuth."
-msgstr "您已經有能用 OAuth 存取 OSM 伺服器的存取記號。"
+msgstr "你已經有能用 OAuth 存取 OSM 伺服器的存取記號。"
msgid "Click to step through the OAuth authorization process"
msgstr "點選以進行 OAuth 授權程序"
@@ -12072,7 +12116,7 @@ msgstr "連接埠："
msgid ""
"Please enter a username and a password if your proxy requires authentication."
-msgstr "如果您的代理伺服器需要驗證，請輸入使用者名稱和密碼。"
+msgstr "如果你的代理伺服器需要驗證，請輸入使用者名稱和密碼。"
msgid "Password:"
msgstr "密碼："
@@ -12107,10 +12151,10 @@ msgid "Connection Settings for the OSM server."
msgstr "OSM 伺服器的連線設定值。"
msgid "Please enter your OSM user name"
-msgstr "請輸入您的 OSM 使用者名稱"
+msgstr "請輸入你的 OSM 使用者名稱"
msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr "使用者名稱不能為空白。請輸入您的 OSM 使用者名稱"
+msgstr "使用者名稱不能為空白。請輸入你的 OSM 使用者名稱"
msgid "Action"
msgstr "動作"
@@ -12282,10 +12326,10 @@ msgid "On upload"
msgstr "上傳時"
msgid "Tests"
-msgstr ""
+msgstr "測試"
msgid "Choose tests to enable"
-msgstr ""
+msgstr "選擇要啟用的測試"
msgid "multiple"
msgstr "多個"
@@ -12310,7 +12354,7 @@ msgid "Use preset ''{0}''"
msgstr "使用預設組合「{0}」"
msgid "Elements of type {0} are supported."
-msgstr "類型 {0} 的元件已支援。"
+msgstr "已支援 {0} 類型的元件。"
msgid "This preset also sets: {0}"
msgstr ""
@@ -12322,7 +12366,7 @@ msgid "Apply Preset"
msgstr "套用預設組合"
msgid "New relation"
-msgstr "新關係"
+msgstr "新關聯"
msgid ""
"The preset <i>{0}</i> cannot be applied since nothing has been selected!"
@@ -12346,7 +12390,7 @@ msgid "Change Tags"
msgstr ""
msgid "Add or remove toolbar button"
-msgstr ""
+msgstr "加入或移除工具列按鈕"
msgid "Unknown type: {0}"
msgstr "不明的類型：{0}"
@@ -12364,10 +12408,10 @@ msgid "Roles cannot appear more than once"
msgstr ""
msgid "Preset role element without parent"
-msgstr "沒有父項的預設組合角色元素"
+msgstr "預設角色元件沒有上層"
msgid "Preset sub element without parent"
-msgstr "沒有父項的子元素"
+msgstr "預設次級元件沒有上層"
msgid "Error parsing {0}: "
msgstr "分析 {0} 時發生錯誤： "
@@ -12397,10 +12441,10 @@ msgid "Search in tags"
msgstr "搜尋標籤"
msgid "Add toolbar button"
-msgstr ""
+msgstr "加入工具列按鈕"
msgid "{0}:"
-msgstr ""
+msgstr "{0}："
msgid ""
"Warning in tagging preset \"{0}-{1}\": Ignoring ''{2}'' attribute as ''{3}'' "
@@ -12436,7 +12480,7 @@ msgid "This corresponds to the key ''{0}''"
msgstr ""
msgid "More information about this feature"
-msgstr "更多關於這個功能的資訊"
+msgstr "更多關於這個圖徽的資訊"
msgid "Optional Attributes:"
msgstr "額外屬性："
@@ -12444,6 +12488,9 @@ msgstr "額外屬性："
msgid "Unknown requisite: {0}"
msgstr "不明的必需品：{0}"
+msgid "Unknown regexp value: {0}"
+msgstr ""
+
msgid "Illegal member expression: {0}"
msgstr ""
@@ -12480,7 +12527,7 @@ msgid "Some of the key modifier listeners forgot to remove themselves: {0}"
msgstr ""
msgid "All files (*.*)"
-msgstr ""
+msgstr "所有檔案 (*.*)"
msgid "Received error page:"
msgstr ""
@@ -12500,12 +12547,12 @@ msgstr "最大經度"
msgid ""
"URL from www.openstreetmap.org (you can paste a download URL here to specify "
"a bounding box)"
-msgstr "www.openstreetmap.org 的 URL (您可以在這裡貼上下載 URL 指定綁定方塊)"
+msgstr "www.openstreetmap.org 的 URL (你可以在這裡貼上下載 URL 指定綁定方塊)"
msgid ""
"The current value is not a valid changeset ID. Please enter an integer value "
"> 0"
-msgstr "目前的數值不是有效的變更組合 ID。請輸入大於 0 的整數值"
+msgstr "目前的數值不是有效的變更集 ID。請輸入大於 0 的整數值"
msgid "Add a new source to the list."
msgstr "將新的來源加入清單。"
@@ -12548,34 +12595,34 @@ msgid "unset: do not set the property ''{0}'' on the selected objects"
msgstr ""
msgid "Cut"
-msgstr ""
+msgstr "剪下"
msgid "Right click = copy to clipboard"
-msgstr ""
+msgstr "點擊右鍵 = 複製到剪貼簿"
msgid "Missing mandatory attribute ''{0}''."
msgstr "缺少必要的屬性「{0}」"
msgid ""
"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
-msgstr "類型 long 的必要屬性「{0}」有不合格的數值。得到「{1}」。"
+msgstr "類型 long 的必要屬性「{0}」有不合規定的數值。得到「{1}」。"
msgid ""
"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
"''{1}''."
-msgstr "類型 long (>=0)的必要屬性「{0}」有不合格的數值。得到「{1}」。"
+msgstr "類型 long (>=0)的必要屬性「{0}」有不合規定的數值。得到「{1}」。"
msgid "Illegal value for attribute ''{0}'' of type double. Got ''{1}''."
msgstr ""
msgid ""
"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
-msgstr "類型 boolean 的必要屬性「{0}」有不合格的數值。得到「{1}」。"
+msgstr "類型 boolean 的必要屬性「{0}」有不合規定的數值。得到「{1}」。"
msgid ""
"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
"''{1}''."
-msgstr "類型 OsmPrimitiveType 的必要屬性「{0}」有不合格的數值。得到「{1}」。"
+msgstr "類型 OsmPrimitiveType 的必要屬性「{0}」有不合規定的數值。得到「{1}」。"
msgid ""
"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
@@ -12592,10 +12639,10 @@ msgstr "有 {1} 個節點的路徑 {0} 有不完整的節點，因為在載入
msgid ""
"Relation with external id ''{0}'' refers to a missing primitive with "
"external id ''{1}''."
-msgstr "外部 id「{0}」的關係包含了缺少的外部 id「{1}」的原型。"
+msgstr "外部 id「{0}」的關聯包含了缺少的外部 id「{1}」的原型。"
msgid "Deleted member {0} is used by relation {1}"
-msgstr "刪除的成員 {0} 正由關係 {1} 使用"
+msgstr "刪除的成員 {0} 正由關聯 {1} 使用"
msgid "All Formats"
msgstr "所有的格式"
@@ -12607,7 +12654,7 @@ msgid "Contacting OSM Server..."
msgstr "正在連接 OSM 伺服器..."
msgid "Downloading notes"
-msgstr ""
+msgstr "正在下載註解"
msgid "Failed to open input stream for resource ''{0}''"
msgstr "開啟資源「{0}」的輸入串流失敗"
@@ -12618,10 +12665,10 @@ msgid ""
msgstr ""
msgid "The requested URL {0} was not found"
-msgstr ""
+msgstr "找不到需要的 URL 網址 {0}"
msgid "Failed to rename file {0} to {1}."
-msgstr ""
+msgstr "無法將檔案 {0} 改名為 {1}。"
msgid "Failed to load {0}, use cached file and retry next time: {1}"
msgstr "無法載入 {0}，使用快取的檔案並在下次重新嘗試：{1}"
@@ -12645,24 +12692,24 @@ msgstr "解析伺服器回覆的日期「{0}」。"
msgid ""
"Unexpected format of error header for conflict in changeset update. Got "
"''{0}''"
-msgstr "在變更組合中衝突的錯誤標頭有未預期的的格式。卻收到「{0}」"
+msgstr "在變更集中衝突的錯誤標頭有未預期的的格式。卻收到「{0}」"
msgid "Illegal longitude value for parameter ''{0}'', got {1}"
-msgstr "參數「{0}」有不合格的經度數值，得到「{1}」"
+msgstr "參數「{0}」有不合規定的經度數值，得到「{1}」"
msgid "Illegal latitude value for parameter ''{0}'', got {1}"
-msgstr "參數「{0}」有不合格的緯度數值，得到「{1}」"
+msgstr "參數「{0}」有不合規定的緯度數值，得到「{1}」"
msgid "Unexpected value for ''{0}'' in changeset query url, got {1}"
-msgstr "在變更組合查詢 url 中有未預期的數值「{0}」，得到 {1}"
+msgstr "在變更集查詢 url 中有未預期的數值「{0}」，得到 {1}"
msgid ""
"Cannot create a changeset query including both the query parameters ''uid'' "
"and ''display_name''"
-msgstr "不能同時使用查詢參數「uid」和「display_name」建立變更組合查詢"
+msgstr "不能同時使用查詢參數「uid」和「display_name」建立變更集查詢"
msgid "Unsupported parameter ''{0}'' in changeset query string"
-msgstr "在變更組合查詢字串中不支援的參數「{0}」"
+msgstr "在變更集查詢字串中不支援的參數「{0}」"
msgid "Unexpected format for port number in preference ''{0}''. Got ''{1}''."
msgstr ""
@@ -12671,7 +12718,7 @@ msgid "The proxy will not be used."
msgstr "不會使用代理伺服器。"
msgid "Illegal port number in preference ''{0}''. Got {1}."
-msgstr "在偏好設定「{0}」中有無效的連接埠號。得到「{1}」。"
+msgstr "在偏好設定「{0}」中有不合規定的連接埠號。得到「{1}」。"
msgid ""
"Unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no "
@@ -12721,7 +12768,7 @@ msgid "GeoJSON Files"
msgstr "GeoJSON 檔案"
msgid "Layer ''{0}'' not supported"
-msgstr ""
+msgstr "不支援 ''{0}'' 圖層"
msgid ""
"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
@@ -12806,21 +12853,20 @@ msgid "No image files found."
msgstr "找不到圖片檔案。"
msgid "get number of unread messages"
-msgstr ""
+msgstr "取得未讀訊息數量"
msgid "You have {0} unread message."
msgid_plural "You have {0} unread messages."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "你有 {0} 則未讀的訊息。"
msgid "Click here to see your inbox."
-msgstr ""
+msgstr "點這裡觀看收到來信。"
msgid "Message notifier"
-msgstr ""
+msgstr "訊息通知"
msgid "{0} not available (offline mode)"
-msgstr ""
+msgstr "{0} 無法使用 (離線模式)"
msgid "Fetching a package of nodes from ''{0}''"
msgstr "正在從「{0}」取回節點包"
@@ -12829,7 +12875,7 @@ msgid "Fetching a package of ways from ''{0}''"
msgstr "正在從「{0}」取回路徑包"
msgid "Fetching a package of relations from ''{0}''"
-msgstr "正在從「{0}」取回關係包"
+msgstr "正在從「{0}」取回關聯包"
msgid "Downloading {0} object from ''{1}''"
msgid_plural "Downloading {0} objects from ''{1}''"
@@ -12850,7 +12896,7 @@ msgid "Fetching way with id {0} from ''{1}''"
msgstr "從「{1}」合併 id {0} 的路徑"
msgid "Fetching relation with id {0} from ''{1}''"
-msgstr "從「{1}」合併 id {0} 的關係"
+msgstr "從「{1}」合併 id {0} 的關聯"
msgid "Server replied with response code 404 for id {0}. Skipping."
msgstr "伺服器對 id {0} 傳回回應代碼 404。正在略過它。"
@@ -12874,28 +12920,28 @@ msgid "Zero coordinates: {0}"
msgstr "零坐標：{0}"
msgid "NMEA import success:"
-msgstr ""
+msgstr "NMEA 匯入成功："
msgid "NMEA import failure!"
msgstr "NMEA 匯入失敗！"
msgid "Null pointer exception, possibly some missing tags."
-msgstr "空指標例外(Null pointer exception)，可能遺漏某些標籤。"
+msgstr "空指標異常 (Null pointer exception)，可能遺漏某些標籤。"
msgid "Note Files"
-msgstr ""
+msgstr "註解檔案"
msgid "OSM API"
-msgstr ""
+msgstr "OSM API"
msgid "JOSM website"
-msgstr ""
+msgstr "JOSM 網站"
msgid "Unable to access ''{0}'': {1} not available (offline mode)"
-msgstr ""
+msgstr "無法存取「{0}」：{1} 不存在 (離線模式)"
msgid "Unable to initialize OSM API."
-msgstr ""
+msgstr "無法啟動 OSM APL"
msgid "This version of JOSM is incompatible with the configured server."
msgstr "這個版本的 JOSM 與設定的伺服器。"
@@ -12916,25 +12962,25 @@ msgid ""
msgstr "已修改原型「{0}」的新版本有未預期的格式。得到「{1}」。"
msgid "Creating changeset..."
-msgstr "正在建立變更組合..."
+msgstr "正在建立變更集..."
msgid "Successfully opened changeset {0}"
-msgstr "成功的開放變更組合 {0}"
+msgstr "成功的開放變更集 {0}"
msgid "Changeset ID > 0 expected. Got {0}."
-msgstr "預期變更組合 ID > 0 。得到 {0}。"
+msgstr "預期變更集 ID > 0 。得到 {0}。"
msgid "Updating changeset..."
-msgstr "正在更新變更組合..."
+msgstr "正在更新變更集..."
msgid "Updating changeset {0}..."
-msgstr "正在更新變更組合 {0}..."
+msgstr "正在更新變更集 {0}..."
msgid "Closing changeset..."
-msgstr "正在關閉變更組合..."
+msgstr "正在關閉變更集..."
msgid "No changeset present for diff upload."
-msgstr "沒有需要進行差異上傳的變更組合。"
+msgstr "沒有需要進行差異上傳的變更集。"
msgid "Preparing upload request..."
msgstr "正在準備上傳要求..."
@@ -12952,19 +12998,19 @@ msgid "Starting retry {0} of {1}."
msgstr "開始重試 {1} 次中的第 {0} 次。"
msgid "Current changeset is null. Cannot upload data."
-msgstr "目前的變更組合為 null。不能上傳資料。"
+msgstr "目前的變更集為 null。不能上傳資料。"
msgid "ID of current changeset > 0 required. Current ID is {0}."
-msgstr "目前的變更組合 ID 必須大於 0。目前的 ID 是 {0}。"
+msgstr "目前的變更集 ID 必須大於 0。目前的 ID 是 {0}。"
msgid "Open changeset expected. Got closed changeset with id {0}."
-msgstr "需要開放的變更組合。卻找到 id {0} 的關閉變更組合。"
+msgstr "需要開放的變更集。卻找到 id {0} 的關閉變更集。"
msgid "Note upload failed"
-msgstr ""
+msgstr "註解上傳失敗"
msgid "Error parsing note response from server"
-msgstr ""
+msgstr "伺服器回傳註解分析錯誤"
msgid "(Code={0})"
msgstr "(代碼={0})"
@@ -12982,16 +13028,16 @@ msgid "Prolog of OsmChange document not written yet. Please write first."
msgstr ""
msgid "OsmChange File"
-msgstr ""
+msgstr "OsmChange 檔案"
msgid "File ''{0}'' does not exist."
msgstr "檔案「{0}」不存在"
msgid "No data found in file {0}."
-msgstr ""
+msgstr "檔案 {0} 裏找不到資料。"
msgid "Open OsmChange file"
-msgstr ""
+msgstr "開啟 OsmChange 檔案"
msgid "Unsupported version: {0}"
msgstr "不支援的版本：{0}"
@@ -13004,7 +13050,7 @@ msgstr ""
msgid ""
"Illegal document structure. Found node, way, or relation outside of "
"''create'', ''modify'', or ''delete''."
-msgstr "不合格的文件結構。發現節點、路徑或關係並非「create」、「modify」或「delete」。"
+msgstr "不合規定的文件結構。發現節點、路徑或關聯並非「create」、「modify」或「delete」。"
msgid ""
"Unsupported end element ''{0}'' in changeset content at position ({1},{2}). "
@@ -13012,16 +13058,16 @@ msgid ""
msgstr ""
msgid "Parsing changeset content ..."
-msgstr "正在分析變更組合內容 ..."
+msgstr "正在分析變更集內容 ..."
msgid "Illegal boolean value for attribute ''{0}''. Got ''{1}''."
-msgstr "屬性「{0}」有不合格的布林值。得到「{1}」。"
+msgstr "屬性「{0}」有不合規定的布林值。得到「{1}」。"
msgid "Illegal value for attribute ''{0}''. Got ''{1}''."
-msgstr "屬性「{0}」有不合格的數值。得到「{1}」。"
+msgstr "屬性「{0}」有不合規定的數值。得到「{1}」。"
msgid "Illegal numeric value for attribute ''{0}''. Got ''{1}''."
-msgstr "屬性「{0}」有不合格的數字值。得到「{1}」。"
+msgstr "屬性「{0}」有不合規定的數字值。得到「{1}」。"
msgid "Missing mandatory attribute ''{0}'' of XML element {1}."
msgstr "缺少 XML 元素「{0}」的必要屬性「{1}」。"
@@ -13030,7 +13076,7 @@ msgid "Undefined element ''{0}'' found in input stream. Aborting."
msgstr "在輸入串流中發現未定義的元素「{0}」。正在中止。"
msgid "Parsing list of changesets..."
-msgstr "正在分析變更組合清單..."
+msgstr "正在分析變更集清單..."
msgid "Failed to sign a HTTP connection with an OAuth Authentication header"
msgstr "無法以 OAuth 驗證標頭簽署 HTTP 連線"
@@ -13056,19 +13102,19 @@ msgid "Parsing OSM history data ..."
msgstr "正在分析 OSM 歷史紀錄資料 ..."
msgid "Invalid dataset"
-msgstr ""
+msgstr "不正確的資料組合"
msgid "No data found for layer ''{0}''."
-msgstr ""
+msgstr "沒找到「{0}」圖層的資料。"
msgid "No data found in file ''{0}''."
-msgstr ""
+msgstr "在「{0}」檔案中沒找到資料。"
msgid "Open OSM file"
msgstr "開啟 OSM 檔案"
msgid "Reading was canceled"
-msgstr ""
+msgstr "讀取已被取消"
msgid ""
"Missing mandatory attributes on element ''bounds''. Got "
@@ -13082,24 +13128,24 @@ msgid "Missing mandatory attribute ''{0}'' on <nd> of way {1}."
msgstr "路徑 {1} 的 <nd> 缺少必要的屬性「{0}」。"
msgid "Illegal value of attribute ''ref'' of element <nd>. Got {0}."
-msgstr "元素 <nd> 的屬性「ref」有不合格的數值。得到 {0}。"
+msgstr "元素 <nd> 的屬性「ref」有不合規定的數值。得到 {0}。"
msgid "Deleted relation {0} contains members"
-msgstr "刪除的關係 {0} 包含成員"
+msgstr "刪除的關聯 {0} 包含成員"
msgid "Missing attribute ''ref'' on member in relation {0}."
-msgstr "在關係 {0} 的成員缺少屬性「ref」。"
+msgstr "在關聯 {0} 的成員缺少屬性「ref」。"
msgid ""
"Illegal value for attribute ''ref'' on member in relation {0}. Got {1}"
-msgstr "在關係 {0} 的成員屬性「ref」有不合格的數值。得到 {1}"
+msgstr "在關聯 {0} 的成員屬性「ref」有不合規定的數值。得到 {1}"
msgid "Missing attribute ''type'' on member {0} in relation {1}."
-msgstr "在關係 {1} 的成員 {0} 缺少屬性「type」。"
+msgstr "在關聯 {1} 的成員 {0} 缺少屬性「type」。"
msgid ""
"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
-msgstr "在關係 {1} 的成員 {0} 屬性「type」有不合格的數值。得到 {2}。"
+msgstr "在關聯 {1} 的成員 {0} 屬性「type」有不合規定的數值。得到 {2}。"
msgid "Incomplete <member> specification with ref=0"
msgstr "不完整的 <member>> 規格，ref=0"
@@ -13111,12 +13157,12 @@ msgid "Undefined element ''{0}'' found in input stream. Skipping."
msgstr "在輸入串流中發現未定義的元素「{0}」。正在略過。"
msgid "Illegal object with ID=0."
-msgstr "不合法的物件，id=0"
+msgstr "id=0，不合規定的物件。"
msgid ""
"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
"{1}."
-msgstr "在 OSM 原型 ID {0} 的屬性「version」有不合格的數值。得到 {1}。"
+msgstr "在 OSM 原型 ID {0} 的屬性「version」有不合規定的數值。得到 {1}。"
msgid ""
"Normalizing value of attribute ''version'' of element {0} to {2}, API "
@@ -13132,16 +13178,16 @@ msgstr "在 OSM 原型 ID {0} 缺少屬性「version」。"
msgid ""
"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. "
"Resetting to 0."
-msgstr "在新物件 {1} 的屬性「changeset」有不合格的數值。得到 {0}。重設為 0。"
+msgstr "在新物件 {1} 的屬性「changeset」有不合規定的數值。得到 {0}。重設為 0。"
msgid "Illegal value for attribute ''changeset''. Got {0}."
-msgstr "屬性「changeset」有不合格的數值。得到「{0}」。"
+msgstr "屬性「changeset」有不合規定的數值。得到「{0}」。"
msgid "Missing required attribute ''{0}''."
msgstr "缺少必要的屬性「{0}」。"
msgid "Illegal long value for attribute ''{0}''. Got ''{1}''."
-msgstr "屬性「{0}」有不合格的 long 數值。得到「{1}」。"
+msgstr "屬性「{0}」有不合規定的 long 數值。得到「{1}」。"
msgid "Prepare OSM data..."
msgstr "準備 OSM 資料..."
@@ -13159,29 +13205,29 @@ msgid "Downloading referring ways ..."
msgstr "正在下載參照路徑 ..."
msgid "Downloading referring relations ..."
-msgstr "正在下載參照關係 ..."
+msgstr "正在下載參照關聯 ..."
msgid "Reading changesets..."
-msgstr "正在讀取變更組合..."
+msgstr "正在讀取變更集..."
msgid "Downloading changesets ..."
-msgstr "正在下載變更組合 ..."
+msgstr "正在下載變更集 ..."
msgid "Reading changeset {0} ..."
-msgstr "正在讀取變更組合 {0} ..."
+msgstr "正在讀取變更集 {0} ..."
msgid "Downloading changeset {0} ..."
-msgstr "正在下載變更組合 {0} ..."
+msgstr "正在下載變更集 {0} ..."
msgid "Downloading {0} changeset ..."
msgid_plural "Downloading {0} changesets ..."
-msgstr[0] "正在下載 {0} 個變更組合..."
+msgstr[0] "正在下載 {0} 個變更集..."
msgid "({0}/{1}) Downloading changeset {2} ..."
-msgstr "({0}/{1}) 正在下載變更組合 {2} ..."
+msgstr "({0}/{1}) 正在下載變更集 {2} ..."
msgid "Downloading content for changeset {0} ..."
-msgstr "正在下載變更組合 {0} 的內容 ..."
+msgstr "正在下載變更集 {0} 的內容 ..."
msgid "Downloading history..."
msgstr "正在下載歷史紀錄..."
@@ -13190,11 +13236,11 @@ msgid "Contacting Server..."
msgstr "正在連接伺服器..."
msgid "Downloading OSM notes..."
-msgstr ""
+msgstr "正在下載 OSM 註解..."
msgid ""
"Could not connect to the OSM server. Please check your internet connection."
-msgstr "無法連線到 osm 伺服器。請檢查您的網際網路連線。"
+msgstr "無法連線到 osm 伺服器。請檢查你的網際網路連線。"
msgid "Reading error text failed."
msgstr "讀取錯誤文字失敗。"
@@ -13206,7 +13252,7 @@ msgid "Missing attribute ''{0}'' on XML tag ''{1}''."
msgstr "XML 標籤「{1}」缺少了 屬性「{0}」。"
msgid "Illegal value for attribute ''{0}'' on XML tag ''{1}''. Got {2}."
-msgstr "XML 標籤「{1}」的屬性「{0}」有不合格的數值。得到 {2}。"
+msgstr "XML 標籤「{1}」的屬性「{0}」有不合規定的數值。得到 {2}。"
msgid "Reading user info ..."
msgstr "正在讀取使用者資訊 ..."
@@ -13221,7 +13267,7 @@ msgid "{0}% ({1}/{2}), {3} left. Uploading way ''{4}'' (id: {5})"
msgstr "{0}% ({1}/{2})，剩下 {3}。正在上傳路徑「{4}」 (id: {5})"
msgid "{0}% ({1}/{2}), {3} left. Uploading relation ''{4}'' (id: {5})"
-msgstr "{0}% ({1}/{2})，剩下 {3}。正在上傳關係「{4}」 (id: {5})"
+msgstr "{0}% ({1}/{2})，剩下 {3}。正在上傳關聯「{4}」 (id: {5})"
msgid "Starting to upload in one request ..."
msgstr "正在開始以一次要求上傳 ..."
@@ -13246,7 +13292,7 @@ msgid "Failed to evaluate {0}"
msgstr ""
msgid "Downloading data..."
-msgstr ""
+msgstr "正在下載資料..."
msgid "WMS Files (*.wms)"
msgstr "WMS 檔案 (*.wms)"
@@ -13255,7 +13301,7 @@ msgid "Unsupported WMS file version; found {0}, expected {1}"
msgstr "不支援的 WMS 檔案版本；發現 {0}，應為 {1}"
msgid "{0} bytes have been read"
-msgstr ""
+msgstr "已讀取 {0} byte"
msgid ""
"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
@@ -13274,31 +13320,31 @@ msgid "Assume"
msgstr "猜測"
msgid "Existing values"
-msgstr ""
+msgstr "目前數值"
msgid "<delete from {0} objects>"
-msgstr ""
+msgstr "<從 {0} 個物件刪除>"
msgid "Old values of"
-msgstr ""
+msgstr "舊數值於"
msgid "Add tags to selected objects"
msgstr "將標籤加入選取的物件"
msgid "Add selected tags"
-msgstr ""
+msgstr "加入選取的標籤"
msgid "Add all tags"
-msgstr ""
+msgstr "加入所有標籤"
msgid "Add checked tags to selected objects"
-msgstr ""
+msgstr "在選取的元件加入檢查過的標籤"
msgid "Shift+Enter: Add all tags to selected objects"
-msgstr ""
+msgstr "Shift-Enter：在選取的元件加入所有標籤"
msgid "Enable the checkbox to accept the value"
-msgstr ""
+msgstr "啟用勾選框來確認數值"
msgid "Accept all tags from {0} for this session"
msgstr ""
@@ -13328,10 +13374,10 @@ msgid "Read protocol version"
msgstr "讀取通訊協定版本"
msgid "Cannot start IPv4 remotecontrol server on port {0}: {1}"
-msgstr ""
+msgstr "無法在 port {0} 起動 IPv4 遠端控制伺服器：{1}"
msgid "Cannot start IPv6 remotecontrol server on port {0}: {1}"
-msgstr ""
+msgstr "無法在 port {0} 起動 IPv6 遠端控制伺服器：{1}"
msgid "RemoteControl::Accepting remote connections on {0}:{1}"
msgstr ""
@@ -13340,10 +13386,10 @@ msgid "RemoteControl::Server {0}:{1} stopped."
msgstr ""
msgid "Cannot start IPv4 remotecontrol https server on port {0}: {1}"
-msgstr ""
+msgstr "無法在 port {0} 起動 IPv4 遠端控制 https 伺服器：{1}"
msgid "Cannot start IPv6 remotecontrol https server on port {0}: {1}"
-msgstr ""
+msgstr "無法在 port {0} 起動 IPv6 遠端控制 https 伺服器：{1}"
msgid "RemoteControl::Accepting secure remote connections on {0}:{1}"
msgstr ""
@@ -13358,7 +13404,7 @@ msgid "Remote Control has been asked to create a new way."
msgstr ""
msgid "Invalid coordinates: {0}"
-msgstr ""
+msgstr "無效的座標：{0}"
msgid "There is no layer opened to add way"
msgstr ""
@@ -13398,7 +13444,7 @@ msgid "Remote Control has been asked to load the following data:"
msgstr ""
msgid "Loading data"
-msgstr ""
+msgstr "正在載入資料"
msgid ""
"Remote Control has been asked to load objects (specified by their id) from "
@@ -13409,7 +13455,7 @@ msgid "Remote Control has been asked to open a local file."
msgstr ""
msgid "Do you want to allow this?"
-msgstr "您是否要允許這個？"
+msgstr "你是否要允許這個？"
msgid "Confirm Remote Control action"
msgstr "確認遠端控制動作"
@@ -13426,7 +13472,7 @@ msgid "local file"
msgstr "本地檔案"
msgid "include"
-msgstr ""
+msgstr "包含"
msgid "Layer contains unsaved data - save to file."
msgstr "圖層包含未儲存的資料 - 儲存為檔案。"
@@ -13438,7 +13484,7 @@ msgid "Data:"
msgstr "資料："
msgid "Link to a OSM data file on your local disk."
-msgstr "連結到您本地磁碟的 OSM 資料檔案。"
+msgstr "連結到你本地磁碟的 OSM 資料檔案。"
msgid "Include OSM data in the .joz session file."
msgstr "在 .joz 作業階段檔案中包含 OSM 資料。"
@@ -13523,7 +13569,7 @@ msgid "missing mandatory attribute ''type'' for element ''layer''"
msgstr ""
msgid "Unable to load layer"
-msgstr ""
+msgstr "無法載入圖層"
msgid ""
"Cannot load layer of type ''{0}'' because no suitable importer was found."
@@ -13534,13 +13580,13 @@ msgid ""
msgstr ""
msgid "Error loading layer"
-msgstr ""
+msgstr "載入圖層時發生錯誤"
msgid "<html>Could not load layer {0} ''{1}''.<br>Error is:<br>{2}</html>"
msgstr ""
msgid "Skip layer and continue"
-msgstr ""
+msgstr "跳過圖層而繼續"
msgid "expected .jos file inside .joz archive"
msgstr "在 .joz 壓縮檔中應用 .jos 檔案"
@@ -13586,7 +13632,10 @@ msgid "replaced by new {0} plugin"
msgstr "以新的 {0} 外掛程式取代"
msgid "no longer required"
-msgstr ""
+msgstr "不再需要"
+
+msgid "Plugin information"
+msgstr "外掛程式資訊"
msgid "The following plugin is no longer necessary and has been deactivated:"
msgid_plural ""
@@ -13602,12 +13651,12 @@ msgstr ""
"ml>"
msgid "Plugin update"
-msgstr ""
+msgstr "插件更新"
msgid ""
"You updated your JOSM software.<br>To prevent problems the plugins should be "
"updated as well.<br><br>Update plugins now?"
-msgstr "您已經更新了 JOSM 軟體。<br>為了避免問題也應該更新外掛程式。<br><br>是否立即更新？"
+msgstr "你已經更新了 JOSM 軟體。<br>為了避免問題也應該更新外掛程式。<br><br>是否立即更新？"
msgid "Last plugin update more than {0} days ago."
msgstr "上次的外掛程式更新已是 {0} 天前。"
@@ -13653,23 +13702,21 @@ msgid_plural ""
msgstr[0] "找不到外掛程式 {0} 需要的 {1} 外掛程式。缺少的外掛程式為："
msgid "Download and restart"
-msgstr ""
+msgstr "下載後重啟"
msgid "Click to download missing plugin and restart JOSM"
msgid_plural "Click to download missing plugins and restart JOSM"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "點擊下載遺失的插件後重新啟動 JOSM"
msgid "Click to continue without this plugin"
msgid_plural "Click to continue without these plugins"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "點擊後不載入插件而繼續"
msgid ""
"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is "
"{2}.<br>You have to update JOSM in order to use this plugin.</html>"
msgstr ""
-"<html>外掛程式 {0} 需要 JOSM 版本 {1}。目前的 JOSM 版本為 {2}。<br>您必須更新 JOSM "
+"<html>外掛程式 {0} 需要 JOSM 版本 {1}。目前的 JOSM 版本為 {2}。<br>你必須更新 JOSM "
"才能使用這個外掛程式。</html>"
msgid "Could not load plugin {0}. Delete from preferences?"
@@ -13701,7 +13748,7 @@ msgid_plural "The plugins are not going to be loaded."
msgstr[0] "這個外掛程式將不會被載入。"
msgid "Determining plugins to load..."
-msgstr ""
+msgstr "正在偵測要載入的插件..."
msgid "Removing deprecated plugins..."
msgstr "正在移除廢棄的外掛程式..."
@@ -13725,10 +13772,10 @@ msgid "Plugin update failed"
msgstr "外掛程式更新失敗"
msgid "Failed to find plugin {0}"
-msgstr ""
+msgstr "無法找到插件 {0}"
msgid "Failed to download plugin information list"
-msgstr ""
+msgstr "無法下載插件資訊清單"
msgid "Disable plugin"
msgstr "停用外掛程式"
@@ -13743,7 +13790,7 @@ msgid "Click to keep the plugin ''{0}''"
msgstr "點選以保留外掛程式「{0}」"
msgid "Failed to delete outdated plugin ''{0}''."
-msgstr ""
+msgstr "無法刪除過期的插件 ''{0}''。"
msgid ""
"Failed to install already downloaded plugin ''{0}''. Skipping installation. "
@@ -13760,17 +13807,17 @@ msgid ""
msgstr ""
msgid "Update plugin"
-msgstr ""
+msgstr "更新插件"
msgid "Click to update the plugin ''{0}''"
-msgstr ""
+msgstr "點擊更新插件 ''{0}''"
msgid "Click to disable the plugin ''{0}''"
msgstr "點選以停用外掛程式「{0}」"
msgid ""
"An unexpected exception occurred that may have come from the ''{0}'' plugin."
-msgstr "發生未預期的例外，可能來自「{0}」外掛程式。"
+msgstr "發生未預期的異常，可能來自「{0}」外掛程式。"
msgid "According to the information within the plugin, the author is {0}."
msgstr "根據此外掛程式的資訊，作者是 {0}。"
@@ -13784,9 +13831,6 @@ msgid ""
"unload the plugin."
msgstr "該外掛程式已從組態中移除。請重新啟動 JOSM 以卸載外掛程式。"
-msgid "Plugin information"
-msgstr "外掛程式資訊"
-
msgid "no description available"
msgstr "沒有描述可用"
@@ -13796,7 +13840,7 @@ msgid ""
msgstr "不要再詢問並記住我的決定 (稍後可至 偏好設定->外掛程式 改變它)"
msgid "Invalid jar file ''{0}''"
-msgstr ""
+msgstr "無效的 JAR 檔案 ''{0}''"
msgid "The plugin file ''{0}'' does not include a Manifest."
msgstr "外掛程式檔案「{0}」沒有包含 Manifest。"
@@ -13805,13 +13849,13 @@ msgid "Invalid URL ''{0}'' in plugin {1}"
msgstr "外掛程式 {1} 有無效的 URL「{0}」"
msgid "Invalid plugin description ''{0}'' in plugin {1}"
-msgstr ""
+msgstr "插件 {1} 的說明 ''{0}'' 無效"
msgid "Invalid plugin main version ''{0}'' in plugin {1}"
-msgstr ""
+msgstr "插件 {1} 的主版本 ''{0}'' 無效"
msgid "Missing plugin main version in plugin {0}"
-msgstr ""
+msgstr "插件 {0} 的主版本不見了"
msgid "More info..."
msgstr "更多資訊..."
@@ -13823,7 +13867,7 @@ msgid "Failed to create plugin information from manifest for plugin ''{0}''"
msgstr "無法從外掛程式「{0}」的 manifest 建立外掛程式資訊"
msgid "Illegal entry in plugin list."
-msgstr "外掛程式清單中有無效的項目。"
+msgstr "外掛程式清單中有不合規定的項目。"
msgid "Reading local plugin information.."
msgstr "正在讀取本地端外掛程式資訊.."
@@ -13835,7 +13879,7 @@ msgid "Processing file ''{0}''"
msgstr "正在處理檔案「{0}」"
msgid "Failed to scan file ''{0}'' for plugin information. Skipping."
-msgstr ""
+msgstr "無法掃描檔案 ''{0}'' 的插件資訊，跳過。"
msgid "Processing plugin files..."
msgstr "正在處理外掛程式檔案..."
@@ -13847,16 +13891,16 @@ msgid "Downloading plugin list from ''{0}''"
msgstr "正從「{0}」下載外掛程式清單"
msgid "Unsuccessful HTTP request"
-msgstr ""
+msgstr "不成功的 HTTP 要求"
msgid "Plugin list download error"
-msgstr ""
+msgstr "下載插件清單時發生錯誤"
msgid "JOSM failed to download plugin list:"
-msgstr ""
+msgstr "JOSM 無法下載插件清單："
msgid "Details:"
-msgstr ""
+msgstr "詳細："
msgid ""
"Failed to create plugin directory ''{0}''. Cannot cache plugin list from "
@@ -13872,7 +13916,7 @@ msgstr "正在分析網站「{0}」的外掛程式清單"
msgid ""
"Failed to parse plugin list document from site ''{0}''. Skipping site. "
"Exception was: {1}"
-msgstr "無法解析網站「{0}」的外掛程式清單文件。正在略過網站。例外為：{1}"
+msgstr "無法解析網站「{0}」的外掛程式清單文件。正在略過網站。異常為：{1}"
msgid "Processing plugin list from site ''{0}''"
msgstr "正在處理網站「{0}」的外掛程式清單"
@@ -13897,7 +13941,7 @@ msgid ""
"configured.<br>Please open the Preferences Dialog and generate or enter an "
"Access Token.</html>"
msgstr ""
-"<html>無法驗證 OSM 伺服器「{0}」。<br>您正使用 OAuth 驗證但目前尚未設定<br>OAuth "
+"<html>無法驗證 OSM 伺服器「{0}」。<br>你正使用 OAuth 驗證但目前尚未設定<br>OAuth "
"存取記號。<br>請開啟偏好設定對話盒並產生或輸入存取記號。</html>"
msgid ""
@@ -14004,7 +14048,7 @@ msgid ""
"current<br>dataset violates a precondition.<br>The error message "
"is:<br>{0}</html>"
msgstr ""
-"<html>上傳至伺服器<strong>失敗</strong>，因為您目前的<br>資料組合違反了先決條件。<br>錯誤的訊息為：<br>{0}</htm"
+"<html>上傳至伺服器<strong>失敗</strong>，因為你目前的<br>資料組合違反了先決條件。<br>錯誤的訊息為：<br>{0}</htm"
"l>"
msgid ""
@@ -14113,7 +14157,7 @@ msgid ""
"The area you tried to download is too big or your request was too "
"large.<br>Either request a smaller area or use an export file provided by "
"the OSM community."
-msgstr "您嘗試下載的區域太大或是您的要求太大。<br>可以要求小一點的區域或是使用 OSM 社群提供的匯出檔案。"
+msgstr "你嘗試下載的區域太大或是你的要求太大。<br>可以要求小一點的區域或是使用 OSM 社群提供的匯出檔案。"
msgid ""
"The OSM server ''{0}'' does not know about an object<br>you tried to read, "
@@ -14121,7 +14165,7 @@ msgid ""
"server or you are using an invalid URL to access<br>it. Please carefully "
"check the server''s address ''{0}'' for typos."
msgstr ""
-"OSM 伺服器「{0}」不知道您嘗試讀取、<br>更新或刪除的物件。可能是各個物件不在<br>伺服器上或是您使用無效的 URL "
+"OSM 伺服器「{0}」不知道你嘗試讀取、<br>更新或刪除的物件。可能是各個物件不在<br>伺服器上或是你使用無效的 URL "
"存取<br>它。請小心檢查伺服器位址「{0}」以免打錯字。"
msgid ""
@@ -14136,28 +14180,28 @@ msgid ""
"<strong>Downloading failed</strong> if you tried to download this "
"object.<br><br>The error message is:<br>{0}</html>"
msgstr ""
-"<html>伺服器回報有物件已被刪除。<br>如果您嘗試更新或刪除這個物件則會<strong>上傳失敗</strong>。<br>如果您嘗試下載這個物件則"
+"<html>伺服器回報有物件已被刪除。<br>如果你嘗試更新或刪除這個物件則會<strong>上傳失敗</strong>。<br>如果你嘗試下載這個物件則"
"會<strong>下載失敗</strong>。<br><br>錯誤的訊息為：<br>{0}</html>"
msgid "latitude"
-msgstr ""
+msgstr "緯度"
msgid "URL does not contain valid {0}"
-msgstr ""
+msgstr "URL 網址少了有效的 {0}"
msgid "longitude"
-msgstr ""
+msgstr "經度"
msgid "zoom"
-msgstr ""
+msgstr "縮放"
msgid ""
"Unexpected response from HTTP server. Got {0} response without ''Location'' "
"header. Can''t redirect. Aborting."
-msgstr ""
+msgstr "HTTP 伺服器回應有異常，得到 {0} 回應沒有 \"Location\" 標頭，無法重導。放棄。"
msgid "Download redirected to ''{0}''"
-msgstr ""
+msgstr "下載重到至 ''{0}''"
msgid "Too many redirects to the download URL detected. Aborting."
msgstr ""
@@ -14196,38 +14240,38 @@ msgid ""
msgstr "無法開啟 URL。目前尚未設定平台。請先設定平台。"
msgid "Opening URL: {0}"
-msgstr ""
+msgstr "正在開啟 URL 網址：{0}"
msgid "URL does not contain {0}/{1}/{2}"
-msgstr ""
+msgstr "URL 網址缺少 {0}/{1}/{2}"
msgid "reserved"
msgstr ""
msgid "Outdated Java version"
-msgstr ""
+msgstr "過期的 JAVA 版本"
msgid "Update Java"
-msgstr ""
+msgstr "更新 JAVA"
msgid "You are running version {0} of Java."
-msgstr ""
+msgstr "你使用的 JAVA 版本是 {0}"
msgid "April 2015"
-msgstr ""
+msgstr "2015 四月"
msgid ""
"This version is no longer supported by {0} since {1} and is not recommended "
"for use."
-msgstr ""
+msgstr "此版本從 {1} 後已不再由 {0} 支援，不建議繼續使用。"
msgid ""
"JOSM will soon stop working with this version; we highly recommend you to "
"update to Java {0}."
-msgstr ""
+msgstr "JOSM 之後會不能在這版本下執行，我們非常建議你更新到 JAVA {0}。"
msgid "Would you like to update now ?"
-msgstr ""
+msgstr "你想要現在就更新嗎？"
msgid ""
"A previous version of JOSM has installed a custom certificate in order to "
@@ -14288,10 +14332,10 @@ msgid "Do you want to paste these tags?"
msgstr "你要貼上這些標籤？"
msgid "Clear buffer"
-msgstr ""
+msgstr "清除緩衝區"
msgid "Ignore warnings"
-msgstr ""
+msgstr "忽略警告"
msgid ""
"<html><p> Sorry, it is impossible to paste tags from buffer. It does not "
@@ -14305,21 +14349,20 @@ msgid "Unable to create directory {0}"
msgstr ""
msgid "ms"
-msgstr ""
+msgstr "毫秒"
msgid "s"
-msgstr ""
+msgstr "秒"
msgid "min"
-msgstr ""
+msgstr "分"
msgid "h"
-msgstr ""
+msgstr "小時"
msgid "day"
msgid_plural "days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "天"
msgid ""
"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
@@ -14334,7 +14377,7 @@ msgstr "偏好設定的設定鍵「{0}」沒有提供「{1}」的整數值。得
msgid ""
"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
"{2}. Cannot restore window geometry from preferences."
-msgstr "無法解析偏好設定的設定鍵「{0}」的欄位「{1}」。例外為：「{2}」。不能從偏好設定中回復視窗位置大小。"
+msgstr "無法解析偏好設定的設定鍵「{0}」的欄位「{1}」。異常為：「{2}」。不能從偏好設定中回復視窗位置大小。"
msgid ""
"Preference with key ''{0}'' does not exist. Cannot restore window geometry "
@@ -14348,7 +14391,7 @@ msgid "Failed to load XML schema."
msgstr "無法載入 XML schema。"
msgid "You have encountered a bug in JOSM"
-msgstr "您遇到了 JOSM 的程式錯誤"
+msgstr "你遇到了 JOSM 的程式錯誤"
msgid ""
"An unexpected exception occurred.\n"
@@ -14357,16 +14400,16 @@ msgid ""
msgstr ""
msgid "Debug information"
-msgstr ""
+msgstr "除錯資訊"
msgid "Manually report at:"
-msgstr ""
+msgstr "手動報告到："
msgid "Is JOSM up to date?"
-msgstr ""
+msgstr "JOSM 是最新板嗎？"
msgid "Send bug report"
-msgstr ""
+msgstr "傳送臭蟲報告"
msgid ""
"If you are running the latest version of JOSM and the plugins, please file a "
@@ -14386,14 +14429,14 @@ msgid "Suppress further error dialogs for this session."
msgstr ""
msgid "Ignore this error."
-msgstr ""
+msgstr "忽略這個錯誤。"
msgid ""
"Opening the bug report failed. Please report manually using this website:"
msgstr ""
msgid "Include the system status report."
-msgstr ""
+msgstr "附帶系統狀態報告。"
msgid "Include information about the data you were working on."
msgstr ""
@@ -14402,19 +14445,19 @@ msgid "Include all stack traces."
msgstr ""
msgid "Your current version of JOSM is {0}"
-msgstr ""
+msgstr "你目前使用的 JOSM 版本是 {0}"
msgid "JOSM is searching for updates..."
-msgstr ""
+msgstr "JOSM 正在搜尋更新..."
msgid "An error occured while checking if your JOSM instance is up to date."
msgstr ""
msgid "JOSM is up to date."
-msgstr ""
+msgstr "JOSM 已是最新版。"
msgid "JOSM is out of date. The current version is {0}. Try updating JOSM."
-msgstr ""
+msgstr "JOSM 是舊版，最新版是 {0}，請記得更新。"
msgid ""
"Before you file a bug report make sure you have updated to the latest "
@@ -14422,7 +14465,7 @@ msgid ""
msgstr ""
msgid "Update JOSM"
-msgstr ""
+msgstr "更新 JOSM"
msgid ""
"Error in search expression on position {0} - right side of or(|) expression "
@@ -14462,18 +14505,18 @@ msgstr ""
msgid ""
"You requested too many nodes (limit is 50,000). Either request a smaller "
"area, or use planet.osm"
-msgstr "您要求太多節點（限制為 50,000）。請使用更小的區域，或改用 planet.osm"
+msgstr "你要求太多節點 (限制為 50,000) 。請使用更小的區域，或改用 planet.osm"
msgid "Database offline for maintenance"
msgstr "資料庫離線維護中"
msgid "You have downloaded too much data. Please try again later."
-msgstr "您已經下載太多資料。請稍後再試一次。"
+msgstr "你已經下載太多資料。請稍後再試一次。"
msgid ""
"The maximum bbox size is 0.25, and your request was too large. Either "
"request a smaller area, or use planet.osm"
-msgstr "最大的 bbox 大小為 0.25，而您的要求太大了。請使用更小的區域，或改用 planet.osm"
+msgstr "最大的 bbox 大小為 0.25，而你的要求太大了。請使用更小的區域，或改用 planet.osm"
msgid "JOSM-Trac login at josm.openstreetmap.de"
msgstr "JOSM-Trac 登入於 josm.openstreetmap.de"
@@ -14485,46 +14528,90 @@ msgid "Audio Device Unavailable"
msgstr "音效裝置無法使用"
msgid "You must make your edits public to upload new data"
-msgstr "您必須將自己的編輯設為公開才能上傳新的資料"
+msgstr "你必須將自己的編輯設為公開才能上傳新的資料"
msgid "town"
msgstr "鄉鎮"
msgctxt "landuse"
msgid "forest"
-msgstr "森林"
+msgstr "管理林"
msgctxt "landuse"
msgid "meadow"
-msgstr ""
+msgstr "野草地"
msgctxt "landuse"
msgid "farmland"
msgstr "農田"
msgctxt "landuse"
+msgid "farmyard"
+msgstr "農家庭院"
+
+msgctxt "landuse"
+msgid "cemetery"
+msgstr "公墓"
+
+msgctxt "landuse"
msgid "residential"
msgstr "住宅區"
msgctxt "landuse"
msgid "greenfield"
-msgstr ""
+msgstr "空地"
msgctxt "landuse"
msgid "village_green"
-msgstr ""
+msgstr "社區綠地"
+
+msgctxt "landuse"
+msgid "quarry"
+msgstr "露天礦場"
+
+msgctxt "landuse"
+msgid "allotments"
+msgstr "社區農園"
+
+msgctxt "landuse"
+msgid "vineyard"
+msgstr "葡萄園"
msgctxt "natural"
msgid "scrub"
-msgstr ""
+msgstr "灌木"
msgctxt "natural"
msgid "wood"
-msgstr ""
+msgstr "自然林"
msgctxt "natural"
msgid "grassland"
-msgstr ""
+msgstr "雜草地"
+
+msgctxt "natural"
+msgid "wetland"
+msgstr "濕地"
+
+msgctxt "natural"
+msgid "heath"
+msgstr "石楠荒地"
+
+msgctxt "amenity"
+msgid "fire_station"
+msgstr "消防隊"
+
+msgctxt "leisure"
+msgid "park"
+msgstr "公園"
+
+msgctxt "leisure"
+msgid "track"
+msgstr "田徑場"
+
+msgctxt "building"
+msgid "industrial"
+msgstr "廠房"
msgctxt "Relation type"
msgid "associatedStreet"
@@ -14536,11 +14623,11 @@ msgstr "邊界"
msgctxt "Relation type"
msgid "bridge"
-msgstr ""
+msgstr "橋樑"
msgctxt "Relation type"
msgid "destination_sign"
-msgstr ""
+msgstr "目的地標示"
msgctxt "Relation type"
msgid "enforcement"
@@ -14576,11 +14663,11 @@ msgstr "場所"
msgctxt "Relation type"
msgid "street"
-msgstr ""
+msgstr "街道"
msgctxt "Relation type"
msgid "tunnel"
-msgstr ""
+msgstr "隧道"
msgctxt "Relation type"
msgid "waterway"
@@ -14588,7 +14675,7 @@ msgstr "水路"
msgctxt "Place type"
msgid "city"
-msgstr ""
+msgstr "城市"
msgctxt "Place type"
msgid "locality"
@@ -14596,35 +14683,35 @@ msgstr "所在地"
msgctxt "Place type"
msgid "village"
-msgstr ""
+msgstr "村莊"
msgctxt "Place type"
msgid "town"
-msgstr ""
+msgstr "城鎮"
msgctxt "Place type"
msgid "borough"
-msgstr ""
+msgstr "自治市"
msgctxt "Place type"
msgid "municipality"
-msgstr ""
+msgstr "直轄市"
msgctxt "Place type"
msgid "island"
-msgstr ""
+msgstr "島嶼"
msgctxt "Place type"
msgid "county"
-msgstr ""
+msgstr "郡縣"
msgctxt "Place type"
msgid "hamlet"
-msgstr ""
+msgstr "村鎮"
msgctxt "Place type"
msgid "suburb"
-msgstr ""
+msgstr "市郊"
msgid "All Files"
msgstr "所有檔案"
@@ -14768,46 +14855,46 @@ msgid "Mapbox Satellite"
msgstr "Mapbox 衛星圖"
msgid "OpenCycleMap"
-msgstr ""
+msgstr "OpenCycleMap"
msgid "Thunderforest Landscape"
-msgstr ""
+msgstr "Thunderforest Landscape"
msgid "OpenSeaMap"
-msgstr ""
+msgstr "OpenSeaMap"
msgid "OpenStreetMap Carto (Standard)"
-msgstr ""
+msgstr "OpenStreetMap (標準圖資)"
msgid "OpenStreetMap (Standard Black & White)"
-msgstr ""
+msgstr "OpenStreetMap (標準黑白圖資)"
msgid "OpenStreetMap (Mapnik, no labels)"
-msgstr ""
+msgstr "OpenStreetMap (Mapnik，不含標示)"
msgid "OpenStreetMap (French Style)"
-msgstr ""
+msgstr "OpenStreetMap (法國樣式)"
msgid "OpenStreetMap (German Style)"
-msgstr ""
+msgstr "OpenStreetMap (德國樣式)"
msgid "OpenStreetMap GPS Traces"
-msgstr ""
+msgstr "OpenStreetMap GPS 軌跡"
msgid "Public Transport (ÖPNV)"
msgstr "大眾運輸 (ÖPNV)"
msgid "Hike & Bike"
-msgstr ""
+msgstr "登山健行與自行車"
msgid "skobbler"
msgstr "skobbler"
msgid "Stamen Terrain"
-msgstr ""
+msgstr "Stamen 地形圖"
msgid "Cambodia, Laos, Thailand, Vietnam, Myanmar bilingual"
-msgstr ""
+msgstr "柬埔寨、寮國、泰國、越南、緬甸雙語"
msgid "OpenPT Map (overlay)"
msgstr "OpenPT Map (重疊)"
@@ -14828,46 +14915,46 @@ msgid "QA No Address"
msgstr ""
msgid "Waymarked Trails: Hiking"
-msgstr ""
+msgstr "標記的路徑路線：登山健行"
msgid "Waymarked Trails: Cycling"
-msgstr ""
+msgstr "標記的路徑路線：自行車"
msgid "Waymarked Trails: MTB"
-msgstr ""
+msgstr "標記的路徑路線：越野自行車"
msgid "Waymarked Trails: Skating"
-msgstr ""
+msgstr "標記的路徑路線：溜冰"
msgid "Waymarked Trails: Horse Riding"
-msgstr ""
+msgstr "標記的路徑路線：騎馬"
msgid "Waymarked Trails: Winter Sports"
-msgstr ""
+msgstr "標記的路徑路線：冬季運動"
msgid "OSM Inspector: Geometry"
-msgstr ""
+msgstr "OSM 檢驗工具：幾何"
msgid "OSM Inspector: Tagging"
-msgstr ""
+msgstr "OSM 檢驗工具：標籤"
msgid "OSM Inspector: Places"
-msgstr ""
+msgstr "OSM 檢驗工具：地名"
msgid "OSM Inspector: Highways"
-msgstr ""
+msgstr "OSM 檢驗工具：道路"
msgid "OSM Inspector: Area"
-msgstr ""
+msgstr "OSM 檢驗工具：區域"
msgid "OSM Inspector: Routing"
-msgstr ""
+msgstr "OSM 檢驗工具：路線"
msgid "OSM Inspector: Addresses"
-msgstr ""
+msgstr "OSM 檢驗工具：地址"
msgid "OSM Inspector: Coastline (EU)"
-msgstr ""
+msgstr "OSM 檢驗工具：海岸線 (EU)"
msgid "imagico.de OSM images for mapping: Prokletije Mountains"
msgstr ""
@@ -14881,23 +14968,31 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Elephant Island/Clarence Island"
msgstr ""
-msgid "IGN Argentina (TMS)"
+msgid "imagico.de OSM images for mapping: Enderby Land and Kemp Coast"
msgstr ""
-msgid "IGN Argentina (WMS)"
+msgid ""
+"Sentinel-2 images channels 234 (true color), Sentinel-2 images of Enderby "
+"Land and Kemp Coast early 2017"
msgstr ""
+msgid "IGN Argentina (TMS)"
+msgstr "阿根廷 IGN (TMS)"
+
+msgid "IGN Argentina (WMS)"
+msgstr "阿根廷 IGN (WMS)"
+
msgid "AGRI black-and-white 2.5m"
msgstr ""
msgid "LPI NSW Base Map"
-msgstr ""
+msgstr "澳洲新南威爾斯州土地與物業資訊局 - 基本圖資"
msgid "LPI NSW Topographic Map"
-msgstr ""
+msgstr "澳洲新南威爾斯州土地與物業資訊局 - 地形圖"
msgid "LPI NSW Imagery"
-msgstr ""
+msgstr "澳洲新南威爾斯州土地與物業資訊局 - 影像"
msgid "LPI NSW Administrative Boundaries Suburb"
msgstr ""
@@ -14924,13 +15019,13 @@ msgid "imagico.de OSM images for mapping: Heard Island coast"
msgstr ""
msgid "basemap.at"
-msgstr ""
+msgstr "奧地利 basemap.at"
msgid "basemap.at Orthofoto"
-msgstr ""
+msgstr "奧地利 basemap.at 正射影像"
msgid "Geoimage.at MaxRes"
-msgstr ""
+msgstr "奧地利 Geoimage.at MaxRes"
msgid "Graz: Basiskarte (base map)"
msgstr ""
@@ -14945,13 +15040,13 @@ msgid "Tiris: contour lines"
msgstr ""
msgid "Vienna: Mehrzweckkarte (general purpose)"
-msgstr ""
+msgstr "越南：一般使用"
msgid "Vienna: Beschriftungen (annotations)"
-msgstr ""
+msgstr "越南：註記"
msgid "Vienna: Orthofoto (aerial image)"
-msgstr ""
+msgstr "越南：空照影像"
msgid "VoGIS: Echtfarbenbild 2012 (12cm)"
msgstr ""
@@ -14983,6 +15078,9 @@ msgstr ""
msgid "OpenStreetMap (Belgian Style - German)"
msgstr ""
+msgid "Orthophoto IGN-NGI"
+msgstr ""
+
msgid "AGIV Flanders most recent aerial imagery"
msgstr ""
@@ -15034,10 +15132,10 @@ msgstr ""
msgid "SPW(allonie) 2009-2010 aerial imagery"
msgstr ""
-msgid "TEC bus lines (2014)"
+msgid "TEC bus lines"
msgstr ""
-msgid "TEC bus stops (2014)"
+msgid "TEC bus stops"
msgstr ""
msgid "Benin: Cotonou Pleiade 2016"
@@ -15070,6 +15168,81 @@ msgstr ""
msgid "SIG Santa Catarina OrtoRGB 2012"
msgstr ""
+msgid "Arapiraca AL"
+msgstr ""
+
+msgid "Branquinha AL"
+msgstr ""
+
+msgid "Cajueiro AL"
+msgstr ""
+
+msgid "Campo Alegre AL"
+msgstr ""
+
+msgid "Capela AL"
+msgstr ""
+
+msgid "Delmiro Gouveia AL"
+msgstr ""
+
+msgid "Estrela de Alagoas"
+msgstr ""
+
+msgid "Girau do Ponciano"
+msgstr ""
+
+msgid "Major Isidoro AL"
+msgstr ""
+
+msgid "Mar Vermelho AL"
+msgstr ""
+
+msgid "Minador do Negrão"
+msgstr ""
+
+msgid "Olho d’Agua do Casado AL"
+msgstr ""
+
+msgid "Palestina AL"
+msgstr ""
+
+msgid "Palmeira dos Indios AL"
+msgstr ""
+
+msgid "Pão de Açucar AL"
+msgstr ""
+
+msgid "Piranhas AL"
+msgstr ""
+
+msgid "Poço das Trincheiras AL"
+msgstr ""
+
+msgid "Santana do Ipanema AL"
+msgstr ""
+
+msgid "São Miguel dos Campos AL"
+msgstr ""
+
+msgid "Teotonio Vilela AL"
+msgstr ""
+
+msgid "União dos Palmares AL"
+msgstr ""
+
+msgid "Viçosa AL"
+msgstr ""
+
+msgid "Alagoas Litoral 2006"
+msgstr ""
+
+msgid "DER-ES"
+msgstr "DER-ES"
+
+msgid "IBGE-BC250-Trecho Rodoviario"
+msgstr ""
+
msgid "Geobase Hydrography"
msgstr ""
@@ -15111,7 +15284,7 @@ msgid "imagico.de OSM images for mapping: Volcán Calbuco"
msgstr ""
msgid "Czech CUZK:KM"
-msgstr ""
+msgstr "捷克 CUZK:KM"
msgid "Czech RUIAN budovy"
msgstr ""
@@ -15120,6 +15293,12 @@ msgid "Czech RUIAN parcely"
msgstr ""
msgid "Czech pLPIS"
+msgstr "捷克 pLPIS"
+
+msgid "Praha IPR latest orthophoto"
+msgstr ""
+
+msgid "Praha IPR low-vegetation orthophoto"
msgstr ""
msgid "Geodatastyrelsen (Denmark)"
@@ -15141,10 +15320,10 @@ msgid "Geodatastyrelsen Skærmkort"
msgstr ""
msgid "Stevns (Denmark)"
-msgstr ""
+msgstr "丹麥 Route 500"
msgid "Vejmidte (Denmark)"
-msgstr ""
+msgstr "丹麥 Vejmidte"
msgid "imagico.de OSM images for mapping: El Altar"
msgstr ""
@@ -15168,7 +15347,7 @@ msgid "Estonia Forestry (Maaamet)"
msgstr ""
msgid "BANO"
-msgstr ""
+msgstr "BANO"
msgid "BD Carthage"
msgstr ""
@@ -15242,19 +15421,19 @@ msgid ""
msgstr ""
msgid "Hamburg (40 cm)"
-msgstr ""
+msgstr "漢堡 (40 cm)"
msgid "Hamburg (20 cm)"
-msgstr ""
+msgstr "漢堡 (20 cm)"
msgid "Hamburg (DK5)"
-msgstr ""
+msgstr "漢堡 (DK5)"
msgid "Bavaria (80 cm)"
-msgstr ""
+msgstr "巴伐利亞 (80 cm)"
msgid "Bavaria (2 m)"
-msgstr ""
+msgstr "巴伐利亞 (2 m)"
msgid "Berlin aerial photograph 2011"
msgstr ""
@@ -15268,6 +15447,12 @@ msgstr ""
msgid "Berlin aerial photograph 2016"
msgstr ""
+msgid "Deutsche Bahn VzG lines Nov 2013"
+msgstr ""
+
+msgid "Deutsche Bahn VzG lines Nov 2015"
+msgstr ""
+
msgid "Erlangen aerial imagery (2016 5.0 cm)"
msgstr ""
@@ -15307,29 +15492,40 @@ msgid ""
"(infrared)"
msgstr ""
-msgid "Saxony latest aerial imagery"
+msgid "imagico.de OSM images for mapping: North Sea Coast 2016"
msgstr ""
-msgid "Saxony latest aerial imagery infrared"
+msgid ""
+"234 channels (true color), Up-to-date low tide imagery of the coast for "
+"updating mapping of tidalflats and shoals"
msgstr ""
+msgid "Saxony latest aerial imagery"
+msgstr "德國薩克森自由邦最新空照影像"
+
+msgid "Saxony latest aerial imagery infrared"
+msgstr "德國薩克森自由邦最新空照紅外線影像"
+
msgid "Saxony aerial imagery 2005"
-msgstr ""
+msgstr "德國薩克森自由邦空照影像 2005"
msgid "Saxony WebAtlasSN"
-msgstr ""
+msgstr "德國薩克森自由邦 WebAtlasSN"
msgid "Saxony topographic map"
-msgstr ""
+msgstr "德國薩克森自由邦地形圖"
msgid "Saxony digital terrain model"
-msgstr ""
+msgstr "德國薩克森自由邦數位地形模型"
msgid "Mainz all aerial imageries"
-msgstr ""
+msgstr "德國美茵茲完整空照影像"
msgid "Mainz latest aerial imagery"
-msgstr ""
+msgstr "德國美茵茲最新空照影像"
+
+msgid "Munich latest aerial imagery 60cm"
+msgstr "德國美茵茲最新空照影像 60cm"
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
@@ -15375,46 +15571,55 @@ msgstr ""
msgid "Drone Imagery Matthew(Haiti) October 2016"
msgstr ""
-msgid "FÖMI ortophoto 2000"
+msgid "FÖMI orthophoto 2000"
msgstr ""
-msgid "FÖMI ortophoto 2005"
+msgid "FÖMI orthophoto 2005"
msgstr ""
-msgid "Szeged ortophoto 2011"
+msgid "Szeged orthophoto 2011"
msgstr ""
msgid "Inner part of Szeged"
msgstr ""
-msgid "Törökbálint ortophoto 2013"
+msgid "Törökbálint orthophoto 2013"
msgstr ""
msgid "5 cm resolution bald image"
msgstr ""
-msgid "Törökbálint ortophoto 2015"
+msgid "Törökbálint orthophoto 2015"
msgstr ""
-msgid "Danube flood ortophoto 2013"
+msgid "Danube flood orthophoto 2013"
msgstr ""
msgid "Riverbank of Danube at Budapest, Szentendre and Szigetmonostor"
msgstr ""
-msgid "Budapest district XI ortophoto 2015"
+msgid "Budapest district XI orthophoto 2015"
msgstr ""
-msgid "OpenStreetMap Hungary (hiking routes)"
+msgid "Budapest district XI orthophoto 2017"
msgstr ""
-msgid "Hillshade Hungary"
+msgid "Sóskút, Pusztazámor, Tárnok, Diósd orthophoto 2017"
msgstr ""
-msgid "imagico.de OSM images for mapping: Eastern Iceland"
+msgid "5 cm resolution bald image of 4 settlement"
msgstr ""
-msgid "imagico.de OSM images for mapping: Rann of Kutch"
+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"
@@ -15466,22 +15671,22 @@ msgid "Lodi - Italy"
msgstr ""
msgid "Lombardia - Italy (CTR)"
-msgstr ""
+msgstr "倫巴底 - 義大利 (CTR)"
msgid "Lombardia - Italy (CTR DBT)"
-msgstr ""
+msgstr "倫巴底 - 義大利 (CTR DBT)"
msgid "Sicily - Italy"
-msgstr ""
+msgstr "西西里 - 義大利"
msgid "PCN 2006 - Italy"
-msgstr ""
+msgstr "PCN 2006 - 義大利"
msgid "PCN 2008 - IT Lazio+Umbria"
msgstr ""
msgid "PCN 2012 - Italy"
-msgstr ""
+msgstr "PCN 2012 - 義大利"
msgid "South Tyrol Orthofoto 2011"
msgstr ""
@@ -15502,7 +15707,7 @@ msgid "imagico.de OSM images for mapping: Mount Kenya 2016"
msgstr ""
msgid "USSR - Latvia"
-msgstr ""
+msgstr "蘇聯 - 拉托維亞"
msgid "50cm ortho - Latvia"
msgstr ""
@@ -15514,7 +15719,7 @@ msgid "1.cikla ortofotokarte - Latvia"
msgstr ""
msgid "ORT10LT (Lithuania)"
-msgstr ""
+msgstr "ORT10LT (立陶宛)"
msgid "geoportail.lu all layers"
msgstr ""
@@ -15543,6 +15748,14 @@ msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
+msgid "imagico.de OSM images for mapping: Svalbard mosaic"
+msgstr ""
+
+msgid ""
+"Mostly Sentinel-2 2016 channels 234 (true color), Sentinel-2 mosaic of "
+"Svalbard"
+msgstr ""
+
msgid "imagico.de OSM images for mapping: Western Karakoram"
msgstr ""
@@ -15571,7 +15784,7 @@ msgid ""
"imagico.de OSM images for mapping: Willkanuta Mountains and Quelccaya Ice Cap"
msgstr ""
-msgid "Pangasinán/Bulacan (Phillipines HiRes)"
+msgid "Pangasinán/Bulacan (Philippines HiRes)"
msgstr ""
msgid "Geoportal 2: Ortofotomapa (aerial image)"
@@ -15701,10 +15914,10 @@ msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
msgstr ""
msgid "ScanEx IRS"
-msgstr ""
+msgstr "俄羅斯 ScanEx IRS"
msgid "ScanEx SPOT"
-msgstr ""
+msgstr "俄羅斯 ScanEx SPOT"
msgid "imagico.de OSM images for mapping: Kerch Strait"
msgstr ""
@@ -15720,35 +15933,43 @@ msgstr ""
msgid "imagico.de OSM images for mapping: Vostochny Cosmodrome"
msgstr ""
-msgid "Freemap.sk Car"
+msgid "imagico.de OSM images for mapping: Pechora Sea Coast"
msgstr ""
-msgid "Freemap.sk Hiking"
+msgid ""
+"234 channels (true color), Sentinel-2 image of the Pechora Sea coast in "
+"autumn 2016"
msgstr ""
+msgid "Freemap.sk Car"
+msgstr "Freemap.sk 汽車"
+
+msgid "Freemap.sk Hiking"
+msgstr "Freemap.sk 登山健行"
+
msgid "Freemap.sk Cyclo"
-msgstr ""
+msgstr "Freemap.sk 自行車"
msgid "Freemap.sk Ski"
-msgstr ""
+msgstr "Freemap.sk 滑雪"
msgid "Slovakia Historic Maps"
-msgstr ""
+msgstr "斯洛伐克歷史地圖"
msgid "RABA-KGZ: Slovenia farmland use"
-msgstr ""
+msgstr "RABA-KGZ：斯洛維尼亞農地使用"
msgid "RABA-KGZ: Slovenia built-up areas"
-msgstr ""
+msgstr "RABA-KGZ：斯洛維尼亞建築區域"
msgid "City of Cape Town 2013 Aerial"
-msgstr ""
+msgstr "開普敦市 2013 空照"
msgid "City of Cape Town 2015 Aerial"
-msgstr ""
+msgstr "開普敦市 2015 空照"
msgid "South Africa CD:NGI Aerial"
-msgstr ""
+msgstr "南非 CD:NGI 空照"
msgid "imagico.de OSM images for mapping: Leskov Island ASTER"
msgstr ""
@@ -15766,43 +15987,46 @@ msgid "imagico.de OSM images for mapping: Shag Rocks"
msgstr ""
msgid "Catastro Spain"
-msgstr ""
+msgstr "西班牙 地極"
msgid "PNOA Spain"
-msgstr ""
+msgstr "西班牙 PNOA"
msgid "SIGPAC Spain"
-msgstr ""
+msgstr "西班牙 SIGPAC"
msgid "GRAFCAN - Canary Islands"
-msgstr ""
+msgstr "西班牙 GRAFCAN - 加那利群島"
msgid "ITACyL - Castile and León"
-msgstr ""
+msgstr "西班牙 ITACyL - 卡斯提亞-雷昂"
msgid "IDEIB - Balearic Islands"
-msgstr ""
+msgstr "西班牙 IDEIB - 巴利亞利群島"
msgid "GRAFCAN Express - Canary Islands"
-msgstr ""
+msgstr "西班牙 GRAFCAN Express - 加那利群島"
msgid "imagico.de OSM images for mapping: Adams Bridge"
msgstr ""
msgid "Kanton Aargau 25cm (AGIS 2011)"
-msgstr ""
+msgstr "瑞士 阿爾高州 25cm (AGIS 2011)"
msgid "Kanton Aargau 25cm (AGIS 2014)"
-msgstr ""
+msgstr "瑞士 阿爾高州 25cm (AGIS 2014)"
+
+msgid "Kanton Aargau 25cm (AGIS 2016)"
+msgstr "瑞士 阿爾高州 25cm (AGIS 2016)"
msgid "Kanton Zürich Orthophotos 2014/2015 10cm"
-msgstr ""
+msgstr "瑞士 蘇黎世州 正射影像 2014/2015 10cm"
msgid "Stadt Uster Orthophoto 2008 10cm"
-msgstr ""
+msgstr "瑞士 烏斯特市 正射影像 2008 10cm"
msgid "Stadtplan Zürich"
-msgstr ""
+msgstr "瑞士 蘇黎世 地圖"
msgid "Stadt Zürich Übersichtsplan (Strassen, Gebäude, Hausnummer)"
msgstr ""
@@ -15847,52 +16071,52 @@ msgid "SIGIP - Orthophoto 2012"
msgstr ""
msgid "Lausanne - Orthophoto technique 2012"
-msgstr ""
+msgstr "瑞士洛桑正射影像 2012"
msgid "Bonvillars Orthophoto 2013"
-msgstr ""
+msgstr "瑞士邦維拉爾正射影像 2013"
msgid "Fiez Orthophoto 2013"
-msgstr ""
+msgstr "瑞士菲耶正射影像 2013"
msgid "Kanton Basel-Stadt 2015"
-msgstr ""
+msgstr "瑞士巴塞爾城市州 2015"
msgid "Kanton Basel-Landschaft 10cm (2015)"
-msgstr ""
+msgstr "瑞士巴塞爾鄉村州 10cm 2015"
msgid "imagico.de OSM images for mapping: Cental Alps in late September 2016"
msgstr ""
msgid "Taiwan e-Map Open Data"
-msgstr "臺灣通用版電子地圖開放資料版"
+msgstr "台灣通用電子地圖開放資料版"
msgid "Taiwan e-Map Open Data (with Contour Line)"
-msgstr "臺灣通用版電子地圖開放資料版(有等高線)"
+msgstr "台灣通用電子地圖開放資料版 (含等高線)"
msgid "Taiwan Village Boundaries"
-msgstr "臺灣村里界圖"
+msgstr "台灣村里界圖"
msgid "Taiwan Land-Section Data"
-msgstr "臺灣國土利用調查成果圖"
+msgstr "台灣國土利用調查成果圖"
msgid "NLSC Open Data WMTS"
-msgstr "國土測繪中心開放資料版WMTS"
+msgstr "台灣國土測繪中心開放資料 WMTS"
msgid "imagico.de OSM images for mapping: Mount Kilimanjaro 2016"
msgstr ""
msgid "MSR Maps Topo"
-msgstr ""
+msgstr "微軟研究院地形圖"
msgid "MSR Maps Urban"
-msgstr ""
+msgstr "微軟研究院市街圖"
msgid "USGS Topographic Maps"
-msgstr ""
+msgstr "美國地質調查局地形圖"
msgid "USGS Large Scale Imagery"
-msgstr ""
+msgstr "美國地質調查局大比例影像"
msgid "TIGER 2012 Roads Overlay"
msgstr ""
@@ -15900,22 +16124,47 @@ msgstr ""
msgid "New & Misaligned TIGER Roads (2015)"
msgstr ""
+msgid ""
+"At zoom level 16+, public domain map data from the US Census. At lower "
+"zooms, only changes since 2006 minus changes already incorporated into "
+"OpenStreetMap"
+msgstr ""
+
msgid "MassGIS L3 Parcels"
msgstr ""
msgid "NC Latest Orthoimagery"
+msgstr "美國北卡羅來納州最新正射影像"
+
+msgid ""
+"Most recent true color imagery for the state of North Carolina. The imagery "
+"has a pixel resolution of 6 inches and is comprised of imagery flown in "
+"2010, 2012, 2013, and 2014"
msgstr ""
msgid "U.S. Forest Service roads"
-msgstr ""
+msgstr "美國森林局道路圖"
msgid "imagico.de OSM images for mapping: Alaska Range"
msgstr ""
+msgid ""
+"234 channels (true color), Recent summer image of the Alaska Range for "
+"mapping natural features"
+msgstr ""
+
msgid "NJ 2015 Aerial Imagery (Infrared)"
+msgstr "美國紐澤西州 2015 空照影像 (紅外線)"
+
+msgid ""
+"Digital orthophotography of New Jersey, Near Infrared, 1 foot resolution"
msgstr ""
msgid "NJ 2015 Aerial Imagery (Natural Color)"
+msgstr "美國紐澤西州 2015 空照影像 (自然色)"
+
+msgid ""
+"Digital orthophotography of New Jersey, Natural Color, 1 foot resolution"
msgstr ""
msgid "San Juan Metro Area: 2013 USACE Orthophotos"
@@ -15924,24 +16173,55 @@ msgstr ""
msgid "WA 2013 aerial imagery for San Juan County"
msgstr ""
+msgid ""
+"Public domain aerial imagery taken in May/June 2013 from San Juan County, "
+"WA. Resolution is 9 inch."
+msgstr ""
+
+msgid "WA 2016 aerial imagery for San Juan County"
+msgstr ""
+
+msgid ""
+"Public domain aerial imagery taken in May, June, and July from San Juan "
+"County, WA. Resolution is 6 inch countywide."
+msgstr ""
+
msgid "WA Vector Streetmap for San Juan County"
msgstr ""
-msgid "Texas Orthophoto"
+msgid ""
+"Public domain street and address data from the San Juan County, WA. Updated "
+"at least quarterly."
msgstr ""
+msgid "Texas Orthophoto"
+msgstr "美國德州正射影像"
+
msgid "Philadelphia 2015 Imagery"
-msgstr ""
+msgstr "美國費城 2015 影像"
msgid "MD Latest 6 Inch Aerial Imagery"
msgstr ""
+msgid "Six Inch resolution aerial imagery for the State of Maryland"
+msgstr ""
+
msgid "MD Three Inch Aerial Imagery"
msgstr ""
+msgid ""
+"Three Inch Resolution Imagery for the cities of Rockville, Gaithersburg and "
+"Annapolis"
+msgstr ""
+
msgid "MD Transportation Basemap"
msgstr ""
+msgid ""
+"Maryland State Highway Administration road features and additional Maryland "
+"focused landmarks"
+msgstr ""
+
msgid "Delaware 2012 Orthophotography"
msgstr ""
@@ -15952,7 +16232,7 @@ msgid "imagico.de OSM images for mapping: Rwenzori Mountains 2016"
msgstr ""
msgid "Ukraine - Orthophotomaps 2012"
-msgstr ""
+msgstr "烏克蘭 空照影像 2012"
msgid "Works only from within Ukraine or with an Ukrainian proxy server."
msgstr ""
@@ -15997,238 +16277,238 @@ msgid "NLS - Bartholomew Half Inch, 1897-1907"
msgstr ""
msgid "OS Town Plans, Aberdeen 1866-1867 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 亞伯丁 1866-1867 (NLS)"
msgid "OS Town Plans, Airdrie 1858 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 埃爾德里 1858 (NLS)"
msgid "OS Town Plans, Alexandria 1859 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 亞歷山德里亞 1859 (NLS)"
msgid "OS Town Plans, Alloa 1861-1862 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 阿洛亞 1861-1862 (NLS)"
msgid "OS Town Plans, Annan 1859 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 安南 1859 (NLS)"
msgid "OS Town Plans, Arbroath 1858 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 阿布羅斯 1858 (NLS)"
msgid "OS Town Plans, Ayr 1855 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 亞伯丁 1866-1867 (NLS)"
msgid "OS Town Plans, Berwick-upon-Tweed 1852 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 特韋德河畔伯立克 1852 (NLS)"
msgid "OS Town Plans, Brechin 1862 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 布里金 1862 (NLS)"
msgid "OS Town Plans, Burntisland 1894 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 奔提斯蘭 1894 (NLS)"
msgid "OS Town Plans, Campbelton 1865 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 坎貝爾城 1865 (NLS)"
msgid "OS Town Plans, Coatbridge 1858 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 科特布里奇 11858 (NLS)"
msgid "OS Town Plans, Cupar 1854 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 庫珀 1854 (NLS)"
msgid "OS Town Plans, Cupar 1893-1894 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 庫珀 1893-1894 (NLS)"
msgid "OS Town Plans, Dalkeith 1852 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 達爾基斯 1852 (NLS)"
msgid "OS Town Plans, Dalkeith 1893 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 達爾基斯 1893 (NLS)"
msgid "OS Town Plans, Dumbarton 1859 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 敦巴頓 1859 (NLS)"
msgid "OS Town Plans, Dumfries 1850 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 鄧弗里斯 1850 (NLS)"
msgid "OS Town Plans, Dumfries 1893 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 鄧弗里斯 1893 (NLS)"
msgid "OS Town Plans, Dundee 1857-1858 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 丹地 1857-1858 (NLS)"
msgid "OS Town Plans, Dundee 1870-1872 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 丹地 1870-1872 (NLS)"
msgid "OS Town Plans, Dunfermline 1854 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 鄧弗姆林 1854 (NLS)"
msgid "OS Town Plans, Dunfermline 1894 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 鄧弗姆林 1894 (NLS)"
msgid "OS Town Plans, Edinburgh 1849-1851 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 愛丁堡 1849-1851 (NLS)"
msgid "OS Town Plans, Edinburgh 1876-1877 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 愛丁堡 1876-1877 (NLS)"
msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 愛丁堡 1893-1894 (NLS)"
msgid "OS Town Plans, Edinburgh 1940s-1960s (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 愛丁堡 1940s-1960s (NLS)"
msgid "OS Town Plans, Elgin 1868 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 埃爾金 1868 (NLS)"
msgid "OS Town Plans, Falkirk 1858-1859 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 福爾柯克 1858-1859 (NLS)"
msgid "OS Town Plans, Forfar 1860-1861 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 弗福爾 1860-1861 (NLS)"
msgid "OS Town Plans, Forres 1868 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 福里斯 1868 (NLS)"
msgid "OS Town Plans, Galashiels 1858 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 加拉希爾斯 1858 (NLS)"
msgid "OS Town Plans, Girvan 1857 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 格文 1857 (NLS)"
msgid "OS Town Plans, Glasgow 1857-1858 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 格拉斯哥 1857-1858 (NLS)"
msgid "OS Town Plans, Glasgow 1892-1894 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 格拉斯哥 1892-1894 (NLS)"
msgid "OS Town Plans, Greenock 1857 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 格林諾克 1857 (NLS)"
msgid "OS Town Plans, Haddington 1853 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 哈丁敦 1853 (NLS)"
msgid "OS Town Plans, Haddington 1893 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 哈丁敦 1853 (NLS)"
msgid "OS Town Plans, Hamilton 1858 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 漢密爾頓 1858 (NLS)"
msgid "OS Town Plans, Hawick 1857-1858 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 霍伊克 1857-1858 (NLS)"
msgid "OS Town Plans, Inverness 1867-1868 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 因弗尼斯 1867-1868 (NLS)"
msgid "OS Town Plans, Irvine 1859 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 歐文 1859 (NLS)"
msgid "OS Town Plans, Jedburgh 1858 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 傑德堡 1858 (NLS)"
msgid "OS Town Plans, Kelso 1857 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 凱爾索 1857 (NLS)"
msgid "OS Town Plans, Kilmarnock 1857-1859 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 基爾馬諾克 1857-1859 (NLS)"
msgid "OS Town Plans, Kirkcaldy 1855 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 柯科迪 1855 (NLS)"
msgid "OS Town Plans, Kirkcaldy 1894 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 柯科迪 1894 (NLS)"
msgid "OS Town Plans, Kirkcudbright 1850 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 柯庫布里 1850 (NLS)"
msgid "OS Town Plans, Kirkcudbright 1893 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 柯庫布里 1893 (NLS)"
msgid "OS Town Plans, Kirkintilloch 1859 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 柯金蒂洛赫 1859 (NLS)"
msgid "OS Town Plans, Kirriemuir 1861 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 克里默爾 1861 (NLS)"
msgid "OS Town Plans, Lanark 1858 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 拉奈克 1858 (NLS)"
msgid "OS Town Plans, Linlithgow 1856 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 林利斯哥 1856 (NLS)"
msgid "OS Town Plans, Mayole 1856-1857 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 梅博爾 1856-1857 (NLS)"
msgid "OS Town Plans, Montrose 1861-1862 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 蒙羅斯 1861-1862 (NLS)"
msgid "OS Town Plans, Musselburgh 1853 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 馬瑟爾堡 1853 (NLS)"
msgid "OS Town Plans, Musselburgh 1893 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 馬瑟爾堡 1893 (NLS)"
msgid "OS Town Plans, Nairn 1867-1868 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 奈恩 1867-1868 (NLS)"
msgid "OS Town Plans, Oban 1867-1868 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 奧本 1867-1868 (NLS)"
msgid "OS Town Plans, Paisley 1858 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 佩斯利 1858 (NLS)"
msgid "OS Town Plans, Peebles 1856 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 皮布爾斯 1856 (NLS)"
msgid "OS Town Plans, Perth 1860 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 伯斯 1860 (NLS)"
msgid "OS Town Plans, Peterhead 1868 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 彼得黑德 1868 (NLS)"
msgid "OS Town Plans, Port Glasgow 1856-1857 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 格拉斯哥港 1856-1857 (NLS)"
msgid "OS Town Plans, Portobello 1893-1894 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 波托貝羅 1893-1894 (NLS)"
msgid "OS Town Plans, Rothesay 1862-1863 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 羅撒西 1862-1863 (NLS)"
msgid "OS Town Plans, Selkirk 1865 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 塞爾扣克 1865 (NLS)"
msgid "OS Town Plans, St Andrews 1854 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 聖安德魯斯 1854 (NLS)"
msgid "OS Town Plans, St Andrews 1893 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 聖安德魯斯 1893 (NLS)"
msgid "OS Town Plans, Stirling 1858 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 史特靈 1858 (NLS)"
msgid "OS Town Plans, Stonehaven 1864 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 斯通黑文 18647 (NLS)"
msgid "OS Town Plans, Stranraer 1847 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 斯特蘭拉爾 1847 (NLS)"
msgid "OS Town Plans, Stranraer 1863-1877 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 斯特蘭拉爾 1863-1877 (NLS)"
msgid "OS Town Plans, Stranraer 1893 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 斯特蘭拉爾 1893 (NLS)"
msgid "OS Town Plans, Strathaven 1858 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 史垂文鎮 1858 (NLS)"
msgid "OS Town Plans, Wick 1872 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 維克 1872 (NLS)"
msgid "OS Town Plans, Wigtown 1848 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 維格鎮 1848 (NLS)"
msgid "OS Town Plans, Wigtown 1894 (NLS)"
-msgstr ""
+msgstr "英國地形測量局鄉鎮規劃 - 維格鎮 1894 (NLS)"
msgid "Landsat 233055"
msgstr "Landsat 233055"
@@ -16260,8 +16540,8 @@ msgid ""
msgstr ""
msgid ""
-"Automatically assigns addresses to selected objects in Austria. Data (c) "
-"Österreichisches Adressregister."
+"Automatically assigns the address to a selected object in Austria. Data © "
+"Österreichisches Adressregister 2017, N 23806/2017."
msgstr ""
msgid ""
@@ -16295,23 +16575,23 @@ msgstr "將 Columbus/Visiontac V-900 GPS 記錄器的專有 CSV 檔案匯入到
msgid ""
"Implements a command line and enables to create your commands. See link for "
"standard commands (arc, circle etc.)"
-msgstr "實作一個命令列讓您建立自己的指令。請查閱連結以了解標準指令 (arc, circle 等.)"
+msgstr "實作一個命令列讓你建立自己的指令。請查閱連結以了解標準指令 (arc, circle 等.)"
msgid "Tool for conflating data (matching and merging)."
msgstr ""
msgid "Downloads new data when you pan/zoom"
-msgstr ""
+msgstr "當平移/縮放時下載溪資料"
msgid "Create a grid of ways."
msgstr "建立路徑的格線。"
msgid "Customization of public public transport stops."
-msgstr ""
+msgstr "自訂公開的大眾運輸停靠站。"
msgid ""
"Creating and handling address nodes and buildings within Czech Republic."
-msgstr "建立並處理捷克共和國中的地址節點與建築。"
+msgstr "建立並處理捷克共和國的地址節點與建築。"
msgid ""
"Allows to import various file formats into JOSM directly. Currently "
@@ -16319,7 +16599,7 @@ msgid ""
msgstr ""
msgid "Download your GPX tracks from openstreetmap.org"
-msgstr "從 openstreetmap.org 下載您的 GPX 軌跡"
+msgstr "從 openstreetmap.org 下載你的 GPX 軌跡"
msgid ""
"This plugin directly upload GPS Traces from current active layer in JOSM to "
@@ -16330,7 +16610,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 "
@@ -16359,10 +16639,10 @@ msgstr "尋找並以適當的方式來修正無效的街道地址。"
msgid ""
"Talk with users editing the map nearby, be notified when someone comes close."
-msgstr ""
+msgstr "跟正在編輯附近地圖的使用者聊聊：當有其他人接近時通知。"
msgid "Allows you to view a GeoJSON file as a layer."
-msgstr ""
+msgstr "讓你可以將 GeoJSON 檔案作為圖層觀看。"
msgid ""
"Provides parts of the GeoTools library for other JOSM plugins. Not meant to "
@@ -16402,9 +16682,6 @@ msgid ""
"button."
msgstr "圖片偏移資料庫：一鍵分享和取得圖片偏移。"
-msgid "WMSPlugin-style imagery adjustment mapmode"
-msgstr ""
-
msgid ""
"Another plugin to match images to the waypoints in a GPX file. A match is "
"made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag "
@@ -16454,7 +16731,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 ""
@@ -16464,7 +16741,7 @@ msgstr "協助將 WMS 圖片向量化。"
msgid ""
"Support live GPS input (moving dot) through a connection to gpsd server."
-msgstr "支援透過連線到 gpsd 伺服器的即時 GPS 輸入（移動點）。"
+msgstr "支援透過連線到 gpsd 伺服器的即時 GPS 輸入 (移動點) 。"
msgid ""
"Provides the Log4j library for other JOSM plugins. Not meant to be installed "
@@ -16484,7 +16761,7 @@ msgid ""
"Provide a measurement dialog and a layer to measure length and angle of "
"segments, area surrounded by a (simple) closed way and create measurement "
"paths (which also can be imported from a gps layer)."
-msgstr "提供測量對話盒與圖層以測量區段、由（簡單的）封閉路徑圍繞的區域的長度與角度，並建立測量路徑（也可以從 gps 圖層匯入）。"
+msgstr "提供測量對話盒與圖層以測量區段、由 (簡單的) 封閉路徑圍繞的區域的長度與角度，並建立測量路徑 (也可以從 gps 圖層匯入) 。"
msgid "Merge overlapping part of ways."
msgstr "合併路徑重疊的部分。"
@@ -16501,7 +16778,7 @@ msgstr ""
msgid ""
"Use your system''s password manager to store the API username and password. "
"(KWallet and gnome-keyring are supported.)"
-msgstr "使用您系統的密碼管理程式來儲存 API 使用者名稱與密碼。 (支援 KWallet 與 gnome-keyring。)"
+msgstr "使用你系統的密碼管理程式來儲存 API 使用者名稱與密碼。 (支援 KWallet 與 gnome-keyring。)"
msgid ""
"Disallow using JOSM forever (WARNING: this plugin prevents JOSM from loading "
@@ -16547,7 +16824,7 @@ msgid ""
msgstr "將 gps 地點資訊寫入圖片檔的檔頭。在圖片圖層按右鍵選單就可以執行這項功能。"
msgid "Make photos movable and position them on the map."
-msgstr ""
+msgstr "可以移動照片並在地圖上定位。"
msgid ""
"This plugin allows to display any picture as a background in the editor and "
@@ -16586,10 +16863,10 @@ msgid ""
msgstr ""
msgid "Relation and multipolygon creating and editing panel."
-msgstr "關係與多重多邊形建立與編輯面板。"
+msgstr "關聯與多重多邊形建立與編輯面板。"
msgid "Plugin for reverting changesets"
-msgstr "還原變更組合的外掛程式"
+msgstr "還原變更集的外掛程式"
msgid ""
"Expand a simple intersection to a roundabout in gradual steps. Select an "
@@ -16606,7 +16883,7 @@ msgstr ""
msgid ""
"Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
"defined in routes.xml file in plugin directory"
-msgstr "繪製路線（公車、健行路行、自行車路線等）。路線類型必須定義於外掛程式目錄的 routes.xml 檔案"
+msgstr "繪製路線 (公車、健行路行、自行車路線等) 。路線類型必須定義於外掛程式目錄的 routes.xml 檔案"
msgid "Provides routing capabilities."
msgstr "提供路線規畫的功能。"
@@ -16615,10 +16892,10 @@ msgid "Loads data from SDS"
msgstr "從 SDS 載入資料"
msgid "Imagery Layer for Sea Charts"
-msgstr ""
+msgstr "海圖用影像圖層"
msgid "Edit features for Sea Charts"
-msgstr ""
+msgstr "編輯海圖的圖徽"
msgid ""
"Gives user more tools that facilitate aligning and rotation of buildings."
@@ -16630,7 +16907,7 @@ msgid ""
msgstr "藉由移除屬於很鈍的鈍角的節點來簡化區域。這可以使用最大移除區域大小來限制。同時也會平均化附近的節點。"
msgid "Edit features for OpenSeaMap"
-msgstr ""
+msgstr "編輯 OpenSeaMap 圖徽"
msgid "Allows to draw splines"
msgstr "允許繪製樣條"
@@ -16663,7 +16940,7 @@ msgstr "讓連棟房屋能超出單一區塊。"
msgid ""
"Adds a todo list dialog that makes it easy to go through large lists of "
"objects"
-msgstr ""
+msgstr "加入待處理清單對話框，以方便在大量物件清單中找到。"
msgid ""
"Integrate to-fix http://osmlab.github.io/to-fix/ into JOSM to repair errors "
@@ -16689,7 +16966,7 @@ msgid "Plugin to digital sign OSM-Data"
msgstr "用來數位簽署 OSM-Data 的外掛程式"
msgid "Editor to add turn lanes tags in highways"
-msgstr ""
+msgstr "在道路上加入轉彎車道的編輯器"
msgid ""
"Provides a straightforward GUI for adding, editing and deleting turn lanes."
@@ -16704,13 +16981,13 @@ msgid "Allows undeleting object from OSM database"
msgstr "允許從 OSM 資料庫中取消物件的刪除"
msgid "Several utilities that make your life easier."
-msgstr "許多讓您的生活更便利的公用程式。"
+msgstr "許多讓你的生活更便利的公用程式。"
msgid ""
"(This Plugin is currently work in progress!!!) Links and syncs a "
"georeferenced video against a GPS track, to use it for identify visible "
"objects."
-msgstr "（這個外掛程式目前還在開發中！！！）連結並將地理參照的影片同步到 GPS 軌跡中，它可以用來辨識可見的物件。"
+msgstr "(這個外掛程式目前還在開發中！！！) 連結並將地理參照的影片同步到 GPS 軌跡中，它可以用來辨識可見的物件。"
msgid ""
"Supports downloading tiled, scanned maps from walking-papers.org. This "
@@ -16736,61 +17013,61 @@ msgid "Surface"
msgstr "路面"
msgid "paved"
-msgstr "有鋪面的"
+msgstr "有鋪面"
msgid "unpaved"
-msgstr "沒鋪面的"
+msgstr "沒有鋪面"
msgid "asphalt"
msgstr "柏油"
msgid "concrete"
-msgstr "水泥地"
+msgstr "水泥"
msgid "concrete:plates"
-msgstr ""
+msgstr "水泥:完整"
msgid "concrete:lanes"
-msgstr ""
+msgstr "水泥:僅車道"
msgid "paving_stones"
-msgstr "鋪路石"
+msgstr "平整砌石"
msgid "sett"
-msgstr ""
+msgstr "大塊砌石"
msgid "cobblestone"
-msgstr "石子路"
+msgstr "嵌石"
msgid "grass_paver"
-msgstr "草地_鋪面"
+msgstr "鋪磚草地"
msgid "compacted"
-msgstr "壓實的"
+msgstr "夯實土路"
msgid "fine_gravel"
-msgstr ""
+msgstr "夯實土石"
msgid "gravel"
msgstr "碎石路"
msgid "pebblestone"
-msgstr "鵝卵石"
+msgstr "卵石"
msgid "ground"
msgstr "地面"
msgid "mud"
-msgstr "泥地"
+msgstr "泥巴"
msgid "sand"
-msgstr "沙地"
+msgstr "沙土"
msgid "grass"
-msgstr "草地"
+msgstr "平整草地"
msgid "wood"
-msgstr "木頭"
+msgstr "木板"
msgid "metal"
msgstr "金屬"
@@ -16799,105 +17076,105 @@ msgid "Smoothness"
msgstr "平滑度"
msgid "excellent"
-msgstr ""
+msgstr "很好"
msgid "Thin Rollers: rollerblade, skateboard"
-msgstr ""
+msgstr "窄輪子：直排輪、滑板"
msgid "good"
-msgstr ""
+msgstr "好"
msgid "Thin Wheels: racing bike"
-msgstr ""
+msgstr "薄型輪胎：競速自行車"
msgid "intermediate"
-msgstr ""
+msgstr "普通"
msgid "Wheels: city bike, wheelchair, scooter"
-msgstr ""
+msgstr "普通輪胎：一般自行車、輪椅、速克達機車"
msgid "bad"
-msgstr ""
+msgstr "不好"
msgid "Robust Wheels: trekking bike, car, rickshaw"
-msgstr ""
+msgstr "厚型輪胎：越野自行車、汽車、人力車"
msgid "very_bad"
-msgstr ""
+msgstr "非常不好"
msgid "High Clearance: light duty off-road vehicle"
-msgstr ""
+msgstr "高底盤：輕型越野車輛"
msgid "horrible"
-msgstr ""
+msgstr "可怕"
msgid "Off-Road: heavy duty off-road vehicle"
-msgstr ""
+msgstr "越野：重型越野車"
msgid "very_horrible"
-msgstr ""
+msgstr "非常可怕"
msgid "Specialized off-road: tractor, ATV"
-msgstr ""
+msgstr "特殊越野車輛：牽引機、沙灘車"
msgid "impassable"
-msgstr ""
+msgstr "無法通行"
msgid "No wheeled vehicle"
-msgstr ""
+msgstr "禁行輪車"
msgctxt "riding"
msgid "horse_riding"
-msgstr ""
+msgstr "騎馬"
msgctxt "riding"
msgid "pitch"
-msgstr "球場"
+msgstr "馬場"
msgctxt "riding"
msgid "sports_centre"
-msgstr ""
+msgstr "運動中心"
msgctxt "riding"
msgid "stadium"
-msgstr ""
+msgstr "體育館"
msgctxt "riding"
msgid "track"
-msgstr ""
+msgstr "跑道"
msgid "clay"
-msgstr ""
+msgstr "泥土"
msgid "dirt"
-msgstr ""
+msgstr "砂土"
msgid "Lanes"
-msgstr "車道數"
+msgstr "車道"
msgid "Lanes in way direction"
-msgstr ""
+msgstr "與路徑同方向的車道"
msgid "Lanes opposed to way direction"
-msgstr ""
+msgstr "與路徑反方向的車道"
msgid "Max. speed (km/h)"
msgstr "最高限速 (km/h)"
msgid "Max. speed in way direction"
-msgstr ""
+msgstr "路徑方向的最大速度"
msgid "Max. speed opposed to way direction"
-msgstr ""
+msgstr "與路徑方向相反的最大速度"
msgid "Bridge"
-msgstr "橋"
+msgstr "橋樑"
msgid "Tunnel"
msgstr "隧道"
msgid "Cutting"
-msgstr "斷開"
+msgstr "鑿開"
msgid "Embankment"
msgstr "堤防"
@@ -16921,79 +17198,79 @@ msgid "Oneway"
msgstr "單行道"
msgid "Lit"
-msgstr ""
+msgstr "路燈"
msgid "Width (meters)"
-msgstr "寬度 (米)"
+msgstr "寬度 (公尺)"
msgid "Sidewalk"
-msgstr ""
+msgstr "人行道"
msgctxt "sidewalk"
msgid "both"
-msgstr ""
+msgstr "兩側"
msgctxt "sidewalk"
msgid "left"
-msgstr ""
+msgstr "左側"
msgctxt "sidewalk"
msgid "right"
-msgstr ""
+msgstr "右側"
msgctxt "sidewalk"
msgid "no"
-msgstr ""
+msgstr "無"
msgid "Service type"
-msgstr ""
+msgstr "運輸路線類型"
msgid "yard"
-msgstr ""
+msgstr "儲車線"
msgid "siding"
-msgstr ""
+msgstr "調度側線"
msgid "spur"
-msgstr ""
+msgstr "專用側線"
msgid "crossover"
-msgstr ""
+msgstr "橫渡線"
msgid "Electrified"
-msgstr ""
+msgstr "電氣化"
msgctxt "electrified"
msgid "contact_line"
-msgstr ""
+msgstr "電車縣"
msgctxt "electrified"
msgid "no"
-msgstr ""
+msgstr "無"
msgctxt "electrified"
msgid "yes"
-msgstr ""
+msgstr "有"
msgctxt "electrified"
msgid "rail"
-msgstr ""
+msgstr "第三軌"
msgid "Voltage in Volts (V)"
-msgstr ""
+msgstr "電壓 (V)"
msgid "Frequency in Hertz (Hz)"
-msgstr ""
+msgstr "頻率 (Hz)"
msgid "16.67"
-msgstr ""
+msgstr "16.67"
msgid "16.7"
msgstr "16.7"
msgctxt "railway"
msgid "Tracks"
-msgstr "跑道"
+msgstr "軌道"
msgid "Gauge (mm)"
msgstr "軌距 (mm)"
@@ -17014,7 +17291,7 @@ msgid "Reference"
msgstr "編號"
msgid "Operator"
-msgstr "經營者"
+msgstr "營運者"
msgid "Service Times"
msgstr "服務時間"
@@ -17041,10 +17318,10 @@ msgid "Cuisine"
msgstr "烹調風格"
msgid "italian"
-msgstr "義式料理"
+msgstr "義大利料理"
msgid "chinese"
-msgstr "中式料理"
+msgstr "中國料理"
msgid "pizza"
msgstr "披薩"
@@ -17056,10 +17333,10 @@ msgid "greek"
msgstr "希臘料理"
msgid "german"
-msgstr "德式料理"
+msgstr "德國料理"
msgid "indian"
-msgstr "印度料理"
+msgstr "印度"
msgid "regional"
msgstr "地方料理"
@@ -17083,7 +17360,7 @@ msgid "japanese"
msgstr "日本料理"
msgid "french"
-msgstr "法式料理"
+msgstr "法國料理"
msgid "sandwich"
msgstr "三明治"
@@ -17101,16 +17378,16 @@ msgid "fish_and_chips"
msgstr "魚和炸物"
msgid "chicken"
-msgstr "雞內"
+msgstr "雞肉"
msgid "american"
-msgstr "美式"
+msgstr "美國料理"
msgid "ice_cream"
msgstr "冰淇淋"
msgid "international"
-msgstr "國際"
+msgstr "國際風味"
msgid "seafood"
msgstr "海鮮"
@@ -17119,13 +17396,13 @@ msgid "spanish"
msgstr "西班牙"
msgid "vietnamese"
-msgstr "越式"
+msgstr "越南料理"
msgid "fish"
msgstr "魚"
msgid "noodle"
-msgstr "麵店"
+msgstr "麵條類"
msgid "barbecue"
msgstr "烤肉"
@@ -17134,10 +17411,10 @@ msgid "vegetarian"
msgstr "素食"
msgid "korean"
-msgstr "韓式"
+msgstr "韓國料理"
msgid "Internet access"
-msgstr "附設網際網路"
+msgstr "可上網"
msgid "wlan"
msgstr "無線網路"
@@ -17146,10 +17423,10 @@ msgid "wired"
msgstr "有線網路"
msgid "terminal"
-msgstr ""
+msgstr "終端機"
msgid "Internet access fee"
-msgstr "網際網路使用費"
+msgstr "上網費"
msgid "Smoking"
msgstr "吸菸區"
@@ -17167,7 +17444,7 @@ msgid "outside"
msgstr "室外"
msgid "Height (meters)"
-msgstr "高度（米）"
+msgstr "高度 (公尺)"
msgid "Max. width (meters)"
msgstr "最大寬度 (公尺)"
@@ -17176,7 +17453,7 @@ msgid "Max. height (meters)"
msgstr "最大高度 (公尺)"
msgid "pitch"
-msgstr "球場"
+msgstr "場地"
msgid "sports_centre"
msgstr "運動中心"
@@ -17297,23 +17574,23 @@ msgstr "風箏"
msgctxt "sport"
msgid "model_aerodrome"
-msgstr ""
+msgstr "遙控飛機"
msgctxt "sport"
msgid "motocross"
-msgstr ""
+msgstr "越野機車"
msgctxt "sport"
msgid "motor"
-msgstr ""
+msgstr "賽車"
msgctxt "sport"
msgid "pelota"
-msgstr ""
+msgstr "球類運動"
msgctxt "sport"
msgid "racquet"
-msgstr ""
+msgstr "美式壁球"
msgctxt "sport"
msgid "rc_car"
@@ -17321,11 +17598,11 @@ msgstr "賽車"
msgctxt "sport"
msgid "rugby_league"
-msgstr ""
+msgstr "聯盟式橄欖球"
msgctxt "sport"
msgid "rugby_union"
-msgstr ""
+msgstr "聯合式橄欖球"
msgctxt "sport"
msgid "running"
@@ -17333,23 +17610,23 @@ msgstr "跑步"
msgctxt "sport"
msgid "safety_training"
-msgstr ""
+msgstr "安全練習"
msgctxt "sport"
msgid "shooting"
-msgstr ""
+msgstr "射擊"
msgctxt "sport"
msgid "skateboard"
-msgstr ""
+msgstr "滑板"
msgctxt "sport"
msgid "ice_skating"
-msgstr ""
+msgstr "滑冰"
msgctxt "sport"
msgid "roller_skating"
-msgstr ""
+msgstr "直排輪"
msgctxt "sport"
msgid "soccer"
@@ -17357,7 +17634,7 @@ msgstr "足球"
msgctxt "sport"
msgid "swimming"
-msgstr ""
+msgstr "游泳"
msgctxt "sport"
msgid "table_tennis"
@@ -17393,19 +17670,19 @@ msgstr "五月-九月 09:30-12:30,14:15-19:30"
msgctxt "parking"
msgid "multi-storey"
-msgstr ""
+msgstr "大樓"
msgctxt "parking"
msgid "surface"
-msgstr ""
+msgstr "平面"
msgctxt "parking"
msgid "underground"
-msgstr ""
+msgstr "地下"
msgctxt "parking"
msgid "rooftop"
-msgstr ""
+msgstr "屋頂"
msgid "Reference number"
msgstr "參考編號"
@@ -17453,65 +17730,65 @@ msgid "Website"
msgstr "網站"
msgid "Distance (km)"
-msgstr "距離 (km)"
+msgstr "距離 (公里)"
msgid "Ascent (m)"
-msgstr ""
+msgstr "上升 (公尺)"
msgid "Descent (m)"
-msgstr ""
+msgstr "下降 (公尺)"
msgid "Roundtrip"
-msgstr ""
+msgstr "來回"
msgid "Symbol description"
-msgstr ""
+msgstr "符號說明"
msgid "broadleaved"
-msgstr ""
+msgstr "闊葉"
msgid "needleleaved"
-msgstr ""
+msgstr "針葉"
msgid "mixed"
msgstr "混合"
msgid "leafless"
-msgstr ""
+msgstr "無葉"
msgid "Cycle"
-msgstr ""
+msgstr "生長循環"
msgid "deciduous"
-msgstr "落葉類"
+msgstr "落葉性"
msgid "Plants that are leafless for a certain period during the year."
-msgstr ""
+msgstr "植物在一年中有段期間葉子會掉落光。"
msgid "evergreen"
-msgstr ""
+msgstr "常綠"
msgid "Plants that are never entirely without green foliage."
-msgstr ""
+msgstr "植物整年都有綠葉。"
msgid "semi_deciduous"
-msgstr ""
+msgstr "半落葉性"
msgid ""
"Plants that lose their foliage for a very short period, when old leaves fall "
"off and new foliage growth is starting."
-msgstr ""
+msgstr "植物只有非常短的期間會落葉，老葉掉落後新葉就開始長了。"
msgid "semi_evergreen"
-msgstr ""
+msgstr "半常綠"
msgid ""
"Plants that lose most, but not all, of their foliage for a fraction of the "
"year."
-msgstr ""
+msgstr "植物的大多數葉子 (不是全部) 在一年中有段期間會掉落。"
msgid "Habitat with evergreen and deciduous vegetation."
-msgstr ""
+msgstr "常綠與落葉性混合。"
msgid "bahai"
msgstr "巴海大同教"
@@ -17535,19 +17812,19 @@ msgid "muslim"
msgstr "回教"
msgid "shinto"
-msgstr ""
+msgstr "印度教"
msgid "sikh"
msgstr "錫克教"
msgid "spiritualist"
-msgstr ""
+msgstr "心靈主義"
msgid "taoist"
msgstr "道教"
msgid "unitarian"
-msgstr ""
+msgstr "一神普救派"
msgid "zoroastrian"
msgstr "祆教"
@@ -17568,10 +17845,10 @@ msgid "evangelical"
msgstr "福音派教會"
msgid "greek_catholic"
-msgstr ""
+msgstr "希臘正教"
msgid "jehovahs_witness"
-msgstr ""
+msgstr "耶和華見證人"
msgid "lutheran"
msgstr "路德教派"
@@ -17583,7 +17860,7 @@ msgid "mormon"
msgstr "摩門教"
msgid "old_catholic"
-msgstr ""
+msgstr "舊天主教"
msgid "orthodox"
msgstr "東正教"
@@ -17601,7 +17878,7 @@ msgid "quaker"
msgstr "教友派"
msgid "roman_catholic"
-msgstr ""
+msgstr "羅馬天主教"
msgid "shia"
msgstr "什葉派"
@@ -17610,34 +17887,34 @@ msgid "sunni"
msgstr "遜尼派"
msgid "750000;200000"
-msgstr ""
+msgstr "750000+200000"
msgid "110000;20000"
-msgstr ""
+msgstr "110000+20000"
msgid "Branch operator"
-msgstr ""
+msgstr "輔助營運者"
msgid "Amount of Cables"
msgstr "纜線數量"
msgid "Amount of circuits"
-msgstr ""
+msgstr "電路數量"
msgid "Location"
msgstr "位置"
msgctxt "power"
msgid "outdoor"
-msgstr ""
+msgstr "室外"
msgctxt "power"
msgid "indoor"
-msgstr ""
+msgstr "室內"
msgctxt "power"
msgid "underground"
-msgstr ""
+msgstr "地下"
msgctxt "power"
msgid "platform"
@@ -17645,125 +17922,125 @@ msgstr "月台"
msgctxt "power"
msgid "kiosk"
-msgstr ""
+msgstr "販售站"
msgid "Start date"
-msgstr ""
+msgstr "起始日期"
msgid "Output forms of energy:"
-msgstr ""
+msgstr "輸出能源的型態："
msgid "biogas"
-msgstr ""
+msgstr "生質氣體"
msgid "2 W"
-msgstr ""
+msgstr "2 W"
msgid "3 kW"
-msgstr ""
+msgstr "3 KW"
msgid "5 MW"
-msgstr ""
+msgstr "5 MW"
msgid "7 GW"
-msgstr ""
+msgstr "7 GW"
msgid "electricity"
-msgstr ""
+msgstr "電力"
msgid "hot water"
msgstr "熱水"
msgid "hot air"
-msgstr ""
+msgstr "暖氣"
msgid "cold water"
msgstr "冷水"
msgid "cold air"
-msgstr ""
+msgstr "冷氣"
msgid "compressed air"
-msgstr ""
+msgstr "壓縮氣體"
msgid "steam"
-msgstr ""
+msgstr "蒸氣"
msgid "vacuum"
-msgstr ""
+msgstr "火山"
msgid "Max. weight (tonnes)"
-msgstr "總重限制（噸）"
+msgstr "總重限制 (噸)"
msgid "Toll"
msgstr "通行費"
msgid "Intermittent"
-msgstr ""
+msgstr "間歇不定"
msgid "Seasonal"
-msgstr ""
+msgstr "季節性"
msgid "In the tidal range"
-msgstr ""
+msgstr "位於潮差區間"
msgid "culvert"
-msgstr ""
+msgstr "涵管"
msgid "Water access rules:"
-msgstr "取水資格"
+msgstr "入水規定："
msgid "Ship"
-msgstr ""
+msgstr "船隻"
msgid "designated"
-msgstr "已指定"
+msgstr "專用"
msgid "Boat"
-msgstr ""
+msgstr "小艇"
msgid "Motorboat"
-msgstr ""
+msgstr "動力小艇"
msgid "Canoe"
-msgstr ""
+msgstr "獨木舟"
msgid "Substance"
-msgstr ""
+msgstr "物質"
msgid "water"
-msgstr "水域"
+msgstr "水"
msgid "gas"
-msgstr "天然氣"
+msgstr "瓦斯"
msgid "heat"
-msgstr ""
+msgstr "暖氣"
msgid "oil"
-msgstr ""
+msgstr "油料"
msgid "sewage"
-msgstr ""
+msgstr "污水"
msgid "Support"
-msgstr "支援"
+msgstr "支撐"
msgctxt "mounting/support"
msgid "pole"
-msgstr ""
+msgstr "支柱"
msgctxt "mounting/support"
msgid "wall_mounted"
-msgstr ""
+msgstr "掛牆"
msgctxt "mounting/support"
msgid "billboard"
-msgstr ""
+msgstr "公告欄"
msgctxt "mounting/support"
msgid "ground"
-msgstr ""
+msgstr "地上"
msgid "IATA"
msgstr "IATA"
@@ -17772,147 +18049,147 @@ msgid "ICAO"
msgstr "ICAO"
msgid "Car brand"
-msgstr ""
+msgstr "汽車品牌"
msgid "Motorcycle brand"
-msgstr ""
+msgstr "機車品牌"
msgid "From (initial stop)"
-msgstr ""
+msgstr "起點 (起站)"
msgid "To (terminal stop)"
-msgstr ""
+msgstr "訖點 (終站)"
msgid "Via (intermediate stops)"
-msgstr ""
+msgstr "經過 (中間站)"
msgid "Network"
msgstr "網路"
msgid "Color (HTML name or hexadecimal code)"
-msgstr ""
+msgstr "顏色 (HTML 顏色名稱或十六進位碼)"
msgctxt "color"
msgid "black"
-msgstr ""
+msgstr "黑色"
msgctxt "color"
msgid "brown"
-msgstr ""
+msgstr "棕色"
msgctxt "color"
msgid "green"
-msgstr ""
+msgstr "綠色"
msgctxt "color"
msgid "red"
-msgstr ""
+msgstr "紅色"
msgctxt "color"
msgid "blue"
-msgstr ""
+msgstr "藍色"
msgctxt "color"
msgid "gray"
-msgstr ""
+msgstr "灰色"
msgctxt "color"
msgid "white"
-msgstr ""
+msgstr "白色"
msgctxt "color"
msgid "#CD853F"
-msgstr ""
+msgstr "#CD853F"
msgid "Streets"
msgstr "街道"
msgid "Motorway"
-msgstr "高速公路(Motorway)"
+msgstr "高速公路"
msgid "Destination"
-msgstr ""
+msgstr "目的地"
msgid "Destination reference"
-msgstr ""
+msgstr "目的地標示"
msgid "Placement"
-msgstr ""
+msgstr "車道"
msgid "left_of:1"
-msgstr ""
+msgstr "左側1"
msgid "left_of:2"
-msgstr ""
+msgstr "左側2"
msgid "left_of:3"
-msgstr ""
+msgstr "左側3"
msgid "middle_of:1"
-msgstr ""
+msgstr "中央1"
msgid "middle_of:2"
-msgstr ""
+msgstr "中央2"
msgid "middle_of:3"
-msgstr ""
+msgstr "中央3"
msgid "right_of:1"
-msgstr ""
+msgstr "右側1"
msgid "right_of:2"
-msgstr ""
+msgstr "右側2"
msgid "right_of:3"
-msgstr ""
+msgstr "右側3"
msgid "transition"
-msgstr ""
+msgstr "變換"
msgid "Motorway Link"
-msgstr "高速公路連絡道路"
+msgstr "高速公路連接道路"
msgid "Trunk"
-msgstr "快速道路(Trunk)"
+msgstr "快速道路"
msgid "Motorroad"
-msgstr "汽車專用"
+msgstr "汽車專用道"
msgid "Trunk Link"
-msgstr "快速道路連絡道路"
+msgstr "快速道路連接道路"
msgid "Primary"
-msgstr "省道(Primary)"
+msgstr "省道"
msgid "Overhead trolley wires"
-msgstr ""
+msgstr "懸空電車線"
msgid "Primary Link"
msgstr "省道連絡道路"
msgid "Secondary"
-msgstr "縣道(Secondary)"
+msgstr "縣道"
msgid "Secondary Link"
msgstr "縣道連絡道路"
msgid "Tertiary"
-msgstr "鄉道(Tertiary)"
+msgstr "鄉道("
msgid "Tertiary Link"
msgstr "鄉道連絡道路"
msgid "Unclassified"
-msgstr "未分類(Unclassified)"
+msgstr "未分類道路"
msgid "Street has no name"
-msgstr ""
+msgstr "街道沒有名稱"
msgid "Passing Places"
-msgstr ""
+msgstr "會車區"
msgid "Residential"
-msgstr "住宅道路"
+msgstr "住宅區道路"
msgid "Bicycle Road"
msgstr "自行車道"
@@ -17922,29 +18199,29 @@ msgstr "公路類型"
msgctxt "Highway"
msgid "residential"
-msgstr "住宅道路"
+msgstr "住宅區道路"
msgctxt "Highway"
msgid "service"
-msgstr ""
+msgstr "用途"
msgctxt "Highway"
msgid "unclassified"
-msgstr ""
+msgstr "未分類"
msgctxt "Highway"
msgid "path"
-msgstr ""
+msgstr "路徑"
msgctxt "Highway"
msgid "cycleway"
-msgstr ""
+msgstr "自行車道"
msgid "Vehicle access"
-msgstr ""
+msgstr "車輛進入"
msgid "Oneway for bicycle"
-msgstr ""
+msgstr "自行車單行道"
msgid "Living Street"
msgstr "生活街道"
@@ -17956,25 +18233,25 @@ msgid "Area"
msgstr "區域"
msgid "Service"
-msgstr "服務型(Service)"
+msgstr "用途"
msgid "Service way type"
-msgstr "服務型道路類型"
+msgstr "道路用途"
msgid "alley"
msgstr "巷/弄"
msgid "driveway"
-msgstr "車道"
+msgstr "私人道路"
msgid "parking_aisle"
msgstr "停車場通道"
msgid "drive-through"
-msgstr ""
+msgstr "免下車"
msgid "emergency_access"
-msgstr ""
+msgstr "緊急通道"
msgid "Parking Aisle"
msgstr "停車場通道"
@@ -17985,84 +18262,84 @@ msgstr "逃生通道"
msgid ""
"Emergency lane beside long descending slopes for trucks and other vehicles "
"to stop safely after brake failure."
-msgstr ""
+msgstr "長下坡後給載重車和其他大型車輛可以在煞車故障時仍可安全停車的緊急車道。"
msgid "Raceway"
msgstr "賽車道"
msgid "Road (Unknown Type)"
-msgstr "道路（不明的類型）"
+msgstr "道路 (不明類型)"
msgid "Construction"
-msgstr "施工"
+msgstr "興建中"
msgctxt "Highway"
msgid "motorway"
-msgstr ""
+msgstr "高速公路"
msgctxt "Highway"
msgid "motorway_link"
-msgstr ""
+msgstr "高速公路連接道路"
msgctxt "Highway"
msgid "trunk"
-msgstr ""
+msgstr "快速道路"
msgctxt "Highway"
msgid "trunk_link"
-msgstr ""
+msgstr "快速道路連接道路"
msgctxt "Highway"
msgid "primary"
-msgstr ""
+msgstr "省道"
msgctxt "Highway"
msgid "primary_link"
-msgstr ""
+msgstr "省道聯絡道路"
msgctxt "Highway"
msgid "secondary"
-msgstr ""
+msgstr "縣道"
msgctxt "Highway"
msgid "secondary_link"
-msgstr ""
+msgstr "縣道聯絡道路"
msgctxt "Highway"
msgid "tertiary"
-msgstr ""
+msgstr "鄉道"
msgctxt "Highway"
msgid "tertiary_link"
-msgstr ""
+msgstr "鄉道聯絡道路"
msgctxt "Highway"
msgid "bus_guideway"
-msgstr ""
+msgstr "導軌巴士"
msgctxt "Highway"
msgid "bridleway"
-msgstr ""
+msgstr "馬道"
msgctxt "Highway"
msgid "living_street"
-msgstr ""
+msgstr "生活街道"
msgctxt "Highway"
msgid "pedestrian"
-msgstr ""
+msgstr "徒步區"
msgctxt "Highway"
msgid "track"
-msgstr ""
+msgstr "產業道路"
msgctxt "Highway"
msgid "footway"
-msgstr ""
+msgstr "步道"
msgctxt "Highway"
msgid "steps"
-msgstr ""
+msgstr "階梯"
msgid "Junction"
msgstr "匯集點"
@@ -18071,7 +18348,7 @@ msgid "roundabout"
msgstr "圓環"
msgid "jughandle"
-msgstr ""
+msgstr "閘道"
msgid "Road Restrictions"
msgstr "道路限制"
@@ -18079,100 +18356,100 @@ msgstr "道路限制"
msgid ""
"Some road types already imply some access restrictions which should not be "
"set again."
-msgstr ""
+msgstr "一些道路類型已經帶有某些通行限制、不應該再重複設定。"
msgid "No exit (cul-de-sac)"
-msgstr "沒有出口（死路）"
+msgstr "沒有出口 (死路)"
msgid "Transport mode restrictions"
-msgstr ""
+msgstr "通行限制"
msgid "official"
msgstr "正式的"
msgid "Vehicles per type"
-msgstr ""
+msgstr "車輛類型"
msgid "All vehicles"
-msgstr ""
+msgstr "所有車輛"
msgid "use_sidepath"
-msgstr ""
+msgstr "旁有自行車道"
msgid "Motor vehicles"
-msgstr ""
+msgstr "機動車輛"
msgid "Light Commercial Vehicles (goods)"
-msgstr ""
+msgstr "小貨車"
msgid "Heavy Goods Vehicles (hgv)"
-msgstr "大型車 (hgv)"
+msgstr "大型載重車 (hgv)"
msgid "Vehicles per use"
-msgstr ""
+msgstr "車輛用途"
msgid "Agricultural"
msgstr "農業的"
msgid "Emergency vehicles"
-msgstr ""
+msgstr "緊急車輛"
msgid "High-occupancy vehicles (hov)"
-msgstr ""
+msgstr "高承載車輛 (hov)"
msgid "Public Service Vehicles (psv)"
-msgstr "公共汽車 (psv)"
+msgstr "大眾運輸車輛 (psv)"
msgid "Tourist buses"
-msgstr ""
+msgstr "遊覽車"
msgid "Max. speed Heavy Goods Vehicles (km/h)"
-msgstr ""
+msgstr "大型載重車最高速限 (公里/小時)"
msgid "Min. speed (km/h)"
-msgstr "最低限速 (km/h)"
+msgstr "最低限速 (公里/小時)"
msgid "Max. axleload (tonnes)"
-msgstr ""
+msgstr "最大軸重 (噸)"
msgid "Max. length (meters)"
msgstr "最大長度 (公尺)"
msgid "Overtaking"
-msgstr ""
+msgstr "超車"
msgctxt "overtaking"
msgid "yes"
-msgstr ""
+msgstr "可以"
msgctxt "overtaking"
msgid "both"
-msgstr ""
+msgstr "不可以"
msgctxt "overtaking"
msgid "forward"
-msgstr ""
+msgstr "順向"
msgctxt "overtaking"
msgid "backward"
-msgstr ""
+msgstr "逆向"
msgctxt "overtaking"
msgid "no"
-msgstr ""
+msgstr "禁止"
msgid "Roundabout"
msgstr "圓環"
msgctxt "Highway"
msgid "construction"
-msgstr ""
+msgstr "興建中"
msgid "Ford"
-msgstr "淺灘"
+msgstr "過水點"
msgid "stepping_stones"
-msgstr ""
+msgstr "跳石"
msgid "Ways"
msgstr "路徑"
@@ -18187,31 +18464,31 @@ msgid "grade1"
msgstr "第一級"
msgid "Solid: paved or heavily compacted hardcore surface"
-msgstr ""
+msgstr "堅固：有鋪裝或夯實的硬質路面"
msgid "grade2"
msgstr "第二級"
msgid "Mostly Solid: gravel/rock with some soft material mixed in"
-msgstr ""
+msgstr "還算堅固：碎石混著少許柔軟的泥土砂石"
msgid "grade3"
msgstr "第三級"
msgid "Even mixture of hard and soft materials"
-msgstr ""
+msgstr "硬質與柔軟材質相雜"
msgid "grade4"
msgstr "第四級"
msgid "Mostly Soft: soil/sand/grass with some hard material mixed in"
-msgstr ""
+msgstr "柔軟：土/砂/草地，混著少許堅硬的材質"
msgid "grade5"
msgstr "第五級"
msgid "Soft: soil/sand/grass"
-msgstr ""
+msgstr "非常柔軟：土/砂/草地"
msgid "MTB Scale"
msgstr "MTB 比例"
@@ -18223,78 +18500,78 @@ msgid "SAC Scale"
msgstr "SAC 比例"
msgid "T1 - hiking trail"
-msgstr ""
+msgstr "T1 - 健行路線"
msgid "Trail well cleared. Area flat or slightly sloped, no fall hazard"
-msgstr ""
+msgstr "路徑非常明顯，位於平地或緩坡，沒有跌落風險"
msgid "T2 - mountain hiking trail"
-msgstr ""
+msgstr "T2 - 山區健行路線"
msgid ""
"Trail with continuous line and balanced ascent. Terrain partially steep, "
"fall hazard possible"
-msgstr ""
+msgstr "路徑清楚，坡度普通偶有陡峭地形，稍稍有些跌落風險"
msgid "T3 - difficult, exposed hiking trail"
-msgstr ""
+msgstr "T3 - 困難，帶風險的健行路線"
msgid ""
"exposed sites may be secured with ropes or chains, possible need to use "
"hands for balance. Partly exposed sites with fall hazard, scree, pathless "
"jagged rocks"
-msgstr ""
+msgstr "有些沒有明確路徑的路段，一些危險路段應有設置繩索或鏈條、可抓著通過、帶有跌落風險，有些碎石、裸岩區"
msgid "T4 - difficult, exposed, steep alpine trail"
-msgstr ""
+msgstr "T4 - 困難，帶風險的陡峭高山路線"
msgid ""
"sometimes need for hand use to get ahead. Terrain quite exposed, precarious "
"grassy acclivities, jagged rocks, facile snow-free glaciers"
-msgstr ""
+msgstr "有時要手腳並用才能前進，地形非常有暴露感，一些不安全的草坡、裸岩區、沒有積雪的小冰河"
msgid "T5 - difficult alpine trail with climbing"
-msgstr ""
+msgstr "T5 - 困難，須攀登的高山路線"
msgid ""
"single plainly climbing up to second grade. Exposed, demanding terrain, "
"jagged rocks, few dangerous glacier and snow"
-msgstr ""
+msgstr "單一的岩壁，地形艱難、暴露感大，有裸鹽區、少數危險的冰河和積雪"
msgid "T6 - hazardous alpine trail with climbing"
-msgstr ""
+msgstr "T6 - 高風險，須攀登的高山路線"
msgid ""
"climbing up to second grade. Often very exposed, precarious jagged rocks, "
"glacier with danger to slip and fall"
-msgstr ""
+msgstr "連續岩壁，整段都非常有暴露感，連續的裸岩區、容易跌落的危險冰河"
msgid "Visibility"
msgstr "可見狀態"
msgctxt "trail_visibility"
msgid "excellent"
-msgstr ""
+msgstr "很好"
msgctxt "trail_visibility"
msgid "good"
-msgstr ""
+msgstr "好"
msgctxt "trail_visibility"
msgid "intermediate"
-msgstr ""
+msgstr "普通"
msgctxt "trail_visibility"
msgid "bad"
-msgstr ""
+msgstr "不好"
msgctxt "trail_visibility"
msgid "horrible"
-msgstr ""
+msgstr "可怕"
msgctxt "trail_visibility"
msgid "no"
-msgstr ""
+msgstr "完全沒有"
msgid "Ski"
msgstr "滑雪"
@@ -18306,43 +18583,50 @@ msgid "Dedicated Bridleway"
msgstr "專用馬道"
msgid "Cycle Lane/Track"
-msgstr "自行車道/車道"
+msgstr "自行車道"
msgid "Cycleway"
-msgstr ""
+msgstr "自行車道"
+msgctxt "cycleway"
msgid "lane"
-msgstr ""
+msgstr "與車道相連"
+msgctxt "cycleway"
msgid "track"
-msgstr ""
+msgstr "與車道分隔"
+msgctxt "cycleway"
msgid "opposite_lane"
-msgstr ""
+msgstr "相連但逆向"
+msgctxt "cycleway"
msgid "opposite_track"
-msgstr ""
+msgstr "分隔但逆向"
+msgctxt "cycleway"
msgid "opposite"
-msgstr ""
+msgstr "逆向"
+msgctxt "cycleway"
msgid "share_busway"
-msgstr ""
+msgstr "與公車共用"
+msgctxt "cycleway"
msgid "shared_lane"
-msgstr ""
+msgstr "共用車道"
msgid "Cycleway left"
-msgstr ""
+msgstr "左側"
msgid "Cycleway right"
-msgstr ""
+msgstr "右側"
msgid "Oneway (bicycle)"
-msgstr ""
+msgstr "單向通行"
msgid "Edit Highway Attributes:"
-msgstr ""
+msgstr "編輯道路特性："
msgid "Highway"
msgstr "公路"
@@ -18360,66 +18644,66 @@ msgid "Combined Foot- and Cycleway"
msgstr "合併的步行與自行車道"
msgid "Dedicated Footway"
-msgstr "專用人行步道"
+msgstr "專用步道"
msgctxt "footway"
msgid "sidewalk"
-msgstr ""
+msgstr "分離人行道"
msgctxt "footway"
msgid "crossing"
-msgstr ""
+msgstr "行人穿越道"
msgid "Steps"
msgstr "階梯"
msgid "Amount of Steps"
-msgstr ""
+msgstr "階梯數量"
msgid "Ramp"
-msgstr ""
+msgstr "斜坡"
msgid "Stroller ramp"
-msgstr ""
+msgstr "階梯間斜坡"
msgid "Bicycle ramp"
-msgstr ""
+msgstr "自行車牽引斜坡"
msgid "Wheelchair ramp"
-msgstr ""
+msgstr "輪椅斜坡"
msgid "Luggage ramp"
-msgstr ""
+msgstr "運貨用斜坡"
msgid "automatic"
-msgstr ""
+msgstr "自動化"
msgid "manual"
-msgstr ""
+msgstr "手動"
msgid "Handrail"
-msgstr ""
+msgstr "扶手"
msgid "Left handrail"
-msgstr ""
+msgstr "左側扶手"
msgid "Center handrail"
-msgstr ""
+msgstr "中央扶手"
msgid "Right handrail"
-msgstr ""
+msgstr "右側扶手"
msgid "Escalator"
-msgstr ""
+msgstr "電扶梯"
msgid "forward"
-msgstr ""
+msgstr "前進"
msgid "backward"
-msgstr ""
+msgstr "後退"
msgid "reversible"
-msgstr ""
+msgstr "可逆向"
msgid "Waypoints"
msgstr "路標"
@@ -18446,7 +18730,7 @@ msgid "Traffic Signal"
msgstr "交通號誌"
msgid "Optional crossing attributes:"
-msgstr ""
+msgstr "行人穿越道附加特性："
msgid "Pedestrian crossing type"
msgstr "行人穿越道類型"
@@ -18470,25 +18754,25 @@ msgid "zebra"
msgstr "斑馬線"
msgid "pelican"
-msgstr ""
+msgstr "鵜鶘"
msgid "toucan"
-msgstr ""
+msgstr "大嘴鳥"
msgid "puffin"
-msgstr ""
+msgstr "海鸚"
msgid "pegasus"
-msgstr ""
+msgstr "天馬"
msgid "tiger"
-msgstr ""
+msgstr "老虎"
msgid "Button operated"
-msgstr ""
+msgstr "按鈕式"
msgid "Sound signals"
-msgstr ""
+msgstr "有聲號誌"
msgid "Crossing attendant"
msgstr "有人陪同穿越"
@@ -18497,16 +18781,16 @@ msgid "Cross by bicycle"
msgstr "以自行車穿越"
msgid "Cross on horseback"
-msgstr ""
+msgstr "騎馬通過"
msgid "Optional values for specific countries"
-msgstr ""
+msgstr "特殊國家附加選項"
msgid "Stop"
msgstr "禁止通行"
msgid "Give Way"
-msgstr ""
+msgstr "前方優先"
msgid "Mini-Roundabout"
msgstr "小圓環"
@@ -18518,41 +18802,41 @@ msgid "Pedestrian Crossing"
msgstr "行人穿越道"
msgid "Tactile Paving"
-msgstr ""
+msgstr "導盲磚"
msgid "incorrect"
-msgstr ""
+msgstr "不正確"
msgid "In case of traffic signals:"
-msgstr ""
+msgstr "號誌狀況："
msgid "Traffic Calming"
msgstr "道路減速設施"
msgid "Bump"
-msgstr ""
+msgstr "寬型減速丘"
msgid "Chicane"
-msgstr ""
+msgstr "減速彎"
msgid "Choker"
-msgstr ""
+msgstr "縮減點"
msgid "Cushion"
-msgstr ""
+msgstr "小型減速丘"
msgid "Hump"
-msgstr ""
+msgstr "減速標線"
msgctxt "traffic_calming"
msgid "Island"
-msgstr ""
+msgstr "分隔島"
msgid "Rumble strip"
-msgstr ""
+msgstr "減速帶"
msgid "Table"
-msgstr ""
+msgstr "減速板"
msgid "Passing Place"
msgstr "讓車處"
@@ -18561,16 +18845,16 @@ msgid "Turning Circle"
msgstr "迴旋圈"
msgid "Turning Loop"
-msgstr ""
+msgstr "迴轉圓環"
msgid "City Limit Sign"
-msgstr ""
+msgstr "地名標示"
msgid "Second Name"
msgstr "第二名稱"
msgid "Speed Limit Sign"
-msgstr ""
+msgstr "速限標示"
msgid "Speed Camera"
msgstr "測速照相"
@@ -18582,7 +18866,7 @@ msgid "Highway milestone"
msgstr "公路里程牌"
msgid "Distance (kilometers)"
-msgstr ""
+msgstr "距離 (公里)"
msgctxt "junction=yes"
msgid "Named Junction"
@@ -18600,7 +18884,7 @@ msgid "Grit Bin"
msgstr "沙箱"
msgid "Mountain Pass"
-msgstr "鞍部"
+msgstr "埡口"
msgid "Elevation"
msgstr "海拔"
@@ -18621,13 +18905,13 @@ msgid "Bollard"
msgstr "車阻柱"
msgid "Bollard type"
-msgstr ""
+msgstr "障礙柱類型"
msgid "rising"
-msgstr ""
+msgstr "升降"
msgid "removable"
-msgstr ""
+msgstr "可移動"
msgid "plastic"
msgstr "塑膠"
@@ -18648,52 +18932,52 @@ msgid "Toll Booth"
msgstr "收費站"
msgid "Border Control"
-msgstr "國境管控站"
+msgstr "邊境管制"
msgid "Hedge"
msgstr "籬笆"
msgid "Genus"
-msgstr ""
+msgstr "屬"
msgid "Species"
-msgstr ""
+msgstr "種"
msgid "Taxon"
-msgstr ""
+msgstr "分類群"
msgid "Fence"
msgstr "欄柵"
msgid "barbed_wire"
-msgstr ""
+msgstr "有刺鐵網"
msgid "chain_link"
-msgstr ""
+msgstr "鐵網"
msgid "electric"
-msgstr ""
+msgstr "通電圍籬"
msgid "pole"
-msgstr ""
+msgstr "圍籬柱"
msgid "split_rail"
-msgstr ""
+msgstr "曲折圍籬"
msgid "wire"
-msgstr ""
+msgstr "鐵條圍籬"
msgid "Guard Rail"
-msgstr ""
+msgstr "護欄"
msgid "Wall"
msgstr "牆"
msgid "dry_stone"
-msgstr ""
+msgstr "疊石牆"
msgid "noise_barrier"
-msgstr ""
+msgstr "隔音牆"
msgid "City Wall"
msgstr "城牆"
@@ -18702,46 +18986,46 @@ msgid "Retaining Wall"
msgstr "擋土牆"
msgid "Jersey Barrier"
-msgstr ""
+msgstr "紐澤西護欄"
msgctxt "Barrier"
msgid "Ditch"
-msgstr ""
+msgstr "壕溝"
msgid "Kerb"
-msgstr ""
+msgstr "路緣石"
msgid "Tactile paving"
-msgstr ""
+msgstr "導盲磚"
msgid "Entrance (Barrier Opening)"
-msgstr ""
+msgstr "入口 (路障開啟)"
msgid "Gate"
msgstr "閘門"
msgid "Lift Gate"
-msgstr ""
+msgstr "升降閘門"
msgid "Swing Gate"
-msgstr ""
+msgstr "旋轉閘門"
msgctxt "swing_gate"
msgid "single"
-msgstr ""
+msgstr "單柵"
msgctxt "swing_gate"
msgid "double"
-msgstr ""
+msgstr "雙柵"
msgid "Hampshire Gate"
-msgstr ""
+msgstr "簡易柵門"
msgid "Bump Gate"
-msgstr ""
+msgstr "遮斷閘門"
msgid "Kissing Gate"
-msgstr ""
+msgstr "單人閘門"
msgid "Chain"
msgstr "鎖鏈"
@@ -18750,13 +19034,13 @@ msgid "Stile"
msgstr "柵欄台階"
msgid "ladder"
-msgstr ""
+msgstr "梯子"
msgid "squeezer"
-msgstr ""
+msgstr "窄口"
msgid "stepover"
-msgstr ""
+msgstr "跨點"
msgid "Turnstile"
msgstr "旋轉柵門"
@@ -18768,22 +19052,22 @@ msgid "Passageways"
msgstr "通道"
msgid "Building Passage"
-msgstr ""
+msgstr "建築物穿堂"
msgid "Arcade"
-msgstr ""
+msgstr "拱廊"
msgid "Open on left side"
-msgstr ""
+msgstr "左側透空"
msgid "Open on right side"
-msgstr ""
+msgstr "右側透空"
msgid "Colonnade"
-msgstr ""
+msgstr "列柱"
msgid "Avalanche Protector"
-msgstr ""
+msgstr "明隧道"
msgctxt "main group"
msgid "Water"
@@ -18794,10 +19078,10 @@ msgid "Water"
msgstr "水域"
msgid "Drain"
-msgstr "排水溝"
+msgstr "溝渠"
msgid "Ditch"
-msgstr "渠道"
+msgstr "小溝渠"
msgid "Stream"
msgstr "溪流"
@@ -18806,13 +19090,13 @@ msgid "River"
msgstr "河流"
msgid "Lock"
-msgstr ""
+msgstr "水門"
msgid "Canal"
msgstr "運河"
msgid "Spring"
-msgstr "泉"
+msgstr "泉水"
msgid ""
"A point where groundwater naturally flows to the surface of the earth from "
@@ -18829,154 +19113,154 @@ msgid "Dam"
msgstr "水壩"
msgid "Groyne"
-msgstr ""
+msgstr "防波堤"
msgid "Breakwater"
msgstr "堤防"
msgid "Culvert"
-msgstr ""
+msgstr "涵管"
msgid "Basin"
-msgstr ""
+msgstr "凹地"
msgid "retention"
-msgstr ""
+msgstr "調整池"
msgid "infiltration"
-msgstr ""
+msgstr "入滲池"
msgid "detention"
-msgstr ""
+msgstr "滯洪池"
msgid "Reservoir"
-msgstr "水庫"
+msgstr "蓄水池"
msgid "evaporator"
-msgstr ""
+msgstr "蒸發"
msgid "tailings"
-msgstr ""
+msgstr "礦渣池"
msgid "water_storage"
-msgstr ""
+msgstr "蓄水"
msgid "Covered Reservoir"
-msgstr "有覆蓋的水庫"
+msgstr "加蓋蓄水池"
msgctxt "natural"
msgid "Water"
-msgstr ""
+msgstr "水"
msgid "A body of standing water, such as a lake or pond."
-msgstr ""
+msgstr "有很多水聚積，像是湖泊或池塘。"
msgid "Water Body"
-msgstr ""
+msgstr "水體"
msgid "canal"
-msgstr ""
+msgstr "運河"
msgid "lake"
-msgstr ""
+msgstr "湖泊"
msgid "lagoon"
-msgstr ""
+msgstr "潟湖"
msgid "oxbow"
-msgstr ""
+msgstr "牛軛湖"
msgid "pond"
-msgstr ""
+msgstr "陂塘"
msgid "reservoir"
-msgstr ""
+msgstr "蓄水池"
msgid "river"
-msgstr ""
+msgstr "河流"
msgid "lock"
-msgstr ""
+msgstr "水門"
msgid "wastewater"
-msgstr ""
+msgstr "廢水"
msgid "Salt Water"
-msgstr ""
+msgstr "鹽水"
msgid "Is the water body intermittent (disappears seasonally)?"
-msgstr ""
+msgstr "水體不是隨時都有水 (季節性斷水)？"
msgid "Coastline"
msgstr "海岸線"
msgid ""
"Line between the sea and land (with the water on the right side of the way)."
-msgstr ""
+msgstr "海與陸地之間的線 (水在路徑的右側)。"
msgid "Riverbank"
-msgstr "河岸"
+msgstr "河床"
msgid "Wetland"
-msgstr "溼地"
+msgstr "濕地"
msgid "Waterlogged area, either permanently or seasonally with vegetation."
-msgstr ""
+msgstr "浸水的區域，可能隨時有水、或某些季節時長了植物。"
msgid "swamp"
-msgstr "沼澤"
+msgstr "林地沼澤"
msgid "bog"
-msgstr "泥沼"
+msgstr "泥炭沼澤"
msgid "marsh"
-msgstr ""
+msgstr "河流濕地"
msgid "reedbed"
-msgstr ""
+msgstr "蘆葦原"
msgid "saltmarsh"
-msgstr ""
+msgstr "鹽性濕地"
msgid "tidalflat"
-msgstr ""
+msgstr "潮埔地"
msgid "mangrove"
msgstr "紅樹林"
msgid "wet_meadow"
-msgstr ""
+msgstr "野草濕地"
msgid "string_bog"
-msgstr ""
+msgstr "細串沼澤"
msgid "saltern"
-msgstr ""
+msgstr "鹽場"
msgid "Mud"
msgstr "泥地"
msgid "Large area covered with mud."
-msgstr "有泥巴覆蓋的大型區域"
+msgstr "有泥巴覆蓋的寬闊區域。"
msgid "Beach"
msgstr "海灘"
msgid "A flat area of sand, gravel or pebble next to water."
-msgstr ""
+msgstr "充滿沙的平坦區域，水邊有卵石或細石。"
msgid "swimming"
-msgstr ""
+msgstr "游泳"
msgid "surfing"
-msgstr ""
+msgstr "衝浪"
msgid "Bay"
msgstr "海灣"
msgid ""
"A large body of water partially enclosed by land but with a wide mouth."
-msgstr ""
+msgstr "大範圍水域被陸地包圍，但仍有寬廣開口。"
msgid "Shipping"
msgstr "船運"
@@ -18989,23 +19273,23 @@ msgstr "貨櫃"
msgctxt "cargo"
msgid "passengers"
-msgstr ""
+msgstr "乘客"
msgctxt "cargo"
msgid "vehicle"
-msgstr ""
+msgstr "車輛"
msgctxt "cargo"
msgid "bicycle"
-msgstr ""
+msgstr "自行車"
msgctxt "cargo"
msgid "hgv"
-msgstr ""
+msgstr "大貨車"
msgctxt "cargo"
msgid "passengers;vehicle"
-msgstr ""
+msgstr "乘客+車輛"
msgid "Ferry Route"
msgstr "渡輪路線"
@@ -19014,85 +19298,85 @@ msgid "Marina"
msgstr "碼頭"
msgid "Dump Station"
-msgstr ""
+msgstr "廢油回收站"
msgid "public"
-msgstr "公開"
+msgstr "開放"
msgid "Marine Fuel"
-msgstr ""
+msgstr "船用燃油"
msgid "Agip"
-msgstr ""
+msgstr "阿吉普"
msgid "Aral"
-msgstr ""
+msgstr "亞拉"
msgid "Avia"
-msgstr ""
+msgstr "Avia"
msgid "BP"
-msgstr ""
+msgstr "英國石油"
msgid "Chevron"
-msgstr ""
+msgstr "雪佛龍"
msgid "Citgo"
-msgstr ""
+msgstr "雪鐵戈"
msgid "Eni"
-msgstr ""
+msgstr "埃尼"
msgid "Esso"
-msgstr ""
+msgstr "埃索"
msgid "Exxon"
-msgstr ""
+msgstr "埃克森"
msgid "Gulf"
-msgstr ""
+msgstr "海灣石油"
msgid "Mobil"
-msgstr ""
+msgstr "美孚"
msgid "OMV"
-msgstr ""
+msgstr "奧地利石油"
msgid "Petro-Canada"
-msgstr ""
+msgstr "加拿大石油"
msgid "Pioneer"
-msgstr ""
+msgstr "Pioneer"
msgid "Q8"
-msgstr ""
+msgstr "全保艾瑞"
msgid "Repsol"
-msgstr ""
+msgstr "西班牙石油"
msgid "Shell"
-msgstr ""
+msgstr "殼牌"
msgid "Socar"
-msgstr ""
+msgstr "亞塞拜然石油"
msgid "Statoil"
-msgstr ""
+msgstr "挪威石油"
msgid "Sunoco"
-msgstr ""
+msgstr "太陽石油"
msgid "Tamoil"
-msgstr ""
+msgstr "泰姆"
msgid "Texaco"
-msgstr ""
+msgstr "德士古"
msgid "Total"
-msgstr "Total"
+msgstr "合計"
msgid "Independent"
-msgstr "Independent"
+msgstr "獨立"
msgid "Fuel types:"
msgstr "燃料類型："
@@ -19104,28 +19388,28 @@ msgid "Bio Diesel"
msgstr "生質柴油"
msgid "Octane 80"
-msgstr ""
+msgstr "辛烷值 80"
msgid "Octane 91"
-msgstr ""
+msgstr "辛烷值 91"
msgid "Octane 92"
-msgstr ""
+msgstr "辛烷值 92"
msgid "Octane 95"
-msgstr ""
+msgstr "辛烷值 95"
msgid "Octane 98"
-msgstr ""
+msgstr "辛烷值 98"
msgid "Octane 100"
-msgstr ""
+msgstr "辛烷值 100"
msgid "E10 (10% Ethanol mix)"
-msgstr ""
+msgstr "E10 (10% 酒精)"
msgid "E85 (85% Ethanol mix)"
-msgstr ""
+msgstr "E85 (85% 酒精)"
msgid "LPG (Liquefied petroleum gas)"
msgstr "LPG (液化石油氣)"
@@ -19134,19 +19418,19 @@ msgid "CNG (Compressed Natural Gas)"
msgstr "CNG (壓縮天然氣)"
msgid "Pier"
-msgstr "渡頭"
+msgstr "碼頭"
msgid "Mooring"
-msgstr ""
+msgstr "停泊"
msgid "commercial"
-msgstr ""
+msgstr "商業用"
msgid "Floating"
-msgstr ""
+msgstr "浮起"
msgid "Lock Gate"
-msgstr "調節水門"
+msgstr "船閘"
msgid "Turning Point"
msgstr "調轉點"
@@ -19167,25 +19451,25 @@ msgid "Railway"
msgstr "鐵路"
msgid "Rail"
-msgstr "軌"
+msgstr "軌道"
msgid "main"
-msgstr ""
+msgstr "幹線"
msgid "branch"
-msgstr ""
+msgstr "支線"
msgid "industrial"
-msgstr "工業區"
+msgstr "工業"
msgid "military"
msgstr "軍事"
msgid "tourism"
-msgstr "旅遊"
+msgstr "客運"
msgid "freight"
-msgstr ""
+msgstr "貨運"
msgid "Narrow Gauge Rail"
msgstr "窄軌"
@@ -19194,10 +19478,10 @@ msgid "Monorail"
msgstr "單軌"
msgid "Preserved"
-msgstr "保留鐵路"
+msgstr "保存線"
msgid "Light Rail"
-msgstr "輕軌電車"
+msgstr "輕軌"
msgid "Subway"
msgstr "地下鐵"
@@ -19206,45 +19490,45 @@ msgid "Tram"
msgstr "路面電車"
msgid "Funicular"
-msgstr ""
+msgstr "地索軌道"
msgid "Bus Guideway"
-msgstr "導軌道巴士"
+msgstr "導軌巴士"
msgid "Disused Rail"
-msgstr "不使用的軌道"
+msgstr "停用線"
msgid "Abandoned Rail"
-msgstr "廢棄的軌道"
+msgstr "廢線"
msgid "Level Crossing"
-msgstr "鐵路平交道"
+msgstr "平交道"
msgid "Traffic lights"
-msgstr ""
+msgstr "號誌燈"
msgid "Barrier"
-msgstr ""
+msgstr "柵欄"
msgctxt "crossing:barrier"
msgid "yes"
-msgstr ""
+msgstr "有"
msgctxt "crossing:barrier"
msgid "no"
-msgstr ""
+msgstr "無"
msgctxt "crossing:barrier"
msgid "half"
-msgstr ""
+msgstr "半段/單側"
msgctxt "crossing:barrier"
msgid "full"
-msgstr ""
+msgstr "全段/雙側"
msgctxt "crossing:barrier"
msgid "double_half"
-msgstr ""
+msgstr "雙側半段"
msgid "Crossing"
msgstr "平交道"
@@ -19253,81 +19537,81 @@ msgid "Crossing type"
msgstr "平交道類型"
msgid "Turntable"
-msgstr "調車轉盤"
+msgstr "轉車台"
msgid "Buffer Stop"
-msgstr "緩衝停止點"
+msgstr "止衝擋"
msgid "Railway Switch"
-msgstr ""
+msgstr "道岔"
msgid "Railway Signal"
-msgstr ""
+msgstr "鐵路號誌"
msgid "Railway milestone"
-msgstr "鐵路里程牌"
+msgstr "鐵路里程"
msgid "Aerialway"
-msgstr "空中路線"
+msgstr "空中纜車"
msgid "Cable Car"
msgstr "大型纜車"
msgid "Number of people per hour"
-msgstr ""
+msgstr "每小時人數"
msgid "Number of people per car"
-msgstr ""
+msgstr "每車人數"
msgid "Typical journey time in minutes"
-msgstr ""
+msgstr "單程所需時間 (分)"
msgid "Has heating?"
-msgstr ""
+msgstr "有暖氣？"
msgid "Chair Lift"
msgstr "滑雪纜車"
msgid "Number of people per chair"
-msgstr ""
+msgstr "每椅子搭乘人數"
msgid "Has bubble?"
-msgstr ""
+msgstr "有透明遮罩？"
msgid "Gondola"
-msgstr "纜車"
+msgstr "小型纜車"
msgid "Number of people per gondola"
-msgstr ""
+msgstr "每車廂搭乘人數"
msgid "Mixed Lift"
msgstr "混合式纜車"
msgid "Number of people per gondola/chair"
-msgstr ""
+msgstr "每車廂/椅子搭乘人數"
msgid "Drag Lift"
-msgstr ""
+msgstr "牽引"
msgid ""
"drag_lift (general type - use only if exact type (see values below) is "
"unknown)"
-msgstr ""
+msgstr "牽引 (概括類型 - 只在不知道確實類型時才使用 (請看底下的數值)"
msgid "t-bar"
-msgstr ""
+msgstr "T 型桿"
msgid "j-bar"
-msgstr ""
+msgstr "J 型桿"
msgid "platter"
-msgstr ""
+msgstr "圓盤"
msgid "rope_tow"
-msgstr ""
+msgstr "牽引繩"
msgid "Magic Carpet"
-msgstr ""
+msgstr "自動步道"
msgid "Goods"
msgstr "貨物"
@@ -19343,19 +19627,19 @@ msgid "Parking"
msgstr "停車場"
msgid "Park and Ride"
-msgstr ""
+msgstr "接送撤"
msgid "bus"
msgstr "公車"
msgid "train"
-msgstr ""
+msgstr "火車"
msgid "tram"
msgstr "路面電車"
msgid "metro"
-msgstr ""
+msgstr "捷運"
msgid "ferry"
msgstr "渡輪"
@@ -19373,7 +19657,7 @@ msgid "Spaces for Parents"
msgstr "父母專用空間"
msgid "See the Wiki for other capacity:[types]=*."
-msgstr "查閱 Wiki 上的其他容量:[types]=*。"
+msgstr "查看 Wiki 上的其他容量:[types]=*。"
msgid "Parking Space"
msgstr "停車格"
@@ -19382,7 +19666,7 @@ msgid "Capacity"
msgstr "容量"
msgid "Covered (with roof)"
-msgstr "有覆蓋(具有屋頂)"
+msgstr "有加蓋 (有屋頂)"
msgid "Parking Entrance"
msgstr "停車場入口"
@@ -19397,31 +19681,31 @@ msgid "convenience"
msgstr "便利商店"
msgid "kiosk"
-msgstr ""
+msgstr "販售站"
msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
+msgstr "柴油 (氣態轉液態 - 超級柴油)"
msgid "Diesel for Heavy Good Vehicles"
-msgstr "重型貨車柴油"
+msgstr "大型載重車用柴油"
msgid "1/25 mix (mofa/moped)"
-msgstr ""
+msgstr "1/25 混合 (動力自行車)"
msgid "1/50 mix (mofa/moped)"
-msgstr ""
+msgstr "1/50 混合 (動力自行車)"
msgid "Fuel cards:"
-msgstr ""
+msgstr "加油卡："
msgid "DKV"
-msgstr ""
+msgstr "DKV"
msgid "Routex"
-msgstr ""
+msgstr "Routex"
msgid "UTA"
-msgstr ""
+msgstr "UTA"
msgid "Charging Station"
msgstr "充電站"
@@ -19430,88 +19714,91 @@ msgid "Voltage"
msgstr "電壓"
msgid "Amperage"
-msgstr ""
+msgstr "安培數"
msgid "Types of vehicles which can be charged:"
-msgstr ""
+msgstr "可使用的車種："
msgid "Scooter"
-msgstr ""
+msgstr "速克達"
msgid "Truck"
-msgstr ""
+msgstr "卡車"
msgid "Number of Sockets:"
-msgstr ""
+msgstr "插頭插座數量："
msgid "Type 1 (Yazaki)"
-msgstr ""
+msgstr "Type 1 (Yazaki)"
msgid "Type 1 Combo"
-msgstr ""
+msgstr "Type 1 Combo"
msgid "Type 2 (Mennekes)"
-msgstr ""
+msgstr "Type 2 (Mennekes)"
msgid "Type 2 Combo"
-msgstr ""
+msgstr "Type 2 Combo"
msgid "Type 3 (SCAME)"
-msgstr ""
+msgstr "Type 3 (SCAME)"
msgid "CHAdeMO"
-msgstr ""
+msgstr "CHAdeMO"
msgid "Tesla Supercharger"
-msgstr ""
+msgstr "特斯拉超級充電站"
msgid "Schuko"
-msgstr ""
+msgstr "Schuko"
msgid "CEE blue"
-msgstr ""
+msgstr "CEE 藍色"
msgid "CEE red 16A"
-msgstr ""
+msgstr "CEE 紅色 16A"
msgid "CEE red 32A"
-msgstr ""
+msgstr "CEE 紅色 32A"
msgid "NEMA 5-15"
-msgstr ""
+msgstr "NEMA 5-15"
msgid "NEMA 5-20"
-msgstr ""
+msgstr "NEMA 5-20"
msgid "Authentication:"
-msgstr ""
+msgstr "認證："
msgid "Phone call"
-msgstr ""
+msgstr "電話"
msgid "Short message"
-msgstr ""
+msgstr "簡訊"
msgid "NFC"
-msgstr ""
+msgstr "NFC"
msgid "Membership card"
-msgstr ""
+msgstr "會員卡"
msgid "Wash"
-msgstr "洗車場"
+msgstr "洗車"
+
+msgid "Self Service"
+msgstr ""
msgid "Car Dealer"
msgstr "汽車經銷商"
msgid "Second hand"
-msgstr ""
+msgstr "二手"
msgid "only"
-msgstr ""
+msgstr "僅有"
msgid "Repair"
-msgstr "修車場"
+msgstr "維修"
msgid "Parts"
msgstr "零件"
@@ -19523,94 +19810,94 @@ msgid "Rental"
msgstr "租車"
msgid "Sharing"
-msgstr "汽車分享"
+msgstr "共乘"
msgid "Motorcycle Dealer"
-msgstr "摩托車經銷商"
+msgstr "機車經銷商"
msgid "Services:"
msgstr "服務："
msgid "Sale"
-msgstr ""
+msgstr "經銷商"
msgid "brand"
-msgstr ""
+msgstr "廠牌"
msgid "oldtimer"
-msgstr ""
+msgstr "古董車"
msgid "Safety inspection"
-msgstr ""
+msgstr "安全檢驗"
msgid "DEKRA"
-msgstr ""
+msgstr "DEKRA"
msgid "GTÜ"
-msgstr ""
+msgstr "GTÜ"
msgid "MOT"
-msgstr ""
+msgstr "MOT"
msgid "TÜV"
-msgstr ""
+msgstr "TÜV"
msgid "Clothes"
msgstr "衣服"
msgid "anchors"
-msgstr ""
+msgstr "鎖座"
msgid "ground_slots"
-msgstr ""
+msgstr "地面凹槽"
msgid "informal"
-msgstr ""
+msgstr "長桿"
msgid "lockers"
-msgstr ""
+msgstr "保管箱"
msgid "rack"
-msgstr ""
+msgstr "豎立架"
msgid "shed"
-msgstr ""
+msgstr "車棚"
msgid "stands"
-msgstr ""
+msgstr "固定架"
msgid "wall_loops"
-msgstr ""
+msgstr "車輪固定架"
msgid "Covered"
-msgstr ""
+msgstr "有遮蔽"
msgid "Bike Dealer"
msgstr "自行車經銷商"
msgid "Bicycles are sold"
-msgstr ""
+msgstr "販賣自行車"
msgid "Second-hand bicycles are sold"
-msgstr ""
+msgstr "販賣二手行車"
msgid "Bicycles are repaired"
-msgstr ""
+msgstr "修理自行車"
msgid "Bicycles are rented"
-msgstr ""
+msgstr "出租自行車"
msgid "Free bicycle pump"
-msgstr ""
+msgstr "免費打氣"
msgid "Tools for do-it-yourself repair (may be a bike co-operative)"
-msgstr ""
+msgstr "自行車 DIY 維修工具 (可能提供協助)"
msgid "Bicycles are washed (for a fee)"
-msgstr ""
+msgstr "自行車可清洗 (付費)"
msgid "Public Bicycle Repair Station"
-msgstr ""
+msgstr "公眾自行車維修站"
msgid "Chain tool"
msgstr "車鏈工具"
@@ -19619,7 +19906,7 @@ msgid "Public Transport"
msgstr "大眾運輸"
msgid "Public Transport Route (Rail)"
-msgstr ""
+msgstr "大眾運輸路線 (軌道)"
msgid "Route type"
msgstr "路線類型"
@@ -19628,19 +19915,19 @@ msgid "subway"
msgstr "地下鐵"
msgid "monorail"
-msgstr ""
+msgstr "單軌"
msgid "light_rail"
-msgstr ""
+msgstr "輕軌"
msgid "stop position"
msgstr "停車位置"
msgid "stop position (exit only)"
-msgstr "停車位置(僅下車)"
+msgstr "停車位置 (僅下車)"
msgid "stop position (entry only)"
-msgstr "停車位置(僅上車)"
+msgstr "停車位置 (僅上車)"
msgid "platform"
msgstr "月台"
@@ -19655,28 +19942,28 @@ msgid "route segment"
msgstr "路線區段"
msgid "Public Transport Route (Bus)"
-msgstr ""
+msgstr "大眾運輸路線 (公車)"
msgid "trolleybus"
-msgstr ""
+msgstr "無軌電車"
msgid "Route Master"
-msgstr ""
+msgstr "路線專家"
msgid "aerialway"
-msgstr ""
+msgstr "空中纜車"
msgid "route variant/direction (at least 2)"
-msgstr ""
+msgstr "路線變換/方向 (至少要是 2)"
msgid "Stop Area"
-msgstr ""
+msgstr "停車場"
msgid "UIC reference"
-msgstr ""
+msgstr "UIC 參考號碼"
msgid "UIC name"
-msgstr ""
+msgstr "UIC 名稱"
msgid "Stop Position"
msgstr "停車位置"
@@ -19688,31 +19975,31 @@ msgid "Subway Entrance"
msgstr "地下鐵入口"
msgid "Station or amenities"
-msgstr ""
+msgstr "車站或設施"
msgid "Bus"
-msgstr ""
+msgstr "公車"
msgid "Bus stop (legacy)"
-msgstr "公車站牌 (傳統)"
+msgstr "公車停靠站 (傳統)"
msgid "Tram stop (legacy)"
msgstr "路面電車站 (傳統)"
msgid "Train"
-msgstr ""
+msgstr "火車"
msgid "Railway halt (legacy)"
-msgstr ""
+msgstr "鐵路招呼站 (傳統)"
msgid "Trolleybus"
-msgstr ""
+msgstr "無軌電車"
msgid "Share taxi"
-msgstr ""
+msgstr "共乘計程車"
msgid "Ferry"
-msgstr ""
+msgstr "渡輪"
msgid "Bench"
msgstr "長椅"
@@ -19721,7 +20008,7 @@ msgid "Shelter"
msgstr "涼亭"
msgid "Waste Basket/Trash Can"
-msgstr ""
+msgstr "垃圾桶"
msgctxt "railway"
msgid "Station"
@@ -19734,7 +20021,7 @@ msgid "Ticket Machine"
msgstr "售票機"
msgid "Reference Number"
-msgstr ""
+msgstr "參考號碼"
msgid "Public Transport (Legacy)"
msgstr "大眾運輸 (傳統)"
@@ -19749,13 +20036,13 @@ msgid "backward segment"
msgstr "後退區段"
msgid "halt point"
-msgstr ""
+msgstr "停車位置"
msgid "forward halt point"
-msgstr ""
+msgstr "下一個停車位置"
msgid "backward halt point"
-msgstr ""
+msgstr "上一個停車位置"
msgid "UIC-Reference"
msgstr "UIC-參考"
@@ -19770,13 +20057,13 @@ msgid "Railway Platform"
msgstr "鐵路月台"
msgid "Reference (track number)"
-msgstr ""
+msgstr "參考號碼 (軌道編號)"
msgid "Bus Station"
msgstr "公車車站"
msgid "Bus Stop"
-msgstr "公車站牌"
+msgstr "公車停靠站"
msgid "Bus Platform"
msgstr "公車月台"
@@ -19794,10 +20081,10 @@ msgid "Runway"
msgstr "飛機跑道"
msgid "Taxiway"
-msgstr "滑行跑道"
+msgstr "滑行道"
msgid "Holding Position"
-msgstr ""
+msgstr "等候位置"
msgid "Helipad"
msgstr "直升機停機坪"
@@ -19813,11 +20100,11 @@ msgstr "飛機庫"
msgctxt "building"
msgid "hangar"
-msgstr ""
+msgstr "機庫"
msgctxt "building"
msgid "yes"
-msgstr ""
+msgstr "是"
msgid "Beacon"
msgstr "信標"
@@ -19845,22 +20132,22 @@ msgid "Stars"
msgstr "星級"
msgid "Rooms"
-msgstr ""
+msgstr "房間"
msgid "Beds"
-msgstr ""
+msgstr "床位"
msgid "Motel"
msgstr "汽車旅館"
msgid "Guest House/Bed & Breakfast"
-msgstr ""
+msgstr "客房/B&B"
msgid "Apartment"
-msgstr ""
+msgstr "公寓"
msgid "Number of apartments"
-msgstr ""
+msgstr "公寓數量"
msgid "Chalet"
msgstr "小木屋"
@@ -19872,37 +20159,37 @@ msgid "Alpine Hut"
msgstr "高山小屋"
msgid "Wilderness Hut"
-msgstr ""
+msgstr "山屋"
msgid "Access rights"
-msgstr ""
+msgstr "使用權"
msgid "Shower"
-msgstr ""
+msgstr "淋浴間"
msgid "seasonal"
-msgstr ""
+msgstr "季節性"
msgid "Reservation"
-msgstr ""
+msgstr "預約"
msgid "required"
-msgstr ""
+msgstr "必須"
msgid "recommended"
-msgstr ""
+msgstr "建議"
msgid "members_only"
-msgstr ""
+msgstr "會員專用"
msgid "Closer Description"
-msgstr ""
+msgstr "更多說明"
msgid "Caravan Site/RV Park"
-msgstr ""
+msgstr "RV 露營區"
msgid "Number of places"
-msgstr ""
+msgstr "位置數量"
msgid "Power supply"
msgstr "電源供應"
@@ -19920,19 +20207,19 @@ msgid "Restaurant"
msgstr "餐廳"
msgid "Microbrewery"
-msgstr ""
+msgstr "小型釀造"
msgid "Outdoor seating"
-msgstr ""
+msgstr "室外座位"
msgid "Takeaway"
-msgstr ""
+msgstr "外帶"
msgid "Delivery"
-msgstr ""
+msgstr "外送"
msgid "Mo-Su 12:00-22:00"
-msgstr ""
+msgstr "週一-週日 12:00-22:00"
msgid "Fast Food"
msgstr "速食"
@@ -19944,13 +20231,13 @@ msgid "Cafe"
msgstr "咖啡"
msgid "Ice cream"
-msgstr ""
+msgstr "冰淇淋"
msgid "Pub"
-msgstr "酒店"
+msgstr "酒館"
msgid "Beer Garden"
-msgstr ""
+msgstr "啤酒庭園"
msgid "Bar"
msgstr "酒吧"
@@ -19965,34 +20252,34 @@ msgid "Viewpoint"
msgstr "觀景台"
msgid "Look-Out Tower"
-msgstr ""
+msgstr "展望塔"
msgid "Information Office"
msgstr "資訊服務處"
msgid "An office where you can get information about a town or region."
-msgstr ""
+msgstr "可以讓妳取得城鎮或地區資訊的辦公室。"
msgid "Map"
msgstr "地圖"
msgid "A board with a map."
-msgstr ""
+msgstr "附有地圖的看板。"
msgid "Detail Grade"
-msgstr ""
+msgstr "詳細度"
msgid "topo"
-msgstr ""
+msgstr "地形圖"
msgid "street"
msgstr "街"
msgid "scheme"
-msgstr ""
+msgstr "路線圖"
msgid "toposcope"
-msgstr ""
+msgstr "方位圖"
msgid "Shown Area"
msgstr "顯示區域"
@@ -20010,19 +20297,19 @@ msgid "Routes shown for:"
msgstr "路線顯示："
msgid "Hiking"
-msgstr "健走"
+msgstr "登山健行"
msgid "Cycling"
msgstr "自行車"
msgid "Mountainbiking"
-msgstr ""
+msgstr "越野自行車"
msgid "Skiing"
msgstr "滑雪"
msgid "Riding"
-msgstr ""
+msgstr "騎馬"
msgid "... other transportation modes possible"
msgstr "... 其他可能的運輸模式"
@@ -20031,7 +20318,7 @@ msgid "Information Board"
msgstr "資訊板"
msgid "A board with information."
-msgstr ""
+msgstr "說明牌"
msgid "Board Content"
msgstr "板的內容"
@@ -20052,29 +20339,29 @@ msgid "plants"
msgstr "植物"
msgid "geology"
-msgstr ""
+msgstr "地理資訊"
msgid "Guidepost"
msgstr "路牌"
msgid ""
"A Signpost/Guidepost to indicate the directions to different destinations."
-msgstr ""
+msgstr "指引往不同目的地的標示/導引牌。"
msgid "Information Terminal"
-msgstr ""
+msgstr "資訊終端機"
msgid "Information access via electronic methods."
-msgstr ""
+msgstr "用電子方式提供資訊。"
msgid "Closer description"
-msgstr ""
+msgstr "更多說明"
msgid "Audio Guide"
msgstr "語音導覽"
msgid "Information using headphones or a mobile phone."
-msgstr ""
+msgstr "用耳機禍手機聽導覽語音。"
msgid "Audioguide via mobile phone?"
msgstr "是否透過行動電話使用語音導覽？"
@@ -20083,25 +20370,25 @@ msgid "Phone number"
msgstr "電話號碼"
msgid "Other Information Point"
-msgstr ""
+msgstr "其他資訊點"
msgid "Leisure"
msgstr "休閒"
msgid "Movie Theater/Cinema"
-msgstr ""
+msgstr "電影院"
msgid "Drive-in theater"
-msgstr ""
+msgstr "汽車電影院"
msgid "3D"
-msgstr ""
+msgstr "3D"
msgid "Number of screens"
-msgstr ""
+msgstr "螢幕數"
msgid "Minimum age"
-msgstr ""
+msgstr "年齡限制"
msgid "Zoo"
msgstr "動物園"
@@ -20113,31 +20400,31 @@ msgid "fence"
msgstr "欄柵"
msgid "wall"
-msgstr ""
+msgstr "圍牆"
msgid "Amusement/Theme Park"
-msgstr ""
+msgstr "遊樂園/主題樂園"
msgid "Water Park"
msgstr "水上樂園"
msgid "Beach Resort"
-msgstr ""
+msgstr "沙灘遊樂區"
msgid "Swimming Pool"
-msgstr ""
+msgstr "游泳池"
msgid "Used for the water area only."
-msgstr ""
+msgstr "只用在這個水域。"
msgid "Fitness Station"
-msgstr ""
+msgstr "健身站"
msgid "Sauna"
msgstr "三溫暖"
msgid "Horse Riding"
-msgstr ""
+msgstr "馬場"
msgid "Playground"
msgstr "運動場"
@@ -20149,35 +20436,35 @@ msgid "Fireplace"
msgstr "壁爐"
msgid "Picnic Table"
-msgstr ""
+msgstr "野餐桌"
msgid "Public Grill"
-msgstr ""
+msgstr "烤肉區"
msgctxt "grill"
msgid "Fuel"
-msgstr ""
+msgstr "燃料"
msgid "charcoal"
-msgstr ""
+msgstr "木炭"
msgid "Firepit"
-msgstr ""
+msgstr "烤肉架"
msgid "Fishing"
msgstr "釣魚"
msgid "Bird Hide"
-msgstr ""
+msgstr "賞鳥亭"
msgid "Night Club"
msgstr "夜店"
msgid "Casino"
-msgstr ""
+msgstr "賭場"
msgid "Strip Club"
-msgstr "脫衣酒吧"
+msgstr "脫衣舞廳"
msgid "Brothel"
msgstr "妓院"
@@ -20201,195 +20488,195 @@ msgid "Artwork"
msgstr "藝術工作"
msgid "mural"
-msgstr ""
+msgstr "壁畫"
msgid "sculpture"
-msgstr ""
+msgstr "雕塑品"
msgid "statue"
-msgstr ""
+msgstr "塑像"
msgid "Artist Name"
-msgstr ""
+msgstr "創作者姓名"
msgid "Studio"
-msgstr ""
+msgstr "工作室"
msgid "audio"
msgstr "音樂"
msgid "radio"
-msgstr ""
+msgstr "廣播"
msgid "television"
-msgstr ""
+msgstr "電視"
msgid "video"
msgstr "影片"
msgid "Place of Worship"
-msgstr "宗教儀式場所"
+msgstr "宗教場所"
msgid "Church"
msgstr "教堂"
msgid "Building type"
-msgstr ""
+msgstr "建物類型"
msgid "basilica"
-msgstr ""
+msgstr "宗座聖殿"
msgid "cathedral"
-msgstr ""
+msgstr "主教座堂"
msgid "chapel"
-msgstr ""
+msgstr "小聖堂"
msgid "church"
msgstr "教堂"
msgid "temple"
-msgstr ""
+msgstr "寺廟"
msgctxt "christian"
msgid "anglican"
-msgstr ""
+msgstr "英國國教"
msgctxt "christian"
msgid "baptist"
-msgstr ""
+msgstr "浸信宗"
msgctxt "christian"
msgid "catholic"
-msgstr ""
+msgstr "天主教"
msgctxt "christian"
msgid "evangelical"
-msgstr ""
+msgstr "福音派"
msgctxt "christian"
msgid "greek_catholic"
-msgstr ""
+msgstr "希臘天主教"
msgctxt "christian"
msgid "greek_orthodox"
-msgstr ""
+msgstr "希臘正教"
msgctxt "christian"
msgid "jehovahs_witness"
-msgstr ""
+msgstr "耶和華見證人"
msgctxt "christian"
msgid "lutheran"
-msgstr ""
+msgstr "路德宗"
msgctxt "christian"
msgid "methodist"
-msgstr ""
+msgstr "衛理宗"
msgctxt "christian"
msgid "mormon"
-msgstr ""
+msgstr "摩門教"
msgctxt "christian"
msgid "new_apostolic"
-msgstr ""
+msgstr "新使徒教會"
msgctxt "christian"
msgid "orthodox"
-msgstr ""
+msgstr "正教會"
msgctxt "christian"
msgid "pentecostal"
-msgstr ""
+msgstr "五旬節教派"
msgctxt "christian"
msgid "presbyterian"
-msgstr ""
+msgstr "長老教派"
msgctxt "christian"
msgid "protestant"
-msgstr ""
+msgstr "基督新教"
msgctxt "christian"
msgid "quaker"
-msgstr ""
+msgstr "貴格會"
msgctxt "christian"
msgid "roman_catholic"
-msgstr ""
+msgstr "羅馬天主教"
msgctxt "christian"
msgid "russian_orthodox"
-msgstr ""
+msgstr "俄羅斯正教"
msgctxt "christian"
msgid "seventh_day_adventist"
-msgstr ""
+msgstr "基督復臨安息日會"
msgctxt "christian"
msgid "spiritist"
-msgstr ""
+msgstr "唯靈論者"
msgid "Mosque"
-msgstr ""
+msgstr "清真寺"
msgid "mosque"
-msgstr ""
+msgstr "清真寺"
msgid "ibadi"
-msgstr ""
+msgstr "伊巴德派"
msgid "Synagogue"
-msgstr ""
+msgstr "猶太會堂"
msgid "synagogue"
-msgstr ""
+msgstr "猶太會堂"
msgctxt "jewish"
msgid "orthodox"
-msgstr ""
+msgstr "正統派"
msgctxt "jewish"
msgid "conservative"
-msgstr ""
+msgstr "保守派"
msgctxt "jewish"
msgid "reform"
-msgstr ""
+msgstr "改革派"
msgid "Buddhist Temple"
-msgstr ""
+msgstr "佛教寺廟"
msgid "theravada"
-msgstr ""
+msgstr "上座部佛教"
msgid "mahayana"
-msgstr ""
+msgstr "大乘佛教"
msgid "vajrayana"
-msgstr ""
+msgstr "密宗"
msgid "Hindu Temple"
-msgstr ""
+msgstr "印度教寺廟"
msgid "vaishnavism"
-msgstr ""
+msgstr "毘濕奴派"
msgid "shaivism"
-msgstr ""
+msgstr "濕婆派"
msgid "shaktism"
-msgstr ""
+msgstr "性力派"
msgid "smartism"
-msgstr ""
+msgstr "師摩多派"
msgid "Shinto Shrine"
-msgstr ""
+msgstr "神道教神社"
msgid "Other Place of Worship"
-msgstr ""
+msgstr "其他宗教場所"
msgid "Public Building"
msgstr "公共建築"
@@ -20413,7 +20700,7 @@ msgid "Police"
msgstr "警察局"
msgid "Ranger Station"
-msgstr "護林員工作站"
+msgstr "林工作站"
msgid "Fire Station"
msgstr "消防隊"
@@ -20482,10 +20769,10 @@ msgid "Point Name"
msgstr "連絡點名稱"
msgid "Emergency Phone Number"
-msgstr ""
+msgstr "緊急電話號碼"
msgid "(Use number as shown on plate.)"
-msgstr ""
+msgstr "(使用標示在牌子上的號碼。)"
msgid "Veterinary"
msgstr "獸醫"
@@ -20500,7 +20787,7 @@ msgid "Automated Defibrillator"
msgstr "自動心臟去顫器"
msgid "Location description"
-msgstr ""
+msgstr "位置說明"
msgid "Phone Number"
msgstr "電話號碼"
@@ -20509,19 +20796,19 @@ msgid "Located inside a building?"
msgstr "位於建築裡面？"
msgid "Last check date (YYYY-MM-DD)"
-msgstr ""
+msgstr "最後檢查日期 (YYYY-MM-DD)"
msgid "Last check note"
-msgstr ""
+msgstr "最後檢查註記"
msgid "Fire Extinguisher"
-msgstr ""
+msgstr "滅火器"
msgid "Indoor"
-msgstr ""
+msgstr "室內"
msgid "Fire Hose"
-msgstr ""
+msgstr "消防水管"
msgid "Fire Hydrant"
msgstr "消防栓"
@@ -20532,162 +20819,162 @@ msgstr "地下"
msgctxt "pipeline"
msgid "pillar"
-msgstr ""
+msgstr "立式"
msgctxt "pipeline"
msgid "wall"
-msgstr ""
+msgstr "牆面"
msgctxt "pipeline"
msgid "pond"
-msgstr ""
+msgstr "水池"
msgid "Diameter (in mm)"
-msgstr ""
+msgstr "直徑 (公釐)"
msgid "Hydrant Position"
-msgstr ""
+msgstr "消防栓位置"
msgctxt "hydrant position"
msgid "lane"
-msgstr ""
+msgstr "車道"
msgctxt "hydrant position"
msgid "parking_lot"
-msgstr ""
+msgstr "停車場"
msgctxt "hydrant position"
msgid "sidewalk"
-msgstr ""
+msgstr "人行道"
msgctxt "hydrant position"
msgid "green"
-msgstr ""
+msgstr "果嶺"
msgid "Pressure (in bar)"
-msgstr ""
+msgstr "壓力 (巴)"
msgid "suction"
-msgstr ""
+msgstr "汲水點"
msgid "Count"
-msgstr ""
+msgstr "數量"
msgid "Water Tank"
-msgstr ""
+msgstr "水槽"
msgid "Volume (in liters)"
-msgstr ""
+msgstr "水量 (公升)"
msgid "Assembly Point"
-msgstr ""
+msgstr "會合地點"
msgid "Emergency Phone"
msgstr "緊急電話"
msgid "Siren"
-msgstr ""
+msgstr "警報"
msgid "pneumatic"
-msgstr ""
+msgstr "空氣式"
msgid "electronic"
-msgstr ""
+msgstr "電力式"
msgid "mechanical"
-msgstr ""
+msgstr "機械式"
msgid "Purpose"
-msgstr ""
+msgstr "警報狀況"
msgid "tornado"
-msgstr ""
+msgstr "龍捲風"
msgid "fire"
-msgstr ""
+msgstr "火災"
msgid "air_raid"
-msgstr ""
+msgstr "空襲"
msgid "civil_defense"
-msgstr ""
+msgstr "民防"
msgid "Range (in meters)"
-msgstr ""
+msgstr "警報範圍 (公尺)"
msgid "Social Facility"
-msgstr ""
+msgstr "社會機構"
msgid "Nursing Home"
-msgstr ""
+msgstr "安養中心"
msgid "Group Home"
-msgstr ""
+msgstr "療養院"
msgid "For"
-msgstr ""
+msgstr "對象"
msgid "Assisted Living"
-msgstr ""
+msgstr "協助生活"
msgid "Outreach"
-msgstr ""
+msgstr "外展工作"
msgctxt "social_facility"
msgid "Shelter"
-msgstr ""
+msgstr "庇護機構"
msgid "Food Bank"
-msgstr ""
+msgstr "實物銀行"
msgid "Toilets/Restrooms"
-msgstr ""
+msgstr "廁所/休息室"
msgctxt "restroom"
msgid "Female"
-msgstr ""
+msgstr "女用"
msgctxt "restroom"
msgid "Male"
-msgstr ""
+msgstr "男用"
msgctxt "restroom"
msgid "Unisex"
-msgstr ""
+msgstr "中性"
msgid "flush"
-msgstr ""
+msgstr "沖水馬桶"
msgid "pitlatrine"
-msgstr ""
+msgstr "直落式"
msgid "chemical"
-msgstr ""
+msgstr "化學處理"
msgid "bucket"
-msgstr ""
+msgstr "收存容器"
msgid "Usage Position"
-msgstr ""
+msgstr "形式"
msgid "seated"
-msgstr ""
+msgstr "坐式馬桶"
msgid "seated;urinal"
-msgstr ""
+msgstr "坐式馬桶+小便斗"
msgid "squat"
-msgstr ""
+msgstr "蹲式馬桶"
msgid "urinal"
-msgstr ""
+msgstr "小便斗"
msgctxt "toilets"
msgid "Diaper"
-msgstr ""
+msgstr "尿布枱"
msgid "room"
-msgstr ""
+msgstr "專用房間"
msgid "Post Box"
msgstr "郵筒"
@@ -20697,22 +20984,22 @@ msgstr "收信時間"
msgctxt "post_box"
msgid "pillar"
-msgstr ""
+msgstr "直立"
msgctxt "post_box"
msgid "lamp"
-msgstr ""
+msgstr "柱立"
msgctxt "post_box"
msgid "wall"
-msgstr ""
+msgstr "牆上"
msgctxt "post_box"
msgid "meter"
-msgstr ""
+msgstr "預付郵件"
msgid "Drive through"
-msgstr ""
+msgstr "免下車"
msgid "Telephone"
msgstr "電話"
@@ -20722,13 +21009,13 @@ msgstr "硬幣"
msgctxt "payment"
msgid "Notes"
-msgstr ""
+msgstr "紙鈔"
msgid "Telephone cards"
msgstr "電話卡"
msgid "Internet Cafe"
-msgstr ""
+msgstr "網咖"
msgid "Internet Access"
msgstr "網路存取點"
@@ -20746,22 +21033,22 @@ msgid "digital"
msgstr "數位"
msgid "sundial"
-msgstr ""
+msgstr "日晷"
msgid "unorthodox"
-msgstr ""
+msgstr "非傳統顯示"
msgid "Visibility/readability"
msgstr "能見度/可讀性"
msgid "house (up to 5m)"
-msgstr ""
+msgstr "5 公尺內可見"
msgid "street (up to 20m)"
-msgstr ""
+msgstr "20 公尺內可見"
msgid "area (more than 20m)"
-msgstr ""
+msgstr "20 公尺外可見"
msgid "Shows current date"
msgstr "顯示目前的日期"
@@ -20773,13 +21060,13 @@ msgid "Shows barometric pressure"
msgstr "顯示氣壓"
msgid "Shows humidity"
-msgstr "顯示溼度"
+msgstr "顯示濕度"
msgid "Photo booth"
-msgstr ""
+msgstr "快照亭"
msgid "Recycling Container"
-msgstr ""
+msgstr "回收點"
msgid "Batteries"
msgstr "電池"
@@ -20788,31 +21075,31 @@ msgid "Cans"
msgstr "瓶罐"
msgid "Cardboard"
-msgstr ""
+msgstr "紙箱"
msgid "Electrical Appliances"
-msgstr ""
+msgstr "電器"
msgid "Glass"
msgstr "玻璃"
msgid "Glass Bottles"
-msgstr ""
+msgstr "玻璃瓶"
msgid "Green Waste"
-msgstr ""
+msgstr "生質廢棄物"
msgid "Paper"
msgstr "紙張"
msgid "Plastic"
-msgstr ""
+msgstr "塑膠"
msgid "Plastic Bottles"
-msgstr ""
+msgstr "塑膠瓶"
msgid "Plastic Packaging"
-msgstr ""
+msgstr "塑膠包裝材料"
msgid "Scrap Metal"
msgstr "廢金屬"
@@ -20821,98 +21108,98 @@ msgid "Shoes"
msgstr "鞋類"
msgid "Small Appliances"
-msgstr ""
+msgstr "小家電"
msgid "Waste"
-msgstr ""
+msgstr "一般廢棄物"
msgid "Recycling Centre"
-msgstr ""
+msgstr "回收中心"
msgid "Waste Disposal/Dumpster"
-msgstr ""
+msgstr "垃圾子車/垃圾集中點"
msgid "Sanitary Dump Station"
-msgstr ""
+msgstr "排泄物集中站"
msgid "Suction pumpout"
-msgstr ""
+msgstr "化糞池蓋"
msgid "Gravity drain for hose"
-msgstr ""
+msgstr "排泄接管口"
msgid "Casette or Elsan Disposal"
-msgstr ""
+msgstr "排泄物收集盒"
msgid "Operation times"
msgstr "運作時間"
msgid "Backrest"
-msgstr ""
+msgstr "靠背"
msgid "Amount of Seats"
msgstr "座椅數量"
msgid "Type of shelter"
-msgstr ""
+msgstr "涼亭類型"
msgctxt "shelter"
msgid "basic_hut"
-msgstr ""
+msgstr "小屋"
msgctxt "shelter"
msgid "lean_to"
-msgstr ""
+msgstr "單面開"
msgctxt "shelter"
msgid "picnic_shelter"
-msgstr ""
+msgstr "野餐涼亭"
msgctxt "shelter"
msgid "public_transport"
-msgstr ""
+msgstr "候車亭"
msgctxt "shelter"
msgid "weather_shelter"
-msgstr ""
+msgstr "遮雨亭"
msgctxt "shelter"
msgid "wildlife_hide"
-msgstr ""
+msgstr "觀獸亭"
msgid "Hunting Stand"
-msgstr ""
+msgstr "狩獵台"
msgctxt "hunting stand"
msgid "Hide"
-msgstr ""
+msgstr "遮蔽"
msgid "Lockable"
-msgstr ""
+msgstr "可上鎖"
msgid "Water Point"
-msgstr ""
+msgstr "飲水供給點"
msgid "Animal watering place"
-msgstr ""
+msgstr "動物飲水場所"
msgid "Compressed Air"
-msgstr ""
+msgstr "壓縮氣體"
msgid "Valves"
-msgstr ""
+msgstr "氣嘴"
msgid "Dunlop (Woods)"
-msgstr ""
+msgstr "Dunlop (Woods) (英式)"
msgid "Schrader"
-msgstr ""
+msgstr "Schrader (美式)"
msgid "Sclaverand (Presta)"
-msgstr ""
+msgstr "Sclaverand (Presta) (法式)"
msgid "Regina"
-msgstr ""
+msgstr "Regina (義式)"
msgid "Advertising Column"
msgstr "廣告欄位"
@@ -20933,19 +21220,19 @@ msgid "Sports Centre"
msgstr "運動中心"
msgid "Fitness Centre"
-msgstr ""
+msgstr "健身中心"
msgid "Pitch"
-msgstr "球場"
+msgstr "運動場"
msgid "artificial_turf"
-msgstr ""
+msgstr "人工草皮"
msgid "decoturf"
-msgstr ""
+msgstr "DecoTurf"
msgid "tartan"
-msgstr ""
+msgstr "塑膠"
msgid "Racetrack"
msgstr "跑道"
@@ -21014,7 +21301,7 @@ msgstr "多種"
msgctxt "running"
msgid "pitch"
-msgstr "球場"
+msgstr "田徑場"
msgctxt "running"
msgid "sports_centre"
@@ -21022,7 +21309,7 @@ msgstr "運動中心"
msgctxt "running"
msgid "fitness_centre"
-msgstr ""
+msgstr "健身中心"
msgctxt "running"
msgid "stadium"
@@ -21055,7 +21342,7 @@ msgstr "獨木舟/皮划艇"
msgctxt "racing"
msgid "pitch"
-msgstr "球場"
+msgstr "賽場"
msgctxt "racing"
msgid "sports_centre"
@@ -21082,7 +21369,7 @@ msgid "Gymnastics"
msgstr "體操"
msgid "fitness_centre"
-msgstr ""
+msgstr "健身中心"
msgid "Ice Skating"
msgstr "溜冰"
@@ -21109,85 +21396,85 @@ msgid "Scuba Diving"
msgstr "浮潛"
msgid "Piste type"
-msgstr ""
+msgstr "滑雪道類型"
msgid "downhill"
-msgstr ""
+msgstr "下坡"
msgid "nordic"
-msgstr ""
+msgstr "北歐式"
msgid "skitour"
-msgstr ""
+msgstr "雪地健行"
msgid "sled"
-msgstr ""
+msgstr "人力雪橇"
msgid "sleigh"
-msgstr ""
+msgstr "獸力雪橇"
msgid "snow_park"
-msgstr ""
+msgstr "雪地遊樂園"
msgid "Difficulty"
msgstr "困難度"
msgctxt "piste:difficulty"
msgid "novice"
-msgstr ""
+msgstr "初學者"
msgctxt "piste:difficulty"
msgid "easy"
-msgstr ""
+msgstr "簡單"
msgctxt "piste:difficulty"
msgid "intermediate"
-msgstr ""
+msgstr "普通"
msgctxt "piste:difficulty"
msgid "advanced"
-msgstr ""
+msgstr "進階"
msgctxt "piste:difficulty"
msgid "expert"
-msgstr ""
+msgstr "專家級"
msgctxt "piste:difficulty"
msgid "freeride"
-msgstr ""
+msgstr "極難"
msgid "Grooming"
-msgstr ""
+msgstr "整理"
msgctxt "piste:grooming"
msgid "classic"
-msgstr ""
+msgstr "傳統"
msgctxt "piste:grooming"
msgid "mogul"
-msgstr ""
+msgstr "起伏"
msgctxt "piste:grooming"
msgid "skating"
-msgstr ""
+msgstr "滑雪板"
msgctxt "piste:grooming"
msgid "classic;skating"
-msgstr ""
+msgstr "傳統+滑雪板"
msgctxt "piste:grooming"
msgid "scooter"
-msgstr ""
+msgstr "雪上摩托車"
msgctxt "piste:grooming"
msgid "backcountry"
-msgstr ""
+msgstr "山岳滑雪"
msgid "Shooting"
msgstr "射擊"
msgid "Sport (Ball)"
-msgstr "運動（球類）"
+msgstr "運動 (球類)"
msgid "Soccer"
msgstr "足球"
@@ -21217,10 +21504,10 @@ msgid "Rounders"
msgstr "繞圈球"
msgid "Rugby League"
-msgstr ""
+msgstr "聯盟式橄欖球"
msgid "Rugby Union"
-msgstr ""
+msgstr "聯合式橄欖球"
msgid "Baseball"
msgstr "棒球"
@@ -21229,239 +21516,235 @@ msgid "Basketball"
msgstr "籃球"
msgid "Handball"
-msgstr ""
+msgstr "手球"
msgid "Volleyball"
msgstr "排球"
msgid "Beach Volleyball"
-msgstr ""
+msgstr "沙灘排球"
msgid "Billiards"
-msgstr ""
+msgstr "撞球"
msgid "golf_course"
msgstr "高爾夫路線"
msgid "Boule"
-msgstr ""
+msgstr "滾球"
msgid "Lawn Bowling"
-msgstr ""
+msgstr "草地滾球"
msgid "Cricket"
-msgstr ""
+msgstr "板球"
msgid "Croquet"
msgstr "木球"
msgid "Field Hockey"
-msgstr ""
+msgstr "草地曲棍球"
msgid "Ice Hockey"
-msgstr ""
+msgstr "冰上曲棍球"
msgid "Pelota"
msgstr "回力球"
msgid "Racquetball"
-msgstr ""
+msgstr "美式壁球"
msgid "Table Tennis/Ping-Pong"
-msgstr ""
+msgstr "桌球/乒乓球"
msgid "Tennis"
msgstr "網球"
msgid "Motorsport"
-msgstr ""
+msgstr "賽車"
msgid "Kart Racing"
-msgstr ""
+msgstr "卡丁車"
msgid "Motocross"
-msgstr ""
+msgstr "越野賽車"
msgid "Model Aerodrome"
-msgstr ""
+msgstr "遙控飛機"
msgctxt "aerialway"
msgid "pitch"
-msgstr ""
+msgstr "飛行場"
msgctxt "aerialway"
msgid "sports_centre"
-msgstr ""
+msgstr "運動中心"
msgctxt "aerialway"
msgid "track"
-msgstr ""
+msgstr "跑道"
msgid "RC Car"
-msgstr ""
+msgstr "遙控車"
msgid "Man Made"
msgstr "人造物"
msgctxt "building"
msgid "roof"
-msgstr ""
+msgstr "頂蓋"
msgctxt "building"
msgid "garage"
-msgstr ""
+msgstr "私人車庫"
msgctxt "building"
msgid "garages"
-msgstr ""
-
-msgctxt "building"
-msgid "industrial"
-msgstr ""
+msgstr "集合車庫"
msgctxt "building"
msgid "school"
-msgstr ""
+msgstr "校舍"
msgctxt "building"
msgid "commercial"
-msgstr ""
+msgstr "商業建築"
msgctxt "building"
msgid "service"
-msgstr ""
+msgstr "公用事業設備"
msgctxt "building"
msgid "train_station"
-msgstr ""
+msgstr "車站"
msgctxt "building"
msgid "barn"
-msgstr ""
+msgstr "穀倉"
msgctxt "building"
msgid "stable"
-msgstr ""
+msgstr "馬廄"
msgctxt "building"
msgid "cabin"
-msgstr ""
+msgstr "小木屋"
msgctxt "building"
msgid "farm_auxiliary"
-msgstr ""
+msgstr "農舍"
msgctxt "building"
msgid "transportation"
-msgstr ""
+msgstr "轉運站"
msgctxt "building"
msgid "greenhouse"
-msgstr ""
+msgstr "溫室"
msgctxt "building"
msgid "office"
-msgstr ""
+msgstr "辦公室"
msgctxt "building"
msgid "university"
-msgstr ""
+msgstr "大學"
msgctxt "building"
msgid "college"
-msgstr ""
+msgstr "學院"
msgctxt "building"
msgid "hospital"
-msgstr ""
+msgstr "醫院"
msgctxt "building"
msgid "kindergarten"
-msgstr ""
+msgstr "幼稚園"
msgctxt "building"
msgid "manufacture"
-msgstr ""
+msgstr "製造廠房"
msgctxt "building"
msgid "warehouse"
-msgstr ""
+msgstr "倉庫"
msgctxt "building"
msgid "retail"
-msgstr ""
+msgstr "店面"
msgctxt "building"
msgid "shed"
-msgstr ""
+msgstr "農具間"
msgctxt "building"
msgid "storage_tank"
-msgstr ""
+msgstr "儲存槽"
msgctxt "building"
msgid "supermarket"
-msgstr ""
+msgstr "超市"
msgctxt "building"
msgid "gasometer"
-msgstr ""
+msgstr "儲油槽"
msgctxt "building"
msgid "silo"
-msgstr ""
+msgstr "筒倉"
msgctxt "building"
msgid "cowshed"
-msgstr ""
+msgstr "牛舍"
msgctxt "building"
msgid "construction"
-msgstr ""
+msgstr "興建中"
msgctxt "building"
msgid "basilica"
-msgstr ""
+msgstr "宗座聖殿"
msgctxt "building"
msgid "cathedral"
-msgstr ""
+msgstr "主教座堂"
msgctxt "building"
msgid "chapel"
-msgstr ""
+msgstr "小聖堂"
msgctxt "building"
msgid "church"
-msgstr ""
+msgstr "教堂"
msgctxt "building"
msgid "temple"
-msgstr ""
+msgstr "寺廟"
msgctxt "building"
msgid "mosque"
-msgstr ""
+msgstr "清真寺"
msgctxt "building"
msgid "synagogue"
-msgstr ""
+msgstr "猶太會堂"
msgctxt "building"
msgid "transformer_tower"
-msgstr ""
+msgstr "變電塔"
msgctxt "building"
msgid "public"
-msgstr ""
+msgstr "公家建築"
msgctxt "building"
msgid "ruins"
-msgstr ""
+msgstr "廢墟"
msgctxt "building"
msgid "Levels"
-msgstr ""
+msgstr "樓層數"
msgid "Residential Building"
msgstr "住宅建築"
@@ -21472,88 +21755,88 @@ msgstr "住宅建築"
msgctxt "building"
msgid "apartments"
-msgstr ""
+msgstr "公寓"
msgctxt "building"
msgid "house"
-msgstr ""
+msgstr "住宅"
msgctxt "building"
msgid "hotel"
-msgstr ""
+msgstr "旅館"
msgctxt "building"
msgid "hut"
-msgstr ""
+msgstr "小屋"
msgctxt "building"
msgid "bungalow"
-msgstr ""
+msgstr "平房"
msgctxt "building"
msgid "dormitory"
-msgstr ""
+msgstr "宿舍"
msgctxt "building"
msgid "terrace"
-msgstr ""
+msgstr "排屋"
msgctxt "building"
msgid "detached"
-msgstr ""
+msgstr "獨棟住宅"
msgctxt "building"
msgid "farm"
-msgstr ""
+msgstr "農家住宅"
msgid "Building part"
-msgstr ""
+msgstr "部份建物"
msgctxt "building"
msgid "Skipped Levels"
-msgstr ""
+msgstr "跳過的樓層"
msgid "Skipped height (meters)"
-msgstr ""
+msgstr "跳過的高度"
msgid "Entrance"
msgstr "入口"
msgctxt "entrance"
msgid "yes"
-msgstr ""
+msgstr "有"
msgctxt "entrance"
msgid "main"
-msgstr ""
+msgstr "主要"
msgctxt "entrance"
msgid "service"
-msgstr ""
+msgstr "工作人員用"
msgctxt "entrance"
msgid "exit"
-msgstr ""
+msgstr "出口"
msgctxt "entrance"
msgid "emergency"
-msgstr ""
+msgstr "緊急用"
msgctxt "entrance"
msgid "staircase"
-msgstr ""
+msgstr "樓梯間"
msgid "Entrance number"
-msgstr ""
+msgstr "入口編號"
msgid "Flat numbers"
-msgstr ""
+msgstr "樓層"
msgid "Tower"
msgstr "塔"
msgid "Tower type"
-msgstr "塔類型"
+msgstr "塔狀"
msgid "communication"
msgstr "通訊"
@@ -21562,7 +21845,7 @@ msgid "observation"
msgstr "觀測"
msgid "Flagpole"
-msgstr ""
+msgstr "旗杆"
msgid "Works"
msgstr "作品"
@@ -21577,132 +21860,132 @@ msgid "Gasometer"
msgstr "貯氣桶"
msgid "Silo"
-msgstr ""
+msgstr "筒倉"
msgid "Storage Tank"
-msgstr ""
+msgstr "儲存槽"
msgctxt "content"
msgid "fuel"
-msgstr ""
+msgstr "燃料"
msgctxt "content"
msgid "manure"
-msgstr ""
+msgstr "肥料"
msgctxt "content"
msgid "oil"
-msgstr ""
+msgstr "油料"
msgctxt "content"
msgid "sewage"
-msgstr ""
+msgstr "污水"
msgctxt "content"
msgid "silage"
-msgstr ""
+msgstr "未發酵飼料"
msgctxt "content"
msgid "slurry"
-msgstr ""
+msgstr "泥漿"
msgctxt "content"
msgid "water"
-msgstr ""
+msgstr "水"
msgctxt "content"
msgid "wine"
-msgstr ""
+msgstr "酒"
msgid "Bunker Silo"
-msgstr ""
+msgstr "青貯槽"
msgid "Crane"
msgstr "起重機"
msgid "Mineshaft"
-msgstr ""
+msgstr "豎井"
msgid "Function"
-msgstr ""
+msgstr "用途"
msgid "winding"
-msgstr ""
+msgstr "人員物資用"
msgid "air"
-msgstr ""
+msgstr "通風用"
msgid "Depth in meters"
-msgstr "深度（公尺）"
+msgstr "深度 (公尺)"
msgid "Resource"
-msgstr ""
+msgstr "資源"
msgid "aggregate"
-msgstr ""
+msgstr "砂石"
msgid "bauxite"
-msgstr ""
+msgstr "鋁土"
msgid "coal"
-msgstr "燃媒"
+msgstr "煤"
msgid "copper"
-msgstr ""
+msgstr "銅"
msgid "dimension_stone"
-msgstr ""
+msgstr "石料"
msgid "gold"
-msgstr ""
+msgstr "黃金"
msgid "ilmenite"
-msgstr ""
+msgstr "鈦鐵礦"
msgid "iron_ore"
-msgstr ""
+msgstr "鐵礦"
msgid "lead"
-msgstr ""
+msgstr "鉛"
msgid "limestone"
-msgstr ""
+msgstr "石灰岩"
msgid "nickel"
-msgstr ""
+msgstr "鎳"
msgid "rutile"
-msgstr ""
+msgstr "金紅石"
msgid "salt"
-msgstr ""
+msgstr "鹽"
msgid "silver"
-msgstr ""
+msgstr "銀"
msgid "tin"
-msgstr ""
+msgstr "錫"
msgid "zinc"
-msgstr ""
+msgstr "鋅"
msgid "zircon"
-msgstr ""
+msgstr "鋯"
msgid "Visible Headframe"
-msgstr ""
+msgstr "外露井架"
msgid "Disused"
msgstr "不使用"
msgid "Adit"
-msgstr ""
+msgstr "坑口"
msgid "Length in meters"
-msgstr ""
+msgstr "長度 (公尺)"
msgid "Pipeline"
-msgstr "油管"
+msgstr "管線"
msgctxt "pipeline"
msgid "underwater"
@@ -21713,10 +21996,10 @@ msgid "overground"
msgstr "地上"
msgid "Pipeline Marker"
-msgstr ""
+msgstr "管線標示"
msgid "Pipeline Valve"
-msgstr ""
+msgstr "管線閥門"
msgid "Water Tower"
msgstr "貯水塔"
@@ -21725,7 +22008,7 @@ msgid "Water Works"
msgstr "水工廠"
msgid "Wastewater Treatment Plant"
-msgstr ""
+msgstr "污水處理廠"
msgid "Watermill"
msgstr "水車"
@@ -21743,73 +22026,73 @@ msgid "Street Lamp"
msgstr "路燈"
msgid "Monitoring Station"
-msgstr ""
+msgstr "檢測站"
msgid "Monitoring:"
-msgstr ""
+msgstr "監測："
msgid "Water level"
-msgstr ""
+msgstr "水位"
msgid "Tide Level"
-msgstr ""
+msgstr "潮位"
msgid "Groundwater"
-msgstr ""
+msgstr "地下水"
msgid "Traffic"
-msgstr ""
+msgstr "交通"
msgid "Air Quality"
-msgstr ""
+msgstr "空氣品質"
msgid "Noise"
-msgstr ""
+msgstr "噪音"
msgid "GPS Signals"
-msgstr ""
+msgstr "GPS 訊號"
msgid "GLONASS Signals"
-msgstr ""
+msgstr "GLONASS 訊號"
msgid "Galileo Signals"
-msgstr ""
+msgstr "伽利略系統訊號"
msgid "Weather"
-msgstr ""
+msgstr "天氣"
msgid "Radiation"
-msgstr ""
+msgstr "輻射"
msgid "Seismic Activity"
-msgstr ""
+msgstr "地震活動"
msgid "Recording:"
-msgstr ""
+msgstr "記錄："
msgid "Automated"
-msgstr ""
+msgstr "自動"
msgid "Manually"
-msgstr ""
+msgstr "人工"
msgid "Remote"
-msgstr ""
+msgstr "遠端"
msgid "Display:"
-msgstr ""
+msgstr "顯示："
msgid "Analog"
-msgstr ""
+msgstr "類比"
msgid "Digital"
-msgstr ""
+msgstr "數位"
msgid "Survey Point"
msgstr "測量點"
msgid "Surveillance Camera"
-msgstr ""
+msgstr "監視器"
msgid "indoor"
msgstr "室內"
@@ -21818,822 +22101,822 @@ msgid "outdoor"
msgstr "戶外"
msgid "Zone"
-msgstr ""
+msgstr "區域"
msgid "parking"
-msgstr ""
+msgstr "停車"
msgid "traffic"
-msgstr ""
+msgstr "交通"
msgid "shop"
msgstr "商店"
msgid "bank"
-msgstr ""
+msgstr "銀行"
msgid "Camera"
-msgstr ""
+msgstr "攝影機"
msgctxt "camera:type"
msgid "fixed"
-msgstr ""
+msgstr "固定"
msgctxt "camera:type"
msgid "panning"
-msgstr ""
+msgstr "擺動"
msgctxt "camera:type"
msgid "dome"
-msgstr ""
+msgstr "球型"
msgid "Mounted on"
-msgstr ""
+msgstr "裝置於"
msgctxt "camera:mount"
msgid "wall"
-msgstr ""
+msgstr "牆壁"
msgctxt "camera:mount"
msgid "pole"
-msgstr ""
+msgstr "杆子"
msgctxt "camera:mount"
msgid "ceiling"
-msgstr ""
+msgstr "天花板"
msgid "Direction in degrees"
-msgstr ""
+msgstr "方向 (角度)"
msgid "Inclination in degrees"
-msgstr ""
+msgstr "傾角 (角度)"
msgid "Bridges"
-msgstr ""
+msgstr "橋樑"
msgid "aqueduct"
-msgstr ""
+msgstr "高架水道"
msgid "boardwalk"
-msgstr ""
+msgstr "木棧走道"
msgid "cantilever"
-msgstr ""
+msgstr "懸臂"
msgid "covered"
-msgstr ""
+msgstr "加蓋"
msgid "low_water_crossing"
-msgstr ""
+msgstr "漫水橋"
msgid "trestle"
-msgstr ""
+msgstr "棧橋"
msgid "viaduct"
-msgstr ""
+msgstr "高架橋"
msgid "Structure"
-msgstr ""
+msgstr "結構"
msgid "arch"
-msgstr ""
+msgstr "拱橋"
msgid "beam"
-msgstr ""
+msgstr "橫樑橋"
msgid "truss"
-msgstr ""
+msgstr "桁架橋"
msgid "floating"
-msgstr ""
+msgstr "浮橋"
msgid "suspension"
-msgstr ""
+msgstr "吊橋"
msgid "cable-stayed"
-msgstr ""
+msgstr "斜張橋"
msgid "simple-suspension"
-msgstr ""
+msgstr "簡易吊橋"
msgid "humpback"
-msgstr ""
+msgstr "弓形橋"
msgid "Movable Bridge"
-msgstr ""
+msgstr "開合橋"
msgid "bascule"
-msgstr ""
+msgstr "上開橋"
msgid "drawbridge"
msgstr "吊橋"
msgid "lift"
-msgstr ""
+msgstr "升降橋"
msgid "submersible"
-msgstr ""
+msgstr "下潛橋"
msgid "swing"
-msgstr ""
+msgstr "平轉橋"
msgid "transporter"
-msgstr ""
+msgstr "運渡橋"
msgid "Bridge Support"
-msgstr ""
+msgstr "橋樑支撐"
msgid "pier"
-msgstr ""
+msgstr "橋墩"
msgid "abutment"
-msgstr ""
+msgstr "橋台"
msgid "lift_pier"
-msgstr ""
+msgstr "升降橋橋墩"
msgid "pivot_pier"
-msgstr ""
+msgstr "選轉軸橋墩"
msgid "Bridge outline"
-msgstr ""
+msgstr "橋樑外緣"
msgctxt "preset group"
msgid "Military"
-msgstr ""
+msgstr "軍事"
msgid "Airfield"
-msgstr ""
+msgstr "空軍基地"
msgid "Barracks"
-msgstr ""
+msgstr "營舍"
msgid "Bunker"
-msgstr ""
+msgstr "掩體"
msgid "pillbox"
-msgstr ""
+msgstr "碉堡"
msgid "munitions"
-msgstr ""
+msgstr "彈藥庫"
msgid "hardened_aircraft_shelter"
-msgstr ""
+msgstr "戰機掩體"
msgctxt "bunker"
msgid "underground"
-msgstr ""
+msgstr "地下"
msgctxt "bunker"
msgid "overground"
-msgstr ""
+msgstr "地上"
msgid "Historic"
-msgstr ""
+msgstr "古蹟"
msgid "Ruins"
msgstr "遺跡"
msgid "Range"
-msgstr ""
+msgstr "靶場"
msgid "Power"
msgstr "電力"
msgid "Power Plant"
-msgstr ""
+msgstr "發電廠"
msgid "Output forms of energy (optional):"
-msgstr ""
+msgstr "能源輸出形式"
msgid "Power Generator"
msgstr "發電機組"
msgid "Biofuel Power Generator"
-msgstr ""
+msgstr "生質燃料發電機組"
msgid "Generator Type"
-msgstr ""
+msgstr "發電機組類型"
msgid "gas_turbine"
-msgstr ""
+msgstr "燃氣渦輪"
msgid "reciprocating_engine"
-msgstr ""
+msgstr "活塞引擎"
msgid "steam_generator"
-msgstr ""
+msgstr "蒸氣發電機"
msgid "Biogas Power Generator"
-msgstr ""
+msgstr "生質氣體發電機組"
msgid "Biomass Power Generator"
-msgstr ""
+msgstr "生質發電機組"
msgid "Method"
-msgstr ""
+msgstr "發電方法"
msgctxt "generator method"
msgid "anaerobic_digestion"
-msgstr ""
+msgstr "厭氧消化發電"
msgctxt "generator method"
msgid "combustion"
-msgstr ""
+msgstr "燃燒氧化發電"
msgctxt "generator method"
msgid "gasification"
-msgstr ""
+msgstr "發酵發電"
msgid "bioreactor"
-msgstr ""
+msgstr "生質反應器"
msgid "anaerobic_digestion / combustion"
-msgstr ""
+msgstr "厭氧消化 / 氧化"
msgid "pyrolysis"
-msgstr ""
+msgstr "裂解"
msgid "combustion"
-msgstr ""
+msgstr "燃燒氧化"
msgid "steam_turbine"
-msgstr ""
+msgstr "蒸汽渦輪"
msgid "Coal Power Generator"
-msgstr ""
+msgstr "燃煤發電機組"
msgid "Gas Power Generator"
-msgstr ""
+msgstr "燃氣發電機組"
msgid "combined_cycle"
-msgstr ""
+msgstr "複合循環"
msgid "Oil Power Generator"
-msgstr ""
+msgstr "燃油發電機組"
msgid "Diesel Power Generator"
-msgstr ""
+msgstr "燃柴油發電機組"
msgid "Gasoline Power Generator"
-msgstr ""
+msgstr "燃汽油發電機組"
msgid "Nuclear Reactor"
-msgstr ""
+msgstr "核子反應爐"
msgctxt "generator method"
msgid "fission"
-msgstr ""
+msgstr "核分裂發電"
msgctxt "generator method"
msgid "fusion"
-msgstr ""
+msgstr "核融合發電"
msgid "Boiling Water Reactor 1 (BWR-1)"
-msgstr ""
+msgstr "沸水反應爐 1 (BWR-1)"
msgid "fission"
-msgstr ""
+msgstr "核分裂"
msgid "Boiling Water Reactor 2 (BWR-2)"
-msgstr ""
+msgstr "沸水反應爐 2 (BWR-2)"
msgid "Boiling Water Reactor 3 (BWR-3)"
-msgstr ""
+msgstr "沸水反應爐 3 (BWR-3)"
msgid "Boiling Water Reactor 4 (BWR-4)"
-msgstr ""
+msgstr "沸水反應爐 4 (BWR-4)"
msgid "Boiling Water Reactor 5 (BWR-5)"
-msgstr ""
+msgstr "沸水反應爐 5 (BWR-5)"
msgid "Boiling Water Reactor 6 (BWR-6)"
-msgstr ""
+msgstr "沸水反應爐 6 (BWR-6)"
msgid "CANada Deuterium Uranium reactor (CANDU)"
-msgstr ""
+msgstr "加拿大重水鈾反應爐 (CANDU)"
msgid "cold-fusion"
-msgstr ""
+msgstr "常溫核融合"
msgid "fusion"
-msgstr ""
+msgstr "核融合"
msgid "China Pressurized Reactor (CPR-1000)"
-msgstr ""
+msgstr "中國改進型壓水反應爐 (CPR-1000)"
msgid "European Pressurized Reactor (EPR)"
-msgstr ""
+msgstr "歐洲壓水反應爐 (EPR)"
msgid "Inertial Confinement Fusion (ICF)"
-msgstr ""
+msgstr "慣性局限核融合 (ICF)"
msgid "Pressurized water reactor (PWR)"
-msgstr ""
+msgstr "壓水反應爐 (PWR)"
msgid "Reactor Bolshoy Moshchnosti Kanalniy 1000 (RBMK-1000)"
-msgstr ""
+msgstr "壓力管式石墨慢化沸水反應爐 1000 (RBMK-1000)"
msgid "Reactor Bolshoy Moshchnosti Kanalniy 1500 (RBMK-1500)"
-msgstr ""
+msgstr "壓力管式石墨慢化沸水反應爐 1500 (RBMK-1500)"
msgid "stellarator"
-msgstr ""
+msgstr "仿星器"
msgid "tokamak"
-msgstr ""
+msgstr "環磁機"
msgid "Vodo-Vodyanoi Energetichesky Reactor (VVER)"
-msgstr ""
+msgstr "俄羅斯壓水反應爐 (VVER)"
msgid "Solar Power Generator"
-msgstr ""
+msgstr "太陽能發電機組"
msgctxt "generator method"
msgid "photovoltaic"
-msgstr ""
+msgstr "太陽能發電"
msgctxt "generator method"
msgid "thermal"
-msgstr ""
+msgstr "熱能發電"
msgid "solar_photovoltaic_panel"
-msgstr ""
+msgstr "太陽能光電板"
msgid "photovoltaic"
-msgstr ""
+msgstr "太陽光電"
msgid "solar_thermal_collector"
-msgstr ""
+msgstr "太陽能熱力集中器"
msgid "thermal"
-msgstr ""
+msgstr "太陽熱能"
msgid "Waste Power Generator"
-msgstr ""
+msgstr "垃圾焚化發電機組"
msgctxt "generator method"
msgid "pyrolysis"
-msgstr ""
+msgstr "裂解發電"
msgid "gasification"
-msgstr ""
+msgstr "發酵"
msgid "Water Turbine"
-msgstr ""
+msgstr "水輪機"
msgctxt "generator method"
msgid "run-of-the-river"
-msgstr ""
+msgstr "川流發電"
msgctxt "generator method"
msgid "water-pumped-storage"
-msgstr ""
+msgstr "抽蓄水發電"
msgctxt "generator method"
msgid "water-storage"
-msgstr ""
+msgstr "儲水發電"
msgid "francis_turbine"
-msgstr ""
+msgstr "法蘭西斯式水輪機"
msgid "all methods"
-msgstr ""
+msgstr "所有方法"
msgid "hydrodynamic_screw"
-msgstr ""
+msgstr "流體動力螺旋"
msgid "run-of-the-river"
-msgstr ""
+msgstr "川流"
msgid "kaplan_turbine"
-msgstr ""
+msgstr "卡布蘭式水輪機"
msgid "run-of-the-river / water-storage"
-msgstr ""
+msgstr "川流 / 蓄水"
msgid "pelton_turbine"
-msgstr ""
+msgstr "佩爾頓式水輪機"
msgid "Tidal Water Turbine"
-msgstr ""
+msgstr "潮汐水輪機"
msgctxt "generator method"
msgid "barrage"
-msgstr ""
+msgstr "潮汐發電"
msgctxt "generator method"
msgid "stream"
-msgstr ""
+msgstr "海流發電"
msgid "horizontal_axis"
-msgstr ""
+msgstr "水平軸"
msgid "barrage"
-msgstr ""
+msgstr "潮汐"
msgid "vertical_axis"
-msgstr ""
+msgstr "垂直軸"
msgid "Wave Energy Converter"
-msgstr ""
+msgstr "海浪能量轉換器"
msgid "Osmotic Power Generator"
-msgstr ""
+msgstr "海水鹽差發電機組"
msgid "Geothermal Power Generator"
-msgstr ""
+msgstr "地熱發電機組"
msgid "heat_pump"
-msgstr ""
+msgstr "熱力幫浦"
msgid "Wind Turbine"
-msgstr ""
+msgstr "風力渦輪"
msgid "Power Substation"
-msgstr ""
+msgstr "變電所"
msgid "Type of substation"
-msgstr ""
+msgstr "變電所類型"
msgctxt "power"
msgid "transmission"
-msgstr ""
+msgstr "輸電用"
msgctxt "power"
msgid "distribution"
-msgstr ""
+msgstr "配電用"
msgctxt "power"
msgid "minor_distribution"
-msgstr ""
+msgstr "小型配電用"
msgctxt "power"
msgid "converter"
-msgstr ""
+msgstr "轉換變頻"
msgctxt "power"
msgid "compensation"
-msgstr ""
+msgstr "補償"
msgctxt "power"
msgid "transition"
-msgstr ""
+msgstr "轉換"
msgctxt "power"
msgid "traction"
-msgstr ""
+msgstr "鐵路用"
msgctxt "power"
msgid "industrial"
-msgstr ""
+msgstr "工業用"
msgid "Power rating (kVA/MVA)"
-msgstr ""
+msgstr "額定電力 (KVA/MVA)"
msgid "2700 kVA"
-msgstr ""
+msgstr "2700 kVA"
msgid "12500 kVA"
-msgstr ""
+msgstr "12500 kVA"
msgid "15 MVA"
-msgstr ""
+msgstr "15 MVA"
msgid "50 MVA"
-msgstr ""
+msgstr "50 MVA"
msgid "100 MVA"
-msgstr ""
+msgstr "100 MVA"
msgid "Gas insulated"
-msgstr ""
+msgstr "瓦斯絕緣"
msgid "Power Transformer"
-msgstr ""
+msgstr "變壓器"
msgid "Type of transformer"
-msgstr ""
+msgstr "變壓器類型"
msgctxt "power"
msgid "generator"
-msgstr ""
+msgstr "發電機組"
msgctxt "power"
msgid "auto"
-msgstr ""
+msgstr "自動"
msgctxt "power"
msgid "phase_angle_regulator"
-msgstr ""
+msgstr "正交升壓器."
msgctxt "power"
msgid "yes"
-msgstr ""
+msgstr "是"
msgid "Phases"
-msgstr ""
+msgstr "相數"
msgid "Power Switchgear"
-msgstr ""
+msgstr "電力開關"
msgid ""
"(Please only use this tag if more detailed mapping using busbars and bays is "
"impossible!)"
-msgstr ""
+msgstr "(請只使用這個標籤，否則製作更詳細的圖時不能用母線和線架！)"
msgid "Power Busbar"
-msgstr ""
+msgstr "電力母線"
msgid "Power Bay"
-msgstr ""
+msgstr "電力線架"
msgid "Power Switch"
-msgstr ""
+msgstr "電力開關"
msgid "Power Converter"
-msgstr ""
+msgstr "變電器"
msgid "Type of converter"
-msgstr ""
+msgstr "變電器類型"
msgctxt "power"
msgid "lcc"
-msgstr ""
+msgstr "Icc"
msgctxt "power"
msgid "vsc"
-msgstr ""
+msgstr "Vsc"
msgctxt "power"
msgid "back-to-back"
-msgstr ""
+msgstr "背靠背"
msgid "Amount of poles"
-msgstr ""
+msgstr "極點數"
msgid "monopole"
-msgstr ""
+msgstr "單極點"
msgid "bipole"
-msgstr ""
+msgstr "雙極點"
msgid "Power rating (MVA)"
-msgstr ""
+msgstr "額定電力 (MVA)"
msgid "Power Compensator"
-msgstr ""
+msgstr "電力補償器"
msgid "Type of compensator"
-msgstr ""
+msgstr "補償器類型"
msgctxt "power"
msgid "shunt_reactor"
-msgstr ""
+msgstr "並聯電抗器"
msgctxt "power"
msgid "shunt_capacitor"
-msgstr ""
+msgstr "並聯電容器組"
msgctxt "power"
msgid "static_var"
-msgstr ""
+msgstr "靜態虛功補償器"
msgctxt "power"
msgid "statcom"
-msgstr ""
+msgstr "靜態同步補償器"
msgctxt "power"
msgid "synchronous_condenser"
-msgstr ""
+msgstr "同步調相機"
msgctxt "power"
msgid "filter"
-msgstr ""
+msgstr "諧波濾波器"
msgctxt "power"
msgid "series_reactor"
-msgstr ""
+msgstr "串聯電抗器"
msgctxt "power"
msgid "series_capacitor"
-msgstr ""
+msgstr "串聯電容器"
msgid "Power rating (kvar/Mvar)"
-msgstr ""
+msgstr "額定電力 (KVAR/MVAR)"
msgid "500 kvar"
-msgstr ""
+msgstr "500 KVAR"
msgid "1 Mvar"
-msgstr ""
+msgstr "1 MVAR"
msgid "5 Mvar"
-msgstr ""
+msgstr "5 MVAR"
msgid "Power Street Cabinet"
-msgstr ""
+msgstr "變電箱"
msgid "Transformer Tower"
-msgstr ""
+msgstr "變電塔"
msgid "Power Portal"
-msgstr ""
+msgstr "電力門架"
msgid "Type of construction"
-msgstr ""
+msgstr "結構"
msgid "lattice"
-msgstr ""
+msgstr "格狀"
msgid "tubular"
-msgstr ""
+msgstr "空心"
msgid "solid"
-msgstr ""
+msgstr "實心"
msgid "steel"
-msgstr ""
+msgstr "鋼製"
msgctxt "color"
msgid "red/white"
-msgstr ""
+msgstr "紅色/白色"
msgid "Portal design"
-msgstr ""
+msgstr "門架設計"
msgctxt "power"
msgid "portal"
-msgstr ""
+msgstr "單層門架"
msgctxt "power"
msgid "portal_two-level"
-msgstr ""
+msgstr "雙層門架"
msgctxt "power"
msgid "portal_three-level"
-msgstr ""
+msgstr "三層門架"
msgid "Power Tower"
msgstr "電塔"
msgctxt "power"
msgid "Tower type"
-msgstr ""
+msgstr "電塔類型"
msgctxt "power"
msgid "suspension"
-msgstr ""
+msgstr "垂懸"
msgctxt "power"
msgid "anchor"
-msgstr ""
+msgstr "錨定"
msgctxt "power"
msgid "termination"
-msgstr ""
+msgstr "終端"
msgctxt "power"
msgid "branch"
-msgstr ""
+msgstr "分岔"
msgctxt "power"
msgid "transposing"
-msgstr ""
+msgstr "調換"
msgctxt "power"
msgid "crossing"
-msgstr ""
+msgstr "跨越"
msgid "Branch tower type"
-msgstr ""
+msgstr "分岔電塔類型"
msgctxt "power"
msgid "tap"
-msgstr ""
+msgstr "分接"
msgctxt "power"
msgid "split"
-msgstr ""
+msgstr "分離"
msgctxt "power"
msgid "loop"
-msgstr ""
+msgstr "迴圈"
msgctxt "power"
msgid "cross"
-msgstr ""
+msgstr "交叉"
msgid "Tower design"
-msgstr ""
+msgstr "電塔設計"
msgctxt "power"
msgid "one-level"
-msgstr ""
+msgstr "單層"
msgctxt "power"
msgid "two-level"
-msgstr ""
+msgstr "雙層"
msgctxt "power"
msgid "donau"
-msgstr ""
+msgstr "多瑙型"
msgctxt "power"
msgid "three-level"
-msgstr ""
+msgstr "三層"
msgctxt "power"
msgid "barrel"
-msgstr ""
+msgstr "木桶型"
msgctxt "power"
msgid "asymmetric"
-msgstr ""
+msgstr "不對稱型"
msgctxt "power"
msgid "triangle"
-msgstr ""
+msgstr "三角形"
msgctxt "power"
msgid "flag"
-msgstr ""
+msgstr "單側型 (flag)"
msgctxt "power"
msgid "donau;one-level"
-msgstr ""
+msgstr "多腦型+單層"
msgctxt "power"
msgid "four-level"
-msgstr ""
+msgstr "四層"
msgctxt "power"
msgid "six-level"
-msgstr ""
+msgstr "五層"
msgctxt "power"
msgid "nine-level"
-msgstr ""
+msgstr "六曾"
msgctxt "power"
msgid "delta"
-msgstr ""
+msgstr "倒三角形"
msgctxt "power"
msgid "delta_two-level"
-msgstr ""
+msgstr "倒三角形+雙層"
msgctxt "power"
msgid "y-frame"
-msgstr ""
+msgstr "Y 型"
msgctxt "power"
msgid "x-frame"
-msgstr ""
+msgstr "X 型"
msgctxt "power"
msgid "h-frame"
-msgstr ""
+msgstr "H 型"
msgctxt "power"
msgid "guyed_h-frame"
-msgstr ""
+msgstr "微張 H 型"
msgctxt "power"
msgid "guyed_v-frame"
-msgstr ""
+msgstr "微張 Y 型"
msgctxt "power"
msgid "bipole"
-msgstr ""
+msgstr "雙桿"
msgctxt "power"
msgid "monopolar"
-msgstr ""
+msgstr "單極"
msgid "Triple tower"
-msgstr ""
+msgstr "三塔"
msgid "Incomplete tower"
-msgstr ""
+msgstr "未完成"
msgid "Location transition"
-msgstr ""
+msgstr "位置轉換"
msgid "Pole"
-msgstr "電線竿"
+msgstr "電桿"
msgid "Pole with Transformer"
-msgstr ""
+msgstr "附變壓器"
msgid "Pole Attributes:"
-msgstr ""
+msgstr "電桿屬性："
msgid "Transformer Attributes:"
-msgstr ""
+msgstr "變壓器屬性："
msgid "Insulator"
-msgstr ""
+msgstr "礙子"
msgid "Power Line"
msgstr "電線"
@@ -22642,84 +22925,99 @@ msgid "Line type"
msgstr "電線類型"
msgid "line"
-msgstr ""
+msgstr "超高壓電纜"
msgid "minor_line"
-msgstr ""
+msgstr "高壓電纜"
msgid "Number of conductors/wires per cable"
-msgstr ""
+msgstr "每組纜線含有線數"
msgctxt "power"
msgid "single"
-msgstr ""
+msgstr "單線"
msgctxt "power"
msgid "double"
-msgstr ""
+msgstr "雙線"
msgctxt "power"
msgid "triple"
-msgstr ""
+msgstr "三線"
msgctxt "power"
msgid "quad"
-msgstr ""
+msgstr "四線"
msgctxt "power"
msgid "fivefold"
-msgstr ""
+msgstr "五線"
msgctxt "power"
msgid "sixfold"
-msgstr ""
+msgstr "六線"
msgctxt "power"
msgid "eightfold"
-msgstr ""
+msgstr "八線"
msgid "Used for data communications"
-msgstr ""
+msgstr "附帶資料傳輸"
msgid "Power Cable"
-msgstr ""
+msgstr "電力纜線"
msgctxt "power cable"
msgid "underground"
-msgstr ""
+msgstr "地下"
msgctxt "power cable"
msgid "underwater"
-msgstr ""
+msgstr "水下"
msgctxt "power cable"
msgid "overground"
-msgstr ""
+msgstr "地上"
msgid "Historic Places"
-msgstr "歷史地區"
+msgstr "歷史場所"
msgid "Castle"
msgstr "城堡"
msgid "stately"
-msgstr ""
+msgstr "法式城堡"
msgid "defensive"
-msgstr ""
+msgstr "防禦性"
msgid "fortress"
-msgstr ""
+msgstr "要塞"
msgid "manor"
-msgstr ""
+msgstr "莊園"
msgid "palace"
-msgstr ""
+msgstr "宮殿"
msgid "Archaeological Site"
msgstr "考古遺址"
+msgid "tumulus"
+msgstr "山陵"
+
+msgid "megalith"
+msgstr "巨石遺跡"
+
+msgid "fortification"
+msgstr "防禦工事"
+
+msgid "settlement"
+msgstr "古聚落"
+
+msgid "necropolis"
+msgstr "墓葬"
+
msgid "Battlefield"
msgstr "戰場"
@@ -22727,53 +23025,53 @@ msgid "Palaeontological Site"
msgstr "古生物遺址"
msgid "Monument"
-msgstr "紀念建築"
+msgstr "紀念物"
msgid "Memorial"
msgstr "紀念碑"
msgctxt "memorial"
msgid "statue"
-msgstr ""
+msgstr "塑像"
msgctxt "memorial"
msgid "bust"
-msgstr ""
+msgstr "胸像"
msgctxt "memorial"
msgid "plaque"
-msgstr ""
+msgstr "紀念牌"
msgctxt "memorial"
msgid "stele"
-msgstr ""
+msgstr "紀念碑"
msgctxt "memorial"
msgid "stone"
-msgstr ""
+msgstr "刻石"
msgctxt "memorial"
msgid "war_memorial"
msgstr "戰爭紀念碑"
msgid "Inscription"
-msgstr ""
+msgstr "碑文"
msgid "Wayside Cross"
-msgstr ""
+msgstr "路旁十字架"
msgid "Wayside Shrine"
-msgstr ""
+msgstr "路旁祠堂"
msgid "Place of worship"
-msgstr "宗教崇拜場所"
+msgstr "宗教場所"
msgctxt "building"
msgid "wayside_shrine"
-msgstr ""
+msgstr "路旁祠堂"
msgid "Boundary Stone"
-msgstr "邊界石"
+msgstr "界石"
msgid "Shops"
msgstr "商店"
@@ -22788,10 +23086,10 @@ msgid "Convenience Store"
msgstr "便利商店"
msgid "Kiosk"
-msgstr ""
+msgstr "販售站"
msgid "Bakery"
-msgstr ""
+msgstr "麵包店"
msgid "Butcher"
msgstr "肉類"
@@ -22800,19 +23098,19 @@ msgid "Seafood"
msgstr "海產"
msgid "Dairy"
-msgstr ""
+msgstr "乳製品"
msgid "Deli (Fine Food)"
-msgstr ""
+msgstr "高級食品"
msgid "Pastry"
-msgstr ""
+msgstr "糕點"
msgid "Confectionery"
-msgstr ""
+msgstr "甜點"
msgid "Tea"
-msgstr "荼"
+msgstr "茶"
msgid "Coffee"
msgstr "咖啡"
@@ -22827,46 +23125,46 @@ msgid "Greengrocer"
msgstr "生鮮食品"
msgid "Farm Stand"
-msgstr ""
+msgstr "農產經銷站"
msgid "Organic/Bio"
-msgstr ""
+msgstr "有機"
msgid "Fair Trade"
-msgstr ""
+msgstr "公平貿易"
msgid "Alcohol"
-msgstr "酒類"
+msgstr "烈酒"
msgid "Beverages"
-msgstr "飲料類"
+msgstr "飲料"
msgid "Wine"
-msgstr ""
+msgstr "酒類"
msgid "Boutique"
-msgstr ""
+msgstr "時裝精品"
msgid "Outdoor"
msgstr "戶外用品"
msgid "Dry Cleaning"
-msgstr "乾洗類"
+msgstr "乾洗"
msgid "Laundry"
msgstr "洗衣店"
msgid "Tailor"
-msgstr ""
+msgstr "裁縫"
msgid "Fabric"
-msgstr ""
+msgstr "布料"
msgid "Electronic"
msgstr "電子"
msgid "Computer"
-msgstr "電腦類"
+msgstr "電腦"
msgid "Electronics"
msgstr "電子材料"
@@ -22896,7 +23194,7 @@ msgid "Bank"
msgstr "銀行"
msgid "Automated Teller Machine"
-msgstr "自動提款機(ATM)"
+msgstr "自動提款機"
msgid "Money Exchange"
msgstr "金錢兌換所"
@@ -22920,22 +23218,22 @@ msgid "Curtain"
msgstr "窗簾店"
msgid "Art"
-msgstr ""
+msgstr "藝術品"
msgid "Frame"
-msgstr ""
+msgstr "架子"
msgid "Bed"
-msgstr ""
+msgstr "床"
msgid "Interior Decoration"
msgstr "室內設計"
msgid "Antiques"
-msgstr ""
+msgstr "古董"
msgid "Printed Material"
-msgstr ""
+msgstr "書報雜誌"
msgid "Stationery"
msgstr "文具類"
@@ -22947,40 +23245,40 @@ msgid "Book Store"
msgstr "書店"
msgid "Newspaper Stand"
-msgstr ""
+msgstr "書報架"
msgid "Ticket"
-msgstr ""
+msgstr "票券"
msgid "For the body"
-msgstr ""
+msgstr "藥妝"
msgid "Chemist"
msgstr "藥妝類"
msgid "Cosmetics"
-msgstr ""
+msgstr "化妝品"
msgid "Perfumery"
-msgstr ""
+msgstr "香水"
msgid "Beauty"
-msgstr ""
+msgstr "美裝"
msgid "Tobacco"
-msgstr ""
+msgstr "香菸"
msgid "Hairdresser/Barber"
-msgstr ""
+msgstr "美髮/理容"
msgid "Female"
-msgstr ""
+msgstr "女用"
msgid "Male"
-msgstr ""
+msgstr "男用"
msgid "Unisex"
-msgstr ""
+msgstr "中性"
msgid "Tattoo"
msgstr "刺青"
@@ -23013,13 +23311,13 @@ msgid "Garden Centre"
msgstr "園藝中心"
msgid "Do-It-Yourself Store"
-msgstr ""
+msgstr "DIY 商店"
msgid "Hardware"
-msgstr "硬體"
+msgstr "五金行"
msgid "Paint"
-msgstr ""
+msgstr "油漆"
msgid "Travel Agency"
msgstr "旅行社"
@@ -23028,52 +23326,52 @@ msgid "Musical Instrument"
msgstr "樂器"
msgid "Toys"
-msgstr "玩具類"
+msgstr "玩具"
msgid "Gift/Souvenir"
-msgstr ""
+msgstr "禮物/名產"
msgid "Variety Store"
-msgstr ""
+msgstr "雜貨店"
msgid "Bookmaker"
-msgstr ""
+msgstr "簽注站"
msgid "Lottery"
-msgstr ""
+msgstr "彩券"
msgid "Bag"
-msgstr ""
+msgstr "包包"
msgid "Pet"
-msgstr ""
+msgstr "寵物"
msgid "Photo"
-msgstr ""
+msgstr "相片"
msgid "Funeral Directors"
-msgstr ""
+msgstr "葬儀社"
msgid "Vending Machine"
-msgstr ""
+msgstr "自動販賣機"
msgid "Vending products"
msgstr "販賣產品"
msgid "admission_tickets"
-msgstr ""
+msgstr "門票"
msgid "animal_feed"
-msgstr ""
+msgstr "飼料"
msgid "bicycle_tube"
-msgstr ""
+msgstr "自行車內胎"
msgid "cigarettes"
msgstr "菸"
msgid "coffee"
-msgstr ""
+msgstr "咖啡"
msgid "condoms"
msgstr "保險套"
@@ -23082,37 +23380,37 @@ msgid "drinks"
msgstr "飲料"
msgid "elongated_coin"
-msgstr ""
+msgstr "硬幣壓印"
msgid "excrement_bags"
-msgstr ""
+msgstr "寵物排遺袋"
msgid "food"
msgstr "食物"
msgid "milk"
-msgstr ""
+msgstr "牛奶"
msgid "newspapers"
-msgstr ""
+msgstr "報紙"
msgid "parking_tickets"
msgstr "停車繳費"
msgid "parcel_pickup"
-msgstr ""
+msgstr "包裹取件"
msgid "parcel_mail_in"
-msgstr ""
+msgstr "包裹寄送"
msgid "photos"
msgstr "相片"
msgid "public_transport_tickets"
-msgstr ""
+msgstr "交通票券"
msgid "SIM_cards"
-msgstr ""
+msgstr "手機 SIM 卡"
msgid "stamps"
msgstr "郵票"
@@ -23121,37 +23419,37 @@ msgid "sweets"
msgstr "甜點"
msgid "telephone_vouchers"
-msgstr ""
+msgstr "手機儲值卡"
msgid "toys"
msgstr "玩具"
msgid "Payment Methods"
-msgstr ""
+msgstr "付款方法"
msgid "Debit cards"
-msgstr ""
+msgstr "簽帳卡"
msgid "BankAxess"
-msgstr ""
+msgstr "BankAxess"
msgid "Bancomat"
-msgstr ""
+msgstr "Bancomat"
msgid "Girocard"
-msgstr ""
+msgstr "Girocard"
msgid "Laser"
-msgstr ""
+msgstr "雷射"
msgid "Maestro"
-msgstr ""
+msgstr "Maestro"
msgid "Visa Debit"
msgstr "Visa簽帳卡"
msgid "Visa Electron"
-msgstr ""
+msgstr "VISA 電子商務卡"
msgid "Credit cards"
msgstr "信用卡"
@@ -23160,10 +23458,10 @@ msgid "American Express"
msgstr "美國運通卡"
msgid "Diners Club"
-msgstr ""
+msgstr "大來國際"
msgid "Discover Card"
-msgstr ""
+msgstr "發現卡"
msgid "JCB"
msgstr "JCM"
@@ -23178,52 +23476,52 @@ msgid "Electronic purses and Charge cards"
msgstr "電子錢包或收費卡"
msgid "Avant (fi)"
-msgstr ""
+msgstr "Avant (芬蘭)"
msgid "Cash (ch)"
-msgstr ""
+msgstr "現金 (ch)"
msgid "Chipknip (nl)"
-msgstr ""
+msgstr "Chipknip (荷蘭)"
msgid "Geldkarte (de)"
-msgstr ""
+msgstr "Geldkarte (德國)"
msgid "Mep (pt)"
-msgstr ""
+msgstr "Mep (葡萄牙)"
msgid "Minicash (lu)"
-msgstr ""
+msgstr "Minicash (盧森堡)"
msgid "Minipay (it)"
-msgstr ""
+msgstr "Minipay (義大利)"
msgid "Mondero (ar)"
-msgstr ""
+msgstr "Mondero (阿根廷)"
msgid "Mondero 4b (es)"
-msgstr ""
+msgstr "Mondero 4b (西班牙)"
msgid "Moneo (fr)"
-msgstr ""
+msgstr "Moneo (法國)"
msgid "Proton (be)"
-msgstr ""
+msgstr "Proton (比利時)"
msgid "Quick (au)"
-msgstr ""
+msgstr "Quick (澳洲)"
msgid "Cryptocurrencies"
-msgstr ""
+msgstr "加密貨幣"
msgid "Bitcoin"
-msgstr ""
+msgstr "比特幣"
msgid "Dogecoin"
-msgstr ""
+msgstr "旺旺幣"
msgid "Litecoin"
-msgstr ""
+msgstr "萊特幣"
msgid "Offices"
msgstr "辦公室"
@@ -23362,49 +23660,49 @@ msgid "Winery"
msgstr "酒廠"
msgid "Hvac"
-msgstr "暖通空調"
+msgstr "冷暖空調"
msgid "Painter"
-msgstr "畫幅"
+msgstr "畫家"
msgid "Stonemason"
msgstr "石匠"
msgid "Handicraft"
-msgstr ""
+msgstr "手工藝"
msgid "Pottery"
-msgstr ""
+msgstr "陶藝"
msgid "Key cutter"
-msgstr ""
+msgstr "打鑰匙"
msgid "Caterer"
-msgstr ""
+msgstr "宴會承辦"
msgid "Roofer"
-msgstr ""
+msgstr "屋頂修繕"
msgid "Beekeeper"
-msgstr ""
+msgstr "養蜂人"
msgid "Blacksmith"
-msgstr ""
+msgstr "鐵匠"
msgid "Locksmith"
-msgstr ""
+msgstr "鎖匠"
msgid "Window construction"
-msgstr ""
+msgstr "製作窗戶"
msgid "Upholsterer"
-msgstr ""
+msgstr "家具商"
msgid "Tiler"
-msgstr ""
+msgstr "磁磚師父"
msgid "Geography"
-msgstr "地理學"
+msgstr "地理"
msgid "Boundaries"
msgstr "邊界"
@@ -23413,25 +23711,25 @@ msgid "Administrative"
msgstr "行政區"
msgid "Administrative level"
-msgstr "行政層級"
+msgstr "行政區層級"
msgid "Maritime"
msgstr "領海"
msgid "Political"
-msgstr "政治的"
+msgstr "政治"
msgid "Division"
-msgstr ""
+msgstr "分區"
msgid "canton"
-msgstr ""
+msgstr "鄉鎮"
msgid "linguistic_community"
-msgstr ""
+msgstr "同語言社區"
msgid "ward"
-msgstr ""
+msgstr "分區"
msgid "National Park"
msgstr "國家公園"
@@ -23440,25 +23738,25 @@ msgid "Protected Area"
msgstr "保護區"
msgid "Protect Class"
-msgstr ""
+msgstr "保護區分類"
msgid "Title or type of protection"
-msgstr ""
+msgstr "保護區種類或類型"
msgid "Border type"
-msgstr ""
+msgstr "邊界類型"
msgid "baseline"
-msgstr ""
+msgstr "基線"
msgid "territorial"
-msgstr ""
+msgstr "領域"
msgid "contiguous"
-msgstr ""
+msgstr "相接"
msgid "eez"
-msgstr ""
+msgstr "專屬經濟區"
msgid "Places"
msgstr "地名"
@@ -23471,7 +23769,7 @@ msgstr "國家"
msgctxt "place"
msgid "State"
-msgstr ""
+msgstr "州"
msgid "Region"
msgstr "區"
@@ -23489,40 +23787,40 @@ msgid "Village"
msgstr "村/里"
msgid "Hamlet"
-msgstr ""
+msgstr "村落"
msgid "Isolated Dwelling"
-msgstr ""
+msgstr "獨間住居"
msgid "Suburb"
msgstr "郊區"
msgid "Neighbourhood"
-msgstr ""
+msgstr "鄰居"
msgid "Farm"
-msgstr ""
+msgstr "農田"
msgid "A farm within a bigger settlement"
-msgstr ""
+msgstr "較大聚落裏的農地"
msgid "(please use isolated_dwelling for an isolated farm)"
-msgstr ""
+msgstr "(請使用 isolated_dwelling 來標記離群的農田)"
msgid "Locality"
-msgstr ""
+msgstr "地方"
msgid "Peak"
-msgstr "峰"
+msgstr "山峰"
msgid "The top (summit) of a mountain or hill."
-msgstr ""
+msgstr "山或丘陵的頂端 (最高點)。"
msgid "Saddle"
-msgstr ""
+msgstr "鞍部"
msgid "A saddle point between mountains or hills."
-msgstr ""
+msgstr "兩山或丘陵之間的低點。"
msgid "Glacier"
msgstr "冰河"
@@ -23530,43 +23828,43 @@ msgstr "冰河"
msgid ""
"A persistent body of dense ice that is constantly moving under its own "
"weight."
-msgstr ""
+msgstr "緊密冰塊受自身重量影響而持續移動、連綿不斷連成一整條。"
msgid "Volcano"
msgstr "火山"
msgid "A volcano, either dormant, extinct or active."
-msgstr ""
+msgstr "火山：休火山、死火山或活火山。"
msgid "Current Status"
-msgstr ""
+msgstr "目前狀態"
msgid "dormant"
-msgstr ""
+msgstr "休火山"
msgid "extinct"
-msgstr ""
+msgstr "死火山"
msgid "stratovolcano"
-msgstr ""
+msgstr "層狀火山"
msgid "shield"
-msgstr ""
+msgstr "盾狀火山"
msgid "scoria"
-msgstr ""
+msgstr "火山渣"
msgid "Ridge"
-msgstr ""
+msgstr "稜線"
msgid "A mountain or hill ridge."
-msgstr ""
+msgstr "山或丘陵的山脊。"
msgid "Valley"
-msgstr ""
+msgstr "谷地"
msgid "A low area between hills."
-msgstr ""
+msgstr "丘陵之間的低處。"
msgid "Cliff"
msgstr "斷崖"
@@ -23574,13 +23872,13 @@ msgstr "斷崖"
msgid ""
"A steep rock face exposure, with a significant vertical, or near vertical "
"(leave the lower face to the right of the way)."
-msgstr ""
+msgstr "陡峭岩壁，坡度垂直或接近垂直 (低處繪製在路徑右側)。"
msgid "Cave Entrance"
msgstr "洞窟入口"
msgid "The entrance to a cave."
-msgstr ""
+msgstr "洞穴的入口。"
msgid "Island"
msgstr "島嶼"
@@ -23589,309 +23887,309 @@ msgid "Islet"
msgstr "小島"
msgid "Reef"
-msgstr ""
+msgstr "暗礁"
msgid "coral"
-msgstr ""
+msgstr "珊瑚礁"
msgid "oyster"
-msgstr ""
+msgstr "牡蠣礁"
msgid "rock"
-msgstr ""
+msgstr "岩礁"
msgid "Nature"
msgstr "自然"
msgid "Tree"
-msgstr "樹"
+msgstr "樹木"
msgid "A single tree."
msgstr "單獨一棵樹"
msgid "Tree Row"
-msgstr "一排樹"
+msgstr "成排樹"
msgid "A line of trees."
-msgstr "一排樹"
+msgstr "排成列的樹。"
msgid "Wood"
-msgstr "樹林"
+msgstr "自然林"
msgid "Woodland where timber production does not dominate use."
-msgstr ""
+msgstr "沒有伐木、取用木材的林地。"
msgid "Forest"
-msgstr "森林"
+msgstr "管理林"
msgid "Cutline"
-msgstr ""
+msgstr "清伐線"
msgctxt "cutline"
msgid "border"
-msgstr ""
+msgstr "界線"
msgctxt "cutline"
msgid "firebreak"
-msgstr ""
+msgstr "防火巷"
msgctxt "cutline"
msgid "hunting"
-msgstr ""
+msgstr "狩獵"
msgctxt "cutline"
msgid "loggingmachine"
-msgstr ""
+msgstr "伐木機"
msgctxt "cutline"
msgid "pipeline"
-msgstr ""
+msgstr "管線"
msgctxt "cutline"
msgid "piste"
-msgstr ""
+msgstr "滑雪道"
msgctxt "cutline"
msgid "section"
-msgstr ""
+msgstr "分區"
msgid "Grassland"
-msgstr ""
+msgstr "雜草地"
msgid ""
"Where vegetation is dominated by grasses (Poaceae) and other herbaceous (non-"
"woody) plants. Excludes cultivated areas and wetlands."
-msgstr ""
+msgstr "植被以草類 (禾本科) 和其他非樹木的草本植物佔優勢的土地，不包括耕地與濕地。"
msgid "pampas"
-msgstr ""
+msgstr "彭巴大草原"
msgid "prairie"
-msgstr ""
+msgstr "北美大草原"
msgid "puszta"
-msgstr ""
+msgstr "匈牙利大草原"
msgid "savanna"
-msgstr ""
+msgstr "疏林莽原"
msgid "steppe"
-msgstr ""
+msgstr "乾草原"
msgid "veld"
-msgstr ""
+msgstr "南非大草原"
msgid "Nature Reserve"
msgstr "自然保育"
msgid "Scree"
-msgstr ""
+msgstr "碎石堆"
msgid "An accumulation of loose angular rocks."
-msgstr ""
+msgstr "崩落堆積的砂石。"
msgid "Shingle"
-msgstr ""
+msgstr "礫石灘"
msgid "An accumulation of loose rounded rocks on a beach or riverbed."
-msgstr ""
+msgstr "堆積礫石的海灘或河床。"
msgid "Fell"
-msgstr ""
+msgstr "副寒帶、高山地帶草苔"
msgid ""
"Bare upper lying uncultivated land principally covered with grass and often "
"grazed."
-msgstr ""
+msgstr "長滿野草的無使用荒地，常被拿來放牧。"
msgid "Scrub"
-msgstr ""
+msgstr "灌木"
msgid ""
"Bare lower lying uncultivated land with bushes but little or no tree cover."
-msgstr ""
+msgstr "長滿灌木的無使用荒地，可能有些許小樹。"
msgid "Heath"
-msgstr ""
+msgstr "石楠荒地"
msgid ""
"Bare lower lying uncultivated land with a shrubland habitat found mainly on "
"free-draining infertile, acidic soils, and is characterised by open, low-"
"growing woody vegetation."
-msgstr ""
+msgstr "主要長滿灌木類植物的無使用荒地，土質貧瘠、缺水、酸性，特徵是開闊、高度不高的木生植物。"
msgid "Sand"
-msgstr ""
+msgstr "砂地"
msgid "Large area covered with sand."
-msgstr ""
+msgstr "被砂覆蓋的大塊區域。"
msgid "Bare Rock"
-msgstr ""
+msgstr "裸岩"
msgid ""
"For areas of solid visible rock that is sparsely vegetated or not vegetated "
"at all."
-msgstr ""
+msgstr "到處可見到石頭，偶有植物或是完全沒有植物的區域。"
msgid "Rock"
-msgstr ""
+msgstr "獨立岩"
msgid ""
"A notable rock or group of rocks, with at least one of them firmly attached "
"to the underlying bedrock."
-msgstr ""
+msgstr "明顯的岩石或岩石群、至少有一個附著在下面的岩磐。"
msgid "Tourism attraction"
-msgstr ""
+msgstr "觀光景點"
msgid "Stone"
-msgstr ""
+msgstr "巨石"
msgid ""
"A single notable free-standing rock, which may differ from the composition "
"of the terrain it lies in."
-msgstr ""
+msgstr "單獨一顆明顯的無支撐岩石，有可能與所在地的地質不同。"
msgid "Land use"
-msgstr "土地利用"
+msgstr "土地用途"
msgid "Farmyard"
-msgstr "農家庭院"
+msgstr "農家用地"
msgid "Farmland"
-msgstr "農田"
+msgstr "農地"
msgid "Crop"
-msgstr ""
+msgstr "穀物"
msgctxt "crop"
msgid "corn"
-msgstr ""
+msgstr "玉米"
msgctxt "crop"
msgid "grass"
-msgstr ""
+msgstr "草"
msgctxt "crop"
msgid "rice"
-msgstr ""
+msgstr "稻米"
msgctxt "crop"
msgid "wheat"
-msgstr ""
+msgstr "麥子"
msgctxt "crop"
msgid "hop"
-msgstr ""
+msgstr "啤酒花"
msgid "Meadow"
-msgstr "青草地"
+msgstr "野草地"
msgid "Orchard"
-msgstr ""
+msgstr "果園"
msgid "Trees"
-msgstr ""
+msgstr "樹木"
msgid "olive_trees"
-msgstr ""
+msgstr "橄欖樹"
msgid "apple_trees"
-msgstr ""
+msgstr "蘋果樹"
msgid "oil_palms"
-msgstr ""
+msgstr "棕櫚樹"
msgid "orange_trees"
-msgstr ""
+msgstr "柳橙樹"
msgid "almond_trees"
-msgstr ""
+msgstr "杏樹"
msgid "banana_plants"
-msgstr ""
+msgstr "香蕉叢"
msgid "coconut_palms"
-msgstr ""
+msgstr "可可樹"
msgid "hazel_plants"
-msgstr ""
+msgstr "榛樹"
msgid "cherry_trees"
-msgstr ""
+msgstr "櫻桃樹"
msgid "persimmon_trees"
-msgstr ""
+msgstr "柿子樹"
msgid "walnut_trees"
-msgstr ""
+msgstr "胡桃樹"
msgid "plum_trees"
-msgstr ""
+msgstr "李子樹"
msgid "peach_trees"
-msgstr ""
+msgstr "桃子樹"
msgid "tea_plants"
-msgstr ""
+msgstr "茶樹"
msgid "Vineyard"
-msgstr ""
+msgstr "葡萄園"
msgid "Greenhouse Horticulture"
-msgstr ""
+msgstr "溫室栽培"
msgid "Plant Nursery"
-msgstr ""
+msgstr "苗圃"
msgid "Aquaculture"
-msgstr ""
+msgstr "水產養殖"
msgid "shrimp"
-msgstr ""
+msgstr "蝦"
msgid "mussels"
-msgstr ""
+msgstr "貝類"
msgid "Allotments"
-msgstr ""
+msgstr "社區農園"
msgid "Garden"
msgstr "花園"
msgid "Grass"
-msgstr "草地"
+msgstr "平整草地"
msgid "Village Green"
-msgstr ""
+msgstr "社區綠地"
msgid "Common"
-msgstr ""
+msgstr "共有地"
msgid "Park"
msgstr "公園"
msgid "Recreation Ground"
-msgstr ""
+msgstr "遊樂區"
msgid "Residential Area"
msgstr "住宅區"
msgid "Graveyard"
-msgstr ""
+msgstr "墓園"
msgid "Cemetery"
-msgstr ""
+msgstr "公墓"
msgid "Religious"
-msgstr ""
+msgstr "宗教"
msgid "Retail"
-msgstr ""
+msgstr "店面"
msgid "Commercial"
-msgstr ""
+msgstr "商業區"
msgid "Industrial"
msgstr "工業區"
@@ -23900,7 +24198,7 @@ msgid "Garages"
msgstr "車庫"
msgid "Railway Land"
-msgstr ""
+msgstr "鐵路用地"
msgid "Military"
msgstr "軍事"
@@ -23909,16 +24207,16 @@ msgid "Construction Area"
msgstr "工地"
msgid "Brownfield"
-msgstr ""
+msgstr "低污染再利用地"
msgid "Greenfield"
-msgstr ""
+msgstr "空地"
msgid "Landfill"
-msgstr ""
+msgstr "垃圾掩埋場"
msgid "Quarry"
-msgstr "露天採礦"
+msgstr "露天礦場"
msgid "Annotation"
msgstr "註記"
@@ -23927,7 +24225,7 @@ msgid "Alternative name"
msgstr "別名"
msgid "Historical name"
-msgstr "歷史名稱"
+msgstr "舊名稱"
msgid "Local name"
msgstr "在地名稱"
@@ -23936,7 +24234,7 @@ msgid "Regional name"
msgstr "區域名稱"
msgid "National name"
-msgstr "國家名稱"
+msgstr "國內名稱"
msgid "International name"
msgstr "國際名稱"
@@ -23945,10 +24243,10 @@ msgid "Official name"
msgstr "官方名稱"
msgid "Common name abbreviation"
-msgstr "常見名稱縮寫"
+msgstr "常用名稱縮寫"
msgid "Address"
-msgstr ""
+msgstr "地址"
msgid "House number"
msgstr "門牌號碼"
@@ -23969,7 +24267,7 @@ msgid "Country code"
msgstr "國碼"
msgid "Unit/Suite"
-msgstr ""
+msgstr "大樓分區"
msgid "House name"
msgstr "房屋名稱"
@@ -23988,169 +24286,169 @@ msgid "State"
msgstr "州"
msgid "AL"
-msgstr ""
+msgstr "AL"
msgid "AK"
-msgstr ""
+msgstr "AK"
msgid "AZ"
-msgstr ""
+msgstr "AZ"
msgid "AR"
-msgstr ""
+msgstr "AR"
msgid "CA"
-msgstr ""
+msgstr "CA"
msgid "CO"
-msgstr ""
+msgstr "CO"
msgid "CT"
-msgstr ""
+msgstr "CT"
msgid "DE"
-msgstr ""
+msgstr "DE"
msgid "FL"
-msgstr ""
+msgstr "FL"
msgid "GA"
-msgstr ""
+msgstr "GA"
msgid "HI"
-msgstr ""
+msgstr "HI"
msgid "IL"
-msgstr ""
+msgstr "IL"
msgid "IN"
-msgstr ""
+msgstr "IN"
msgid "IA"
-msgstr ""
+msgstr "IA"
msgid "KS"
-msgstr ""
+msgstr "KS"
msgid "KY"
-msgstr ""
+msgstr "KY"
msgid "LA"
-msgstr ""
+msgstr "LA"
msgid "ME"
-msgstr ""
+msgstr "ME"
msgid "MD"
-msgstr ""
+msgstr "MD"
msgid "MA"
-msgstr ""
+msgstr "MA"
msgid "MI"
-msgstr ""
+msgstr "MI"
msgid "MN"
-msgstr ""
+msgstr "MN"
msgid "MS"
-msgstr ""
+msgstr "MS"
msgid "MO"
-msgstr ""
+msgstr "MO"
msgid "MT"
-msgstr ""
+msgstr "MT"
msgid "NE"
-msgstr ""
+msgstr "NE"
msgid "NV"
-msgstr ""
+msgstr "NV"
msgid "NH"
-msgstr ""
+msgstr "NH"
msgid "NJ"
-msgstr ""
+msgstr "NJ"
msgid "NM"
-msgstr ""
+msgstr "NM"
msgid "NY"
-msgstr ""
+msgstr "NY"
msgid "NC"
-msgstr ""
+msgstr "NC"
msgid "ND"
-msgstr ""
+msgstr "ND"
msgid "OH"
-msgstr ""
+msgstr "OH"
msgid "OR"
-msgstr ""
+msgstr "OR"
msgid "PA"
-msgstr ""
+msgstr "PA"
msgid "RI"
-msgstr ""
+msgstr "RI"
msgid "SC"
-msgstr ""
+msgstr "SC"
msgid "SD"
-msgstr ""
+msgstr "SD"
msgid "TN"
-msgstr ""
+msgstr "TN"
msgid "TX"
-msgstr ""
+msgstr "TX"
msgid "UT"
-msgstr ""
+msgstr "UT"
msgid "VT"
-msgstr ""
+msgstr "VT"
msgid "VA"
-msgstr ""
+msgstr "VA"
msgid "WA"
-msgstr ""
+msgstr "WA"
msgid "WV"
-msgstr ""
+msgstr "WV"
msgid "WI"
-msgstr ""
+msgstr "WI"
msgid "DC"
-msgstr ""
+msgstr "DC"
msgid "AS"
-msgstr ""
+msgstr "AS"
msgid "GU"
-msgstr ""
+msgstr "GU"
msgid "MP"
-msgstr ""
+msgstr "MP"
msgid "PR"
-msgstr ""
+msgstr "PR"
msgid "UM"
-msgstr ""
+msgstr "UM"
msgid "VI"
-msgstr ""
+msgstr "VI"
msgid "Address Interpolation"
-msgstr "內插法地址"
+msgstr "地址插入"
msgid "Numbering scheme"
msgstr "編號規則"
@@ -24168,19 +24466,19 @@ msgid "Accuracy"
msgstr "準確度"
msgid "actual"
-msgstr ""
+msgstr "準確"
msgid "estimate"
-msgstr ""
+msgstr "推估"
msgid "potential"
-msgstr ""
+msgstr "粗略"
msgid "Contact (Common Schema)"
-msgstr ""
+msgstr "聯絡方式 (共同架構)"
msgid "Email Address"
-msgstr "電子郵件位址"
+msgstr "電子郵件信箱"
msgid "Fax Number"
msgstr "傳真號碼"
@@ -24189,17 +24487,17 @@ msgid "Image"
msgstr "圖片"
msgid "Contact (Schema with ''contact:*'' Prefix)"
-msgstr ""
+msgstr "聯絡方式 (contact:* 的架構)"
msgctxt "description=*"
msgid "A short text with additional information."
-msgstr ""
+msgstr "一段有地址資訊的簡短文字。"
msgctxt "description=*"
msgid ""
"It might be viewable to the end user (perhaps using a search system or a map "
"with pop-ups)."
-msgstr ""
+msgstr "可以讓一般使用者看到 (如果他們使用搜尋系統或是有彈出小視窗的地圖)。"
msgctxt "note=*, fixme=*, description=*"
msgid "Similar but different tags:"
@@ -24207,20 +24505,20 @@ msgstr "類似但標籤不同者:"
msgctxt "the tag note=*"
msgid "Note"
-msgstr ""
+msgstr "註解"
msgctxt "note=*"
msgid "An important hint for other mappers (not for the end user)."
-msgstr ""
+msgstr "給其他地圖編輯者的重要提示 (不是給一般使用者)。"
msgid "Fixme"
-msgstr ""
+msgstr "待修"
msgctxt "fixme=*"
msgid ""
"A hint for other mappers (not for the end user), that an object needs an "
"improvement."
-msgstr ""
+msgstr "給其他地圖編輯者的提示 (不是給一般使用者)，註明這個物件要再加強。"
msgid "outer segment"
msgstr "外部區段"
@@ -24244,7 +24542,7 @@ msgid "national_park"
msgstr "國家公園"
msgid "political"
-msgstr "政治的"
+msgstr "政治"
msgid "postal_code"
msgstr "郵遞區號"
@@ -24259,6 +24557,21 @@ msgid "Administration centre"
msgstr "行政中心"
msgid "Label point"
+msgstr "標示點"
+
+msgid "Outline of building"
+msgstr ""
+
+msgid "Inner segment"
+msgstr ""
+
+msgid "Roof ridge"
+msgstr ""
+
+msgid "Roof edge"
+msgstr ""
+
+msgid "Building level"
msgstr ""
msgid "Site"
@@ -24292,25 +24605,25 @@ msgid "no_right_turn"
msgstr "禁止右轉"
msgid "no_straight_on"
-msgstr ""
+msgstr "禁止直行"
msgid "no_u_turn"
msgstr "禁止廻轉"
msgid "only_right_turn"
-msgstr ""
+msgstr "右轉專用"
msgid "only_left_turn"
-msgstr ""
+msgstr "左轉專用"
msgid "only_straight_on"
-msgstr ""
+msgstr "直行專用"
msgid "from way"
msgstr "from 路徑"
msgid "via node or ways"
-msgstr ""
+msgstr "經過節點或路徑"
msgid "to way"
msgstr "to 路徑"
@@ -24334,7 +24647,7 @@ msgid "mindistance"
msgstr "最小距離"
msgid "check"
-msgstr ""
+msgstr "臨檢"
msgid "Max. height (meters, only if enforcement=maxheight)"
msgstr "最大高度 (公尺，只用於 enforcement=maxheight)"
@@ -24346,16 +24659,16 @@ msgid "Max. speed (km/h, only if enforcement=maxspeed)"
msgstr "最高限速 (每公里/小時，只用於 enforcement=maxspeed)"
msgid "location of enforcement device"
-msgstr "限制裝置的位置"
+msgstr "查驗裝置的位置"
msgid "node on way where enforcement starts"
-msgstr "限制在路徑上開始的節點"
+msgstr "路徑上的節點 (查驗起點)"
msgid "where enforcement ends"
msgstr "限制在何處結束"
msgid "traffic light or barrier that stops you"
-msgstr "會讓您停下的交通號誌或障礙物"
+msgstr "會讓你停下的交通號誌或障礙物"
msgid "Routes"
msgstr "路線"
@@ -24364,64 +24677,64 @@ msgid "Bicycle Route"
msgstr "單車路線"
msgid "national"
-msgstr ""
+msgstr "國家級"
msgid "local"
-msgstr ""
+msgstr "地方級"
msgid "Mountain Biking Route"
msgstr "登山車路線"
msgid "Hiking Route"
-msgstr "登山路線"
+msgstr "登山健行路線"
msgid "infrastructure"
-msgstr ""
+msgstr "公共建設"
msgid "natural"
msgstr "自然"
msgid "Walking Route"
-msgstr "健走路線"
+msgstr "散步路線"
msgid "Riding Route"
-msgstr ""
+msgstr "騎馬路線"
msgid "Piste Route"
-msgstr ""
+msgstr "滑雪道路線"
msgid "link segment"
-msgstr ""
+msgstr "連接段"
msgid "shortcut segment"
-msgstr ""
+msgstr "捷徑段"
msgid "variant segment"
-msgstr ""
+msgstr "變換段"
msgid "entry points"
-msgstr ""
+msgstr "進入點"
msgid "Ski Route"
-msgstr ""
+msgstr "滑雪道"
msgid "alpine"
-msgstr ""
+msgstr "高山"
msgid "Detour Route"
-msgstr ""
+msgstr "替代路線"
msgid "Ref of the way this is a detour to"
-msgstr ""
+msgstr "原路的參照編號，表示這這是替代"
msgid "fork node for alternative routes"
-msgstr ""
+msgstr "候選路線的分歧節點"
msgid "Power Route"
msgstr "輸電路線"
msgid "Railway Route"
-msgstr ""
+msgstr "鐵路路線"
msgid "Road Route"
msgstr "公路路線"
@@ -24436,118 +24749,118 @@ msgid "Associated Street"
msgstr "關聯街道"
msgid "house"
-msgstr ""
+msgstr "房屋"
msgid "Street"
msgstr "街"
msgid "ways being part of street"
-msgstr ""
+msgstr "路徑是街道的一部分"
msgid "addresses belonging to the street"
-msgstr ""
+msgstr "街道的地址"
msgid "houses belonging to the street"
-msgstr ""
+msgstr "街道的門牌號碼"
msgid "anything related to the street"
-msgstr ""
+msgstr "關於街道的任何東西"
msgid "Destination Sign"
-msgstr ""
+msgstr "目的地標示"
msgid "Destination written on sign (w/o distance)"
-msgstr ""
+msgstr "寫有目的地的標示牌 (不含距離)"
msgid "Time (hh:mm, for trekking)"
-msgstr ""
+msgstr "時間 (HH:MM，健行者用)"
msgid "Colour of background"
-msgstr ""
+msgstr "背景顏色"
msgid "Colour of text"
-msgstr ""
+msgstr "文字顏色"
msgid "Colour of border/arrow"
-msgstr ""
+msgstr "界線/箭頭顏色"
msgid "last way before junction"
msgstr "在匯集點之前最後的路徑"
msgid "node of the intersection"
-msgstr ""
+msgstr "相交節點"
msgid "first way after junction"
msgstr "在匯集點之後第一個的路徑"
msgid "position of sign"
-msgstr ""
+msgstr "標示位置"
msgid "Waterway"
-msgstr ""
+msgstr "水路"
msgid "Subtype of waterway (largest one of members)"
-msgstr ""
+msgstr "水路的下層類型 (最大的成員)"
msgid "stream"
msgstr "溪流"
msgid "drain"
-msgstr ""
+msgstr "溝渠"
msgid "ditch"
-msgstr "渠道"
+msgstr "小溝渠"
msgid "Name of river/lake/sea/ocean it runs into"
-msgstr ""
+msgstr "流到的河流/湖泊/海洋的名稱"
msgid "Reference Sandre (FR)"
-msgstr ""
+msgstr "參照 Sandre (法國)"
msgid "Reference FGKZ (DE)"
-msgstr ""
+msgstr "參照 FGKZ (德國"
msgid "Reference REGINE (NO)"
-msgstr ""
+msgstr "參照 REGNE (挪威)"
msgid "Reference GNIS (USA)"
-msgstr ""
+msgstr "參照 GNIS (美國)"
msgid "Reference GNBC (CA)"
-msgstr ""
+msgstr "參照 GNBC (加拿大)"
msgid "waterways (no riverbank)"
-msgstr ""
+msgstr "水路 (沒有河床)"
msgid "branch waterways (no riverbank)"
-msgstr ""
+msgstr "水路支流 (沒有河床)"
msgid "spring of waterway"
-msgstr ""
+msgstr "水路的源頭"
msgid "Length (meters)"
-msgstr ""
+msgstr "長度 (公尺)"
msgid "ways supported by (on top of) the bridge"
-msgstr ""
+msgstr "路徑經過這座橋樑(的上面)"
msgid "ways passing under the bridge"
-msgstr ""
+msgstr "路徑穿過這座橋樑"
msgid "way forming the outline footprint"
-msgstr ""
+msgstr "用路徑畫出外緣輪廓"
msgid "edge ways parallel to ''across''"
-msgstr ""
+msgstr "邊緣的路徑也平行「across」"
msgid "ways passing through the tunnel"
-msgstr ""
+msgstr "路徑穿過隧道"
msgid "edge ways parallel to ''through''"
-msgstr ""
+msgstr "邊緣的路徑也平行「through」"
msgid "Tunnel Start"
-msgstr ""
+msgstr "隧道起點"
msgid "Village/City"
msgstr "村/市"
@@ -24562,7 +24875,7 @@ msgid "Shopping"
msgstr "購物"
msgid "WC"
-msgstr "WC"
+msgstr "廁所"
msgid "Camping"
msgstr "露營"
@@ -24571,209 +24884,209 @@ msgid "Test"
msgstr "測試"
msgid "View website"
-msgstr ""
+msgstr "檢視網站"
msgid "View URL"
-msgstr ""
+msgstr "檢視 URL 網址"
msgid "Send Email"
-msgstr ""
+msgstr "傳送電子郵件"
msgid "View image"
-msgstr ""
+msgstr "檢視影像"
msgid "View %name% article"
-msgstr ""
+msgstr "檢視 %name% 文章"
msgid "View Wikidata page"
-msgstr ""
+msgstr "檢視維基百科"
msgid "View UNESCO sheet"
-msgstr ""
+msgstr "檢視 UNESCO 圖表"
msgid "View %name% image"
-msgstr ""
+msgstr "檢視 %name% 影像"
msgid "View %name% sheet of river"
-msgstr ""
+msgstr "檢視 %name% 河流圖表"
msgid "View %name% municipality sheet"
-msgstr ""
+msgstr "檢視 %name% 市區機關圖表"
msgid "View %name% sheet on osm.fr"
-msgstr ""
+msgstr "檢視 osm.ft 上 %name% 圖表"
msgid "View %name% map of municipalities"
-msgstr ""
+msgstr "檢視 %name% 市區機關地圖"
msgid "View %name% list of municipalities"
-msgstr ""
+msgstr "檢視 %name% 市區機關清單"
msgid "View %name% map of cantons"
-msgstr ""
+msgstr "檢視 %name% 市鎮地圖"
msgid "View %name% list of cantons"
-msgstr ""
+msgstr "檢視 %name% 市鎮清單"
msgid "View %name% map of arrondissements"
-msgstr ""
+msgstr "檢視 %name% 省區地圖"
msgid "View %name% list of arrondissements"
-msgstr ""
+msgstr "檢視 %name% 省區清單"
msgid "View %name% map of departments"
-msgstr ""
+msgstr "檢視 %name% 省地圖"
msgid "View %name% list of departments"
-msgstr ""
+msgstr "檢視 %name% 省清單"
msgid "View %name% map of regions"
-msgstr ""
+msgstr "檢視 %name% 大區地圖"
msgid "View %name% list of regions"
-msgstr ""
+msgstr "檢視 %name% 大區清單"
msgid "View %name% sheet of church"
-msgstr ""
+msgstr "檢視 %name% 教區圖表"
msgid "View Mérimée sheet of monument"
-msgstr ""
+msgstr "檢視梅里美紀念物的圖表"
msgid "View Mérimée list for this municipality"
-msgstr ""
+msgstr "檢視梅里美這個市區的梅里美清單"
msgid "View %name% sheet of geodesic site"
-msgstr ""
+msgstr "View %name% 測量點位的圖表"
msgid "View UAI sheet of school/college"
-msgstr ""
+msgstr "檢視 UAI 學校/學院的圖表"
msgid "View %name% sheet of hospital/home"
-msgstr ""
+msgstr "檢視 %name% 醫院/住宅的圖表"
msgid "View explanation of %name% code"
-msgstr ""
+msgstr "檢視 %name% 代碼的說明"
msgid "Get identification card (pdf) for this establishment"
-msgstr ""
+msgstr "為這個機構取得證明卡 (pdf)"
msgid "View %name% page of this post office"
-msgstr ""
+msgstr "View %name% 郵局的頁面"
msgid "View %name% sheet of memorial"
-msgstr ""
+msgstr "檢視 %name% 紀念碑的圖表"
msgid "Even housenumber in odd address interpolation."
-msgstr ""
+msgstr "偶數門牌號碼位於奇數地址側。"
msgid "Odd housenumber in even address interpolation."
-msgstr ""
+msgstr "奇數門牌號碼位於偶數地址側。"
msgid "Way with {0}. Tag each housenumber separately if possible."
-msgstr ""
+msgstr "路徑有「{0}」標籤；如果可能，將每個門牌號碼標獨立。"
msgid ""
"Object has no {0}, however, it has {1} and {2} whose value looks like a "
"housenumber."
-msgstr ""
+msgstr "但是，物件沒有 {0}、卻有 {1} 和 {2}，從數值看來像是門牌號碼。"
msgid "Same value of {0} and {1}"
-msgstr ""
+msgstr "{0} 和 {1} 的值相同"
msgid "{0} without {1}"
-msgstr ""
+msgstr "{0} 沒有 {1}"
msgid "missing tag"
-msgstr ""
+msgstr "缺少標籤"
msgid "{0} without {1} or {2}"
-msgstr ""
+msgstr "{0} 沒有 {1} 或 {2}"
msgid "{0} without {1}, {2} or {3}"
-msgstr ""
+msgstr "{0} 沒有 {1}、{2} 或 {3}"
msgid "{0} together with {1}"
-msgstr ""
+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 ""
+msgstr "不完整的物件：只有 {0}"
msgid "incomplete object: only {0} and {1}"
-msgstr ""
+msgstr "不完整的物件：只有 {0} 和 {1}"
msgid "{0} together with addr:*"
-msgstr ""
+msgstr "{0} 都有 addr:*"
msgid "{0} together with {1} and conflicting values"
-msgstr ""
+msgstr "{0} 都有 {1} 和衝突的數值"
msgid "{0} on suspicious object"
-msgstr ""
+msgstr "{0} 出現在有問題的元件上"
msgid "natural water used for swimming pool"
-msgstr ""
+msgstr "游泳池用了自然的水"
msgid "sport without physical feature"
-msgstr ""
+msgstr "運動沒有實體的圖徽"
msgid "alternative name without {0}"
-msgstr ""
+msgstr "別名沒有 {0}"
msgid "incomplete usage of {0} on a way without {1}"
-msgstr ""
+msgstr "不完整的用法：{0} 用在路徑上但缺少 {1}"
msgid "Same value of {0}, {1} and {2}"
-msgstr ""
+msgstr "相同數值：{0}、{1} 和 {2}"
msgid "{0} and {1} together with {2} and conflicting values"
-msgstr ""
+msgstr "{0} 與 {1} 都有 {2} 和衝突的數值"
msgid "{0} on a relation without {1}"
-msgstr ""
+msgstr "{0} 在關聯上但沒有 {1}"
msgid ""
"Long waterway with {0} but without a tag which defines it as tunnel or "
"underground. Remove {1} or add a tunnel tag if applicable. Also check "
"crossing bridges and their {1} tags."
-msgstr ""
+msgstr "長水道用了 {0} 但沒有定義隧道或地下的標籤：如果適當，移除 {1} 或加入 隧道 標籤；也檢查 跨越的橋樑 和他們的 {1} 標籤。"
msgid ""
"Short waterway with {0} but without a tag which defines it as tunnel or "
"underground. Remove {1} or add a tunnel tag if applicable. Also check "
"crossing bridges and their {1} tags."
-msgstr ""
+msgstr "短水道用了 {0} 但沒有定義隧道或地下的標籤：如果適當，移除 {1} 或加入 隧道 標籤；也檢查 跨越的橋樑 和他們的 {1} 標籤。"
msgid "{0} together with {1} and {2}. Remove {1} and {2}"
-msgstr ""
+msgstr "{0} 都有 {1} 和 {2}：移除 {1} 和 {2}"
msgid "Different number of lanes in the keys {0} and {1}"
-msgstr ""
+msgstr "設定鍵 {0} 和 {1} 有不同數量的車道"
msgid "possibly missing {0} tag"
-msgstr ""
+msgstr "可能少了「{0}」標籤"
msgid "street with odd number of {0}, but without {1} and {2} or {3}"
-msgstr ""
+msgstr "街道有奇數的 {0}，但沒有 {1} 和 {2} 或 {3}"
msgid "{0} is deprecated"
msgstr "{0} 已經廢棄"
msgid "deprecated tagging"
-msgstr ""
+msgstr "不建議的標籤"
msgid "''{0}'' is meaningless, use more specific tags, e.g. ''{1}''"
-msgstr ""
+msgstr "「{0}」太沒意義：使用更明確的標籤，像是「{1}」"
msgid ""
"''{0}'' does not specify the official mode of transportation, use ''{1}'' "
"for example"
-msgstr ""
+msgstr "「{0}」不是具體的正式運輸模式：該用「{1}」之類的"
msgid ""
"{0}={1} is unspecific. Instead of ''{1}'' please give more information about "
@@ -24802,43 +25115,43 @@ msgid ""
msgstr ""
msgid "{0}={1} is unspecific. Please replace ''{1}'' by a specific value."
-msgstr ""
+msgstr "{0}={1} 不明確：請將 {1} 換成特定的數值。"
msgid "{0} should be replaced with {1}"
-msgstr ""
+msgstr "{0} 應該換成 {1}"
msgid "{0} = {1}; remove {0}"
-msgstr ""
+msgstr "{0} = {1}； 移除 {0}"
msgid ""
"{0}={1} is unspecific. Please replace ''{1}'' by ''left'', ''right'' or "
"''both''."
-msgstr ""
+msgstr "{0}={1} 不明確：請將 {1} 換成 left、right 或 both。"
msgid "Unspecific tag {0}"
-msgstr ""
+msgstr "不明確的標籤 {0}"
msgid "Definition of {0} is unclear"
-msgstr ""
+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."
msgstr ""
msgid "{0}"
-msgstr ""
+msgstr "{0}"
msgid "key with uncommon character"
-msgstr ""
+msgstr "設定鍵有特殊字元"
msgid "uncommon short key"
msgstr ""
msgid "{0} is inaccurate"
-msgstr ""
+msgstr "{0} 不準確"
msgid "{0} is deprecated for {1}"
msgstr ""
@@ -24853,10 +25166,10 @@ msgid "The key {0} has an uncommon value."
msgstr ""
msgid "misspelled value"
-msgstr ""
+msgstr "數值拼字錯誤"
msgid "wrong value: {0}"
-msgstr ""
+msgstr "錯誤的值：{0}"
msgid "{0} on a node. Should be used on a way."
msgstr ""
@@ -24874,49 +25187,49 @@ msgid "{0} on a way. Should be used in a relation"
msgstr ""
msgid "{0} together with {1} on a node. Remove {0}."
-msgstr ""
+msgstr "{0} 都將 {1} 用在節點，移除 {0}。"
msgid "{0} on a node"
-msgstr ""
+msgstr "{0} 用在節點"
msgid "Building inside building"
msgstr "建築物中的建築"
msgid "Overlapping Water Areas"
-msgstr ""
+msgstr "重疊的水域"
msgid "Overlapping Areas"
msgstr "重疊的區域"
msgid "{0} inside {1}"
-msgstr ""
+msgstr "{0} 在 {1} 裏面"
msgid "Overlapping Identical Natural Areas"
-msgstr ""
+msgstr "重疊的相同自然區域"
msgid "Overlapping Identical Landuses"
-msgstr ""
+msgstr "重疊的相同土地用途"
msgid "isolated node which must be connected to a way"
-msgstr ""
+msgstr "必須連到路徑上的孤立節點"
msgid "node connects waterway and bridge"
-msgstr ""
+msgstr "連接橋樑和水路的節點"
msgid "{0} node connected to a highway"
-msgstr ""
+msgstr "節點 {0} 連接到公路"
msgid "suspicious roundabout direction"
msgstr ""
msgid "{0} on a large area"
-msgstr ""
+msgstr "{0} 用在大範圍區域"
msgid "{0} on a small area"
-msgstr ""
+msgstr "{0} 用在小範圍區域"
msgid "Too large building"
-msgstr ""
+msgstr "太大的建築物"
msgid ""
"Node connects a power line or cable with an object which is not related to "
@@ -24929,7 +25242,7 @@ msgid ""
msgstr ""
msgid "Coastline inside {1}"
-msgstr ""
+msgstr "海岸線在 {1} 裏面"
msgid "{0} should be on the node where {1} and {2} intersect"
msgstr ""
@@ -24943,7 +25256,7 @@ msgid "node connects highway and building"
msgstr ""
msgid "abbreviated street name"
-msgstr ""
+msgstr "街道名簡稱"
msgid "wrong highway tag on a node"
msgstr ""
@@ -24990,7 +25303,7 @@ msgid "layer tag with + sign"
msgstr ""
msgid "layer should be between -5 and 5"
-msgstr ""
+msgstr "圖層必須是在 -5 和 5 之間"
msgid "{0} should have numbers only with optional .5 increments"
msgstr ""
@@ -25004,7 +25317,7 @@ msgid ""
msgstr ""
msgid "unusual {0} format"
-msgstr ""
+msgstr "奇特的 {0} 格式"
msgid ""
"{0}: kilometers is default; period is separator; if units, put space then "
@@ -25033,43 +25346,43 @@ msgid "unusual value of {0}"
msgstr ""
msgid "relation without type"
-msgstr ""
+msgstr "關聯沒有類型 (type)"
msgid "{0} relation without {0} tag"
-msgstr ""
+msgstr "關聯 {0} 沒有 {0} 標籤"
msgid "religion without denomination"
-msgstr ""
+msgstr "宗教沒有加教派"
msgid "unknown christian denomination"
-msgstr ""
+msgstr "不明的基督教教派"
msgid "unknown muslim denomination"
-msgstr ""
+msgstr "不明的伊斯蘭教教派"
msgid "unknown jewish denomination"
-msgstr ""
+msgstr "不明的猶太教教派"
msgid "street name contains ss"
-msgstr ""
+msgstr "街道名稱含有 ss"
msgid "street name contains ß"
-msgstr ""
+msgstr "街道名稱含有 ß"
msgid "{0} is unnecessary"
-msgstr ""
+msgstr "不需要 {0}"
msgid "unnecessary tag"
-msgstr ""
+msgstr "不需要的標籤"
msgid "{0} is unnecessary for {1}"
-msgstr ""
+msgstr "{1} 不需要 {0}"
msgid "{0} makes no sense"
-msgstr ""
+msgstr "{0} 不合理"
msgid "Nodes duplicating parent way tags"
-msgstr "節點具有重複的路徑標籤"
+msgstr "節點重複了上層路徑的標籤"
msgid ""
"wikipedia tag has no language given, use ''wikipedia''=''language:page "
@@ -25124,7 +25437,7 @@ msgid ""
msgstr ""
msgid "Hide icons at low zoom"
-msgstr ""
+msgstr "低縮放時隱藏圖示"
msgid "Less obtrusive node symbols at low zoom"
msgstr ""
@@ -25145,7 +25458,7 @@ msgid "Columbus V-900 CSV Files"
msgstr "Columbus V-900 CSV 檔案"
msgid "Importing CSV file ''%s''..."
-msgstr ""
+msgstr "正在匯入 CSV 檔案 ''%s''..."
msgid "Markers of "
msgstr ""
@@ -25180,7 +25493,7 @@ msgid ""
msgstr ""
msgid "No command found"
-msgstr ""
+msgstr "找不到指令"
msgid "Default commands have been successfully installed"
msgstr ""
@@ -25216,10 +25529,10 @@ msgid "Missing definition of new object with id {0}."
msgstr "缺少 id {0} 的新物件定義。"
msgid "Missing mandatory attribute ''{0}'' on <member> of relation {1}."
-msgstr "關係 {1} 的 <member> 上缺少必要屬性「{0}」。"
+msgstr "關聯 {1} 的 <member> 上缺少必要屬性「{0}」。"
msgid "Illegal value for attribute ''uid''. Got ''{0}''."
-msgstr "屬性「uid」數值無效。得到「{0}」。"
+msgstr "屬性「uid」數值不合規定。得到「{0}」。"
msgid "nodes"
msgstr "節點"
@@ -25228,7 +25541,7 @@ msgid "ways"
msgstr "路徑"
msgid "relations"
-msgstr "關係"
+msgstr "關聯"
msgid "OSM objects"
msgstr "OSM 物件"
@@ -25268,7 +25581,7 @@ msgstr "檔案名稱"
msgid ""
"Error occurred while parsing gpx file {0}. Only a part of the file will be "
"available."
-msgstr ""
+msgstr "分析 GPX 檔案「{0}」時發生錯誤：只有檔案的一部分可以使用。"
msgid "Error fetching URL {0}"
msgstr "取得 URL {0} 時發生錯誤"
@@ -25300,7 +25613,7 @@ msgid "Upload Traces"
msgstr "上傳軌跡"
msgid "Defines the visibility of your trace for other OSM users."
-msgstr "定義您的軌跡對其他 OSM 使用者的可見性。"
+msgstr "定義你的軌跡對其他 OSM 使用者的可見性。"
msgid "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
msgstr "http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"
@@ -25309,13 +25622,13 @@ msgid "(What does that mean?)"
msgstr "(那代表什麼？)"
msgid "Please enter Description about your trace."
-msgstr "請輸入您的軌跡的相關描述。"
+msgstr "請輸入你的軌跡的相關描述。"
msgid "Tags (comma delimited)"
msgstr "標籤 (以逗號分隔)"
msgid "Please enter tags about your trace."
-msgstr "請輸入您的軌跡的標籤。"
+msgstr "請輸入你的軌跡的標籤。"
msgid "Selected track: {0}"
msgstr "選取的軌跡：{0}"
@@ -25327,7 +25640,7 @@ msgid "Uploading trace ..."
msgstr "正在上傳軌跡 ..."
msgid "Upload canceled"
-msgstr ""
+msgstr "取消上傳"
msgid "Error while uploading"
msgstr "上傳時發生錯誤"
@@ -25354,13 +25667,13 @@ msgid "Importing..."
msgstr "正在匯入..."
msgid "DXF files [ImportDxf plugin] (*.dxf)"
-msgstr ""
+msgstr "DXF 檔案 [匯入 DXF 插件] (*.dxf)"
msgid "Please open or create data layer before importing"
-msgstr ""
+msgstr "匯入前請先開啟或建立資料圖層"
msgid "Import dxf"
-msgstr ""
+msgstr "匯入 .dxf"
msgid "Scale:"
msgstr "縮放："
@@ -25372,31 +25685,31 @@ msgid "m"
msgstr "m"
msgid "Shows elevation profile"
-msgstr "顯示海拔設定檔"
+msgstr "顯示高度設定"
msgid "Elevation Profile"
-msgstr "海拔設定檔"
+msgstr "高度設定"
msgid "Elevation Grid Layer (experimental!)"
-msgstr ""
+msgstr "高度變化圖層 (測試中)"
msgid "Shows elevation grid layer"
-msgstr ""
+msgstr "顯示高度變化圖層"
msgid "Elevation Grid"
-msgstr ""
+msgstr "高度變化"
msgid "increase zoom level to see more detail"
msgstr "增加縮放等級以查看更多詳細資料"
msgid "No SRTM data"
-msgstr ""
+msgstr "沒有 SRTM 資料"
msgid "Open the elevation profile window."
msgstr "開啟海拔設定檔視窗。"
msgid "Min"
-msgstr ""
+msgstr "最小"
msgid "Avrg"
msgstr "平均"
@@ -25414,16 +25727,16 @@ msgid "Tracks"
msgstr "軌跡"
msgid "Elevation profile for track ''{0}''."
-msgstr ""
+msgstr "軌跡 ''{0}'' 的高度設定。"
msgid "Elevation profile"
-msgstr "海拔設定檔"
+msgstr "高度設定"
msgid "(No elevation data)"
-msgstr "(沒有海拔資料)"
+msgstr "(沒有高度資料)"
msgid "Can not save preferences"
-msgstr ""
+msgstr "無法儲存偏好設定"
msgid "Epsilon multiplier"
msgstr ""
@@ -25432,7 +25745,7 @@ msgid "Starting Epsilon"
msgstr ""
msgid "Max points count per 1 km"
-msgstr ""
+msgstr "每 1 公里最大點數"
msgid "Enter key mode"
msgstr ""
@@ -25450,7 +25763,7 @@ msgid "Save as is"
msgstr ""
msgid "Snap to nodes"
-msgstr ""
+msgstr "貼近節點"
msgid "Add fixed points on click"
msgstr ""
@@ -25471,10 +25784,10 @@ msgid "Try copying tags from properties table"
msgstr ""
msgid "Save settings"
-msgstr ""
+msgstr "儲存設定"
msgid "Can not read settings"
-msgstr ""
+msgstr "無法讀取設定"
msgid "Q=Options, Enter=save, Ctrl-Enter=save with tags, Up/Down=tune"
msgstr ""
@@ -25510,16 +25823,16 @@ msgid "Cannot place node outside of the world."
msgstr ""
msgid "Draw the way by mouse"
-msgstr ""
+msgstr "用滑鼠畫出路徑"
msgid "min distance={0} px ({1} m)"
-msgstr ""
+msgstr "最小距離={0} 像素 ({1} 公尺)"
msgid "Eps={0}, {1} points, {2} p/km"
msgstr ""
msgid "Fix addresses"
-msgstr ""
+msgstr "修正地址"
msgid "Show dialog with incomplete addresses"
msgstr "顯示不完整地址的對話盒"
@@ -25531,16 +25844,16 @@ msgid "Fix street addresses"
msgstr "修正街道地址"
msgid "Find and fix addresses without (valid) streets."
-msgstr "尋找並修正沒有（有效的）街道的地址。"
+msgstr "尋找並修正沒有 (有效的) 街道的地址。"
msgid "Address Edit"
msgstr "地址編輯"
msgid "Guess values for "
-msgstr "猜測數值： "
+msgstr "推測數值： "
msgid "Address has no street"
-msgstr "地址沒有街"
+msgstr "地址沒有街道"
msgid "Address has no valid street"
msgstr "地址缺少有效的街道"
@@ -25601,7 +25914,7 @@ msgstr "沒有項目"
msgctxt "address"
msgid "City"
-msgstr ""
+msgstr "城市"
msgid "Postcode"
msgstr "郵遞區號"
@@ -25630,16 +25943,16 @@ msgstr "轉換所有街道。"
msgid ""
"Create relation between street and related addresses for ALL streets in the "
"current layer."
-msgstr "對目前圖層中所有街道的街道和相關地址建立關係。"
+msgstr "對目前圖層中所有街道的街道和相關地址建立關聯。"
msgid "Convert to relation."
-msgstr "轉換為關係。"
+msgstr "轉換為關聯。"
msgid "Create relation between street and related addresses."
-msgstr "對街道和相關地址建立關係。"
+msgstr "對街道和相關地址建立關聯。"
msgid "Create address relation for "
-msgstr "建立地址關係： "
+msgstr "建立地址關聯： "
msgid "Guess"
msgstr "猜測"
@@ -25671,20 +25984,20 @@ msgid "Use tag ''addr:street'' or ''addr:place''"
msgstr ""
msgid "House Number Editor"
-msgstr ""
+msgstr "門牌號碼編輯工具"
msgid "House number increment:"
-msgstr ""
+msgstr "門牌號碼增加數："
msgid "Updating properties of up to {0} object"
msgid_plural "Updating properties of up to {0} objects"
msgstr[0] "更新 {0} 個物件之多的屬性"
msgid "Default image projection"
-msgstr ""
+msgstr "預設的影像投影法"
msgid "JOSM''s current projection"
-msgstr ""
+msgstr "JOSM 目前的投影法"
msgid ""
"No projection file (.prj) found.<br>You can choose the default image "
@@ -25697,7 +26010,7 @@ msgid "Layer Properties"
msgstr "圖層屬性"
msgid "Error while creating image layer: {0}"
-msgstr ""
+msgstr "建立影像圖層時發生錯誤：{0}"
msgid "Import image"
msgstr "匯入圖片"
@@ -25715,61 +26028,52 @@ msgid "Mapillary layer"
msgstr "Mapillary圖層"
msgid "Total images:"
-msgstr ""
+msgstr "影像總數："
msgid "images"
-msgstr ""
+msgstr "影像"
msgid "Mapillary object layer"
-msgstr ""
+msgstr "Mapillary 物件圖層"
msgid "Displays the layer displaying the map objects detected by Mapillary"
-msgstr ""
+msgstr "顯示 Mapillary 偵測出來的地圖物件的圖層"
msgid "Mapillary"
msgstr "Mapillary"
msgid "Create Mapillary layer"
-msgstr "建立Mapillary圖層"
+msgstr "建立 Mapillary 圖層"
msgid "Start Mapillary layer"
-msgstr "開始Mapillary圖層"
+msgstr "開始 Mapillary 圖層"
msgid "Download Mapillary images in current view"
-msgstr "依據目前檢視下載Mapillary影像"
+msgstr "依據目前檢視下載 Mapillary 影像"
msgid "Export pictures"
-msgstr ""
+msgstr "匯出圖片"
msgid "Export Mapillary pictures"
-msgstr "匯出Mapillary圖片"
+msgstr "匯出 Mapillary 圖片"
msgid "Export images"
-msgstr ""
+msgstr "匯出影像"
msgid "Import pictures"
-msgstr ""
+msgstr "匯入圖片"
msgid "Import local pictures"
-msgstr ""
+msgstr "匯入本機圖片"
msgid "Import pictures into Mapillary layer"
-msgstr "匯入圖片到Mapillary圖層"
-
-msgid "Select pictures"
-msgstr ""
-
-msgid "Import pictures into sequence"
-msgstr ""
-
-msgid "Import pictures into Mapillary layer in a sequence"
-msgstr "以序列方式匯入圖片到Mapillary圖層"
+msgstr "匯入圖片到 Mapillary 圖層"
msgid "Join mode"
-msgstr ""
+msgstr "加入模式"
msgid "Join/unjoin pictures"
-msgstr ""
+msgstr "加入/退出圖片"
msgid "Submit changeset"
msgstr ""
@@ -25791,13 +26095,13 @@ msgid ""
msgstr ""
msgid "Upload pictures"
-msgstr ""
+msgstr "已上傳圖片"
msgid "Upload Mapillary pictures"
-msgstr "上傳Mapillary圖片"
+msgstr "上傳 Mapillary 圖片"
msgid "Upload pictures."
-msgstr ""
+msgstr "已上傳的圖片。"
msgid "Walk mode"
msgstr ""
@@ -25806,7 +26110,7 @@ msgid "Zoom to selected image"
msgstr ""
msgid "Zoom to the currently selected Mapillary image"
-msgstr "縮放到目前選取的Mapiilary影像"
+msgstr "縮放到目前選取的 Mapiilary 影像"
msgid "Current Mapillary changeset"
msgstr ""
@@ -25833,16 +26137,16 @@ msgid "Rewrite imported images"
msgstr ""
msgid "Select a folder"
-msgstr ""
+msgstr "選取資料夾"
msgid "Explore"
-msgstr ""
+msgstr "瀏覽"
msgid "Select a directory"
-msgstr ""
+msgstr "選取目錄"
msgid "Speed limit"
-msgstr ""
+msgstr "速限"
msgid "Give way"
msgstr ""
@@ -25860,28 +26164,28 @@ msgid "Uneven road"
msgstr ""
msgid "No parking"
-msgstr ""
+msgstr "禁止停車"
msgid "No overtaking"
-msgstr ""
+msgstr "禁止超車"
msgid "Pedestrian crossing"
-msgstr ""
+msgstr "行人穿越"
msgid "No turn"
-msgstr ""
+msgstr "禁止轉彎"
msgid "Years"
-msgstr ""
+msgstr "年"
msgid "Months"
-msgstr ""
+msgstr "月"
msgid "Days"
-msgstr ""
+msgstr "日"
msgid "Imported images"
-msgstr ""
+msgstr "匯入的圖片"
msgid "Mapillary filter"
msgstr ""
@@ -25890,28 +26194,28 @@ msgid "Open Mapillary filter dialog"
msgstr ""
msgid "Not older than: "
-msgstr ""
+msgstr "不早於： "
msgid "Downloaded images"
-msgstr ""
+msgstr "下載的影像"
msgid "Only images with signs"
msgstr ""
msgid "Choose signs"
-msgstr ""
+msgstr "選取標誌"
msgid "Mapillary history"
-msgstr "Mapillary歷史記錄"
+msgstr "Mapillary 歷史記錄"
msgid "Open Mapillary history dialog"
msgstr ""
msgid "No image selected"
-msgstr ""
+msgstr "沒有選取圖片"
msgid "Press \"{0}\" to download images"
-msgstr ""
+msgstr "按 \"{0}\" 下載影像"
msgid "Mapillary picture"
msgstr ""
@@ -25920,40 +26224,40 @@ msgid "Open Mapillary window"
msgstr ""
msgid "Next picture"
-msgstr ""
+msgstr "下一張圖片"
msgid "Shows the next picture in the sequence"
-msgstr ""
+msgstr "依序顯示下一張"
msgid "Previous picture"
-msgstr ""
+msgstr "上一張圖片"
msgid "Shows the previous picture in the sequence"
-msgstr ""
+msgstr "依序顯示上一張圖片"
msgid "Jump to red"
-msgstr ""
+msgstr "跳到紅色"
msgid "Jumps to the picture at the other side of the red line"
-msgstr ""
+msgstr "跳到紅線另一邊的圖片"
msgid "Jump to blue"
-msgstr ""
+msgstr "跳到藍色"
msgid "Jumps to the picture at the other side of the blue line"
-msgstr ""
+msgstr "跳到藍線另一邊的圖片"
msgid "Stops the walk."
msgstr ""
msgid "Play"
-msgstr ""
+msgstr "播放"
msgid "Continues with the paused walk."
msgstr ""
msgid "Pause"
-msgstr ""
+msgstr "暫停"
msgid "Pauses the walk."
msgstr ""
@@ -25962,7 +26266,7 @@ msgid "Display hour when the picture was taken"
msgstr ""
msgid "Use 24 hour format"
-msgstr ""
+msgstr "使用 24 小時格式"
msgid "Move to picture''s location with next/previous buttons"
msgstr ""
@@ -25974,19 +26278,19 @@ msgid "Cut off sequences at download bounds"
msgstr ""
msgid "Download mode"
-msgstr ""
+msgstr "下載模式"
msgid "You are logged in as ''{0}''."
-msgstr ""
+msgstr "你已經登入為 ''{0}''。"
msgid "You are currently not logged in."
-msgstr ""
+msgstr "你目前沒登入。"
msgid "Login"
-msgstr ""
+msgstr "登入"
msgid "Logout"
-msgstr ""
+msgstr "登出"
msgid "Go to setting and log in to Mapillary before uploading."
msgstr ""
@@ -26004,6 +26308,43 @@ msgid "Follow selected image"
msgstr ""
msgid "Go forward"
+msgstr "往前。"
+
+msgid "Which image layers do you want to import into the Mapillary layer?"
+msgstr ""
+
+msgid "Import"
+msgstr "匯入"
+
+msgid ""
+"From which source do you want to import images to the Mapillary layer?"
+msgstr ""
+
+msgid "There are currently no layers with geotagged images!"
+msgstr ""
+
+msgid "Images from my file system"
+msgstr ""
+
+msgid "Select the images you want to import"
+msgstr ""
+
+msgid "All images in a directory"
+msgstr ""
+
+msgid "Select directory to import images from"
+msgstr ""
+
+msgid "From existing image layer"
+msgstr ""
+
+msgid "Import exception"
+msgstr ""
+
+msgid "Could not import the image ''{0}''!"
+msgstr ""
+
+msgid "Could not import the directory ''{0}''!"
msgstr ""
msgid ""
@@ -26033,23 +26374,29 @@ msgid ""
msgstr ""
msgid "I got it, close this."
-msgstr ""
+msgstr "我知道了，關掉吧。"
msgid "Image info"
-msgstr ""
+msgstr "影像資訊"
msgid "Displays detail information on the currently selected Mapillary image"
msgstr ""
-msgid "View in browser"
+msgid "Show detections on top of image"
msgstr ""
+msgid "View in browser"
+msgstr "在瀏覽器中觀看"
+
msgid "Copy key"
msgstr ""
msgid "Add Mapillary tag"
msgstr ""
+msgid "Image detections"
+msgstr ""
+
msgid "Image actions"
msgstr ""
@@ -26059,15 +26406,33 @@ msgstr ""
msgid "Sequence key"
msgstr ""
+msgid "{0} detections"
+msgstr ""
+
msgid "image has no key"
msgstr ""
+msgid "unknown user"
+msgstr "未知的使用者"
+
msgid "sequence has no key"
msgstr ""
msgid "Could not open the URL {0} in a browser"
msgstr ""
+msgid "Downloading map objects…"
+msgstr ""
+
+msgid "All map objects loaded."
+msgstr ""
+
+msgid "Too many map objects, zoom in to see all."
+msgstr ""
+
+msgid "Downloading map objects failed!"
+msgstr ""
+
msgid "Mapillary objects"
msgstr ""
@@ -26076,31 +26441,33 @@ msgstr ""
msgid "Deleted {0} image"
msgid_plural "Deleted {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "刪除了 {0} 個影像"
msgid "Imported {0} image"
msgid_plural "Imported {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "匯入了 {0} 個影像"
msgid "2 images joined"
-msgstr ""
+msgstr "加入了 2 個影像"
msgid "Moved {0} image"
msgid_plural "Moved {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "移動了 {0} 個影像"
msgid "Turned {0} image"
msgid_plural "Turned {0} images"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "旋轉了 {0} 個影像"
msgid "2 images unjoined"
+msgstr "退出了 2 個影像"
+
+msgid "Could not read from URL {0}!"
msgstr ""
-msgid "Could not read map objects from URL {0}!"
+msgid ""
+"{0}\n"
+"Could not read map objects from URL\n"
+"{1}!"
msgstr ""
msgid "everything in the visible area"
@@ -26117,14 +26484,11 @@ msgid ""
"area until the layer is restarted."
msgstr ""
-msgid "Could not read sequences from URL {0}!"
-msgstr ""
-
msgid "Downloading"
-msgstr ""
+msgstr "正在下載"
msgid "Select mode"
-msgstr ""
+msgstr "選擇模式"
msgid "Mapillary login"
msgstr ""
@@ -26145,13 +26509,13 @@ msgid "Submitting Mapillary Changeset"
msgstr ""
msgid "No images found"
-msgstr ""
+msgstr "找不到影像"
msgid "You have successfully uploaded {0} images to mapillary.com"
msgstr ""
msgid "Finished upload"
-msgstr ""
+msgstr "上傳完畢"
msgid "You are not logged in, please log in to Mapillary in the preferences"
msgstr ""
@@ -26160,7 +26524,7 @@ msgid "Not Logged in to Mapillary"
msgstr ""
msgid "Uploading: {0}"
-msgstr ""
+msgstr "上傳中：{0}"
msgid "NanoLog"
msgstr ""
@@ -26181,7 +26545,7 @@ msgid "Correlate entries with GPS trace"
msgstr ""
msgid "Save layer..."
-msgstr ""
+msgstr "儲存圖層..."
msgid "Save NanoLog layer"
msgstr ""
@@ -26235,7 +26599,7 @@ msgid "edit new tag"
msgstr ""
msgid "Display clock in 12h mode."
-msgstr ""
+msgstr "顯示 12 小時時間格式。"
msgid "Choose key"
msgstr "選擇設定鍵"
@@ -26259,40 +26623,40 @@ msgid "open end"
msgstr "開放結束"
msgid "Import Osm Inspector Bugs..."
-msgstr ""
+msgstr "匯入 OSM 檢驗工具臭蟲..."
msgid "OsmInspector"
-msgstr ""
+msgstr "OSM 檢驗工具"
msgid "Open OsmInspector"
-msgstr ""
+msgstr "開啟 OSM 檢驗工具"
msgid "OsmBugInfo"
-msgstr ""
+msgstr "OSM 臭蟲資訊"
msgid "Open a OSM Inspector selection list window."
-msgstr ""
+msgstr "開啟 OSM 檢驗工具的選取清單視窗。"
msgid "Current Selected Bug Info"
-msgstr ""
+msgstr "目前選取的臭蟲資訊"
msgid "Prev OSMI bug"
-msgstr ""
+msgstr "上一個 OSMI 臭蟲"
msgid "Next OSMI bug"
-msgstr ""
+msgstr "下一個 OSMI 臭蟲"
msgid "OSM Inspector Bugs"
-msgstr ""
+msgstr "OSM 檢驗工具臭蟲"
msgid "Selected Bug Info"
-msgstr ""
+msgstr "已選取的臭蟲資訊"
msgid "Handy Address Interpolation Functions"
-msgstr "便利住址填寫功能"
+msgstr "便利住址插入功能"
msgid "Define Address Interpolation"
-msgstr "定義內插法地址"
+msgstr "定義地址插入"
msgid "Odd"
msgstr "奇數"
@@ -26316,7 +26680,7 @@ msgid "Potential"
msgstr "潛在"
msgid "Relation: {0}"
-msgstr "關係：{0}"
+msgstr "關聯：{0}"
msgid "Associate with street using:"
msgstr "與街道關聯的方式："
@@ -26361,16 +26725,16 @@ msgid "Optional Information:"
msgstr "選擇性的資訊："
msgid "Please select a street to associate with address interpolation way"
-msgstr "請選擇要與內插法地址的街道"
+msgstr "請選取一條街道做為要插入地址的路徑"
msgid "Please select address interpolation way for this street"
-msgstr "請選擇這個街道的內插法地址"
+msgstr "請為這條街道選取要插入地址的路徑"
msgid "Expected odd numbers for addresses"
-msgstr "預測的奇數地址"
+msgstr "地址預編奇數門牌號碼"
msgid "Expected even numbers for addresses"
-msgstr "預測的偶數地址"
+msgstr "地址預編偶數門牌號碼"
msgid "Expected valid number for increment"
msgstr ""
@@ -26464,7 +26828,7 @@ msgid "Angle preserved"
msgstr ""
msgid "Align with:"
-msgstr ""
+msgstr "排列按："
msgid ""
"<html>Aligns the way segment to the reference so that its length is "
@@ -26550,12 +26914,12 @@ msgid ""
"\n"
msgstr ""
"<html>\n"
-"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays會幫助您對齊兩個\n"
-"路徑區段。舉例來說，當您在描繪建築物的\n"
+"<p style=\"font-family: sans-serif; font-weight: bold;\">AlignWays會幫助你對齊兩個\n"
+"路徑區段。舉例來說，當你在描繪建築物的\n"
"輪廓而且希望它的邊緣和街道或道路平行\n"
"時會很有幫助。<br>\n"
"<br>\n"
-"在您開始前有些密訣可能有所幫助：\n"
+"在你開始前有些密訣可能有所幫助：\n"
"</p>\n"
"</html>\n"
"\n"
@@ -26576,7 +26940,7 @@ msgstr ""
"<html>\n"
"<div style=\"font-family: sans-serif;\">\n"
"<ul>\n"
-"<li><b>Select a reference segment.</b> 要這麼做您可以按<b><i><span "
+"<li><b>Select a reference segment.</b> 要這麼做你可以按<b><i><span "
"style=\"color:green\">Ctrl-點選</span></i></b>\n"
"一個區段。而另一個，要被對齊的區段就會變得跟這個區段\n"
"平行。</li>\n"
@@ -26644,7 +27008,7 @@ msgid ""
msgstr ""
"<html>\n"
"<div style=\"font-family:sans-serif\">\n"
-"<b>Last hint:</b> 如果您想要重新開始選擇，有一個很簡單的方法： <b><i><span "
+"<b>Last hint:</b> 如果你想要重新開始選擇，有一個很簡單的方法： <b><i><span "
"style=\"color:green\">Alt-點選</span></i></b> 地圖的某個地方。\n"
"</div>\n"
"</html>\n"
@@ -26654,7 +27018,7 @@ msgid "Don''t show this again"
msgstr "不要再次顯示這個訊息"
msgid "What''s new..."
-msgstr ""
+msgstr "有什麼新玩意兒..."
msgid "Added <b>angle preserving</b> aligning mode"
msgstr ""
@@ -26663,78 +27027,77 @@ msgid "Various improvements and bugfixes"
msgstr ""
msgid "Errr..."
-msgstr ""
+msgstr "呃..."
msgid "Browser not supported."
-msgstr ""
+msgstr "瀏覽器不支援。"
msgid "Building address"
msgstr "建築地址"
msgid "empty"
-msgstr ""
+msgstr "空白"
msgid "skip"
-msgstr ""
+msgstr "跳過"
msgid "House number:"
msgstr "門牌號碼："
msgid "Street:"
-msgstr ""
+msgstr "街道："
msgid "Post code:"
-msgstr ""
+msgstr "郵遞區號："
msgid "Building:"
-msgstr ""
+msgstr "大樓："
msgid "Tags:"
msgstr "標籤:"
msgid "Source:"
-msgstr ""
+msgstr "來源："
msgid "Name:"
msgstr "名稱："
msgid "updated building info"
-msgstr ""
+msgstr "更新建築物資訊中..."
msgid "Tag Element"
-msgstr ""
+msgstr "標記元件"
msgid "Select an item to tag."
-msgstr ""
+msgstr "選取一個要標記的項目。"
msgid "Tag Building"
-msgstr ""
+msgstr "標記建築物"
msgid "Tools: {0}"
-msgstr ""
+msgstr "工具：{0}"
msgid "Area Selection"
-msgstr ""
+msgstr "選取區域"
msgid "Select an area (e.g. building) from an underlying image."
-msgstr ""
+msgstr "在底圖影像中選取一個區域 (例如建築物)。"
msgid "Area Selector"
-msgstr ""
+msgstr "區域選取工具"
msgid "Trying to detect an area at:"
-msgstr ""
+msgstr "正在嘗試偵測區域於："
msgid "Created area"
-msgstr ""
+msgstr "建立區域"
msgid "Add address"
msgid_plural "Add addresses"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "加入地址"
msgid "Unable to detect a polygon where you clicked."
-msgstr ""
+msgstr "無法在你點的地方找到多邊形。"
msgid "Error Report"
msgstr ""
@@ -26768,7 +27131,7 @@ msgid ""
msgstr ""
msgid "Algorithm"
-msgstr ""
+msgstr "演算法"
msgid ""
"Maximum distance in meters between a point and the line to be considered as "
@@ -26776,7 +27139,7 @@ msgid ""
msgstr ""
msgid "Distance Tolerance"
-msgstr ""
+msgstr "距離寬限"
msgid ""
"Lines with a smaller angle (degrees) than this will be combined to one line "
@@ -26793,7 +27156,7 @@ msgid ""
msgstr ""
msgid "Color Threshold"
-msgstr ""
+msgstr "顏色門檻值"
msgid "Use HSV based algorithm"
msgstr ""
@@ -26815,7 +27178,7 @@ msgid "Show Address Dialog after mapping an area"
msgstr ""
msgid "merge nodes"
-msgstr ""
+msgstr "合併節點"
msgid "Merge nodes with existing nodes"
msgstr ""
@@ -26829,7 +27192,7 @@ msgid ""
msgstr ""
msgid "Debug"
-msgstr ""
+msgstr "除錯"
msgid "Debugging mode will write images for each processing step."
msgstr ""
@@ -26846,6 +27209,9 @@ msgstr ""
msgid "Successfully added address to selected object:"
msgstr ""
+msgid "Distance between building center and address coordinates:"
+msgstr "建築物中心與地址座標的距離："
+
msgid "No address was found for this object."
msgstr ""
@@ -26865,7 +27231,7 @@ msgid "There is no frame loaded !"
msgstr ""
msgid "Alert Message"
-msgstr ""
+msgstr "警告提示"
msgid "Street Name:"
msgstr "街道名稱："
@@ -27002,7 +27368,7 @@ msgid "Reunion RGR92 cache file (.UTM4)"
msgstr "Reunion RGR92 快取檔案 (.UTM4)"
msgid "CadastreGrabber: Illegal url."
-msgstr "CadastreGrabber: 不合法的 url。"
+msgstr "CadastreGrabber: 不合規定的 URL 網址。"
msgid ""
"Cannot open a new client session.\n"
@@ -27035,7 +27401,7 @@ msgstr ""
msgid ""
"Warning: failed to put option pane dialog always on top. Exception was: {0}"
-msgstr "警告：無法將選項窗格置於最上層。例外為：{0}"
+msgstr "警告：無法將選項窗格置於最上層。異常為：{0}"
msgid ""
"To enable the cadastre WMS plugin, change\n"
@@ -27053,7 +27419,7 @@ msgid "Replace original background by JOSM background color."
msgstr "以 JOSM 背景顏色取代原始背景。"
msgid "Reverse grey colors (for black backgrounds)."
-msgstr "反轉灰色（用於黑色背景）。"
+msgstr "反轉灰色 (用於黑色背景) 。"
msgid "Set background transparent."
msgstr "設定背景透明度。"
@@ -27074,25 +27440,25 @@ msgid "Select first WMS layer in list."
msgstr "先在清單中選取一個 WMS 圖層。"
msgid "Don''t use relation for addresses (but \"addr:street\" on elements)."
-msgstr "不使用住址的關係（除了元素 \"addr:street\"）。"
+msgstr "不使用住址的關聯 (除了元素 \"addr:street\") 。"
msgid "off"
-msgstr ""
+msgstr "關閉"
msgid "25 m"
-msgstr ""
+msgstr "25 m"
msgid "50 m"
-msgstr ""
+msgstr "50 m"
msgid "100 m"
-msgstr ""
+msgstr "100 m"
msgid "high"
-msgstr ""
+msgstr "高"
msgid "medium"
-msgstr ""
+msgstr "中"
msgid "low"
msgstr "低"
@@ -27148,12 +27514,12 @@ msgstr "<html>當自動來源啓用時設定鍵「source」的數值</html>"
msgid ""
"Replace the original white background by the background color defined in "
"JOSM preferences."
-msgstr ""
+msgstr "用 JOSM 偏好設定裏調整的背景顏色，換掉原本的白色背景。"
msgid ""
"Invert the original black and white colors (and all intermediate greys). "
"Useful for texts on dark backgrounds."
-msgstr "反轉原始的黑色與白色（和所有中間的灰色）。當文字在暗色背景中時很有用。"
+msgstr "反轉原始的黑色與白色 (和所有中間的灰色) 。當文字在暗色背景中時很有用。"
msgid "Allows multiple layers stacking"
msgstr "允許多重圖層堆疊"
@@ -27177,7 +27543,7 @@ msgid "Low resolution (600x400)"
msgstr "低解析度 (600x400)"
msgid "Image filter interpolation:"
-msgstr "圖片過濾條件插補："
+msgstr "影像過濾條件插補："
msgid "Nearest-Neighbor (fastest) [ Default ]"
msgstr "最鄰近 (最快) [預設值]"
@@ -27195,22 +27561,22 @@ msgid "Grab one image full screen"
msgstr "抓取一張全螢幕圖片"
msgid "Grab smaller images (higher quality but use more memory)"
-msgstr "抓取較小的圖片（較高的品質但消耗更多記憶體）"
+msgstr "抓取較小的圖片 (較高的品質但消耗更多記憶體)"
msgid "Fixed size square (default is 100m)"
-msgstr "固定大小矩形（預設為 100m）"
+msgstr "固定大小矩形 (預設為 100m)"
msgid "Fixed size (from 25 to 1000 meters)"
-msgstr "固定大小（從 25 到 100 公尺）"
+msgstr "固定大小 (從 25 到 100 公尺)"
msgid "Layers:"
msgstr "圖層："
msgid "Sea, rivers, swimming pools."
-msgstr ""
+msgstr "海洋、河川、游泳池。"
msgid "Buildings, covers, underground constructions."
-msgstr "建築、遮蔽物、地下建築物。"
+msgstr "大樓、遮蔽物、地下建築物。"
msgid "Symbols like cristian cross."
msgstr "符號，像十字架之類。"
@@ -27345,13 +27711,13 @@ msgid ""
"Do you want to use them ?"
msgstr ""
"這張圖片包含地理參照資料。\n"
-"您是否想要使用它們？"
+"你是否想要使用它們？"
msgid "Load layer from cache"
msgstr ""
msgid "Load location from cache (only if cache is enabled)"
-msgstr "從快取載入位置（只有在快取已啟用時）"
+msgstr "從快取載入位置 (只有在快取已啟用時)"
msgid "{0} not allowed with the current projection"
msgstr "{0} 不允許使用目前的投影法"
@@ -27362,7 +27728,7 @@ msgstr "不能載入快取 {0}，因為與目前的投影法區域不相容"
msgid ""
"Selected file {0} is not a cache file from this plugin (invalid extension)"
-msgstr "選取的檔案 {0} 不是這個外掛程式的快取檔案（無效的延伸檔名）"
+msgstr "選取的檔案 {0} 不是這個外掛程式的快取檔案 (無效的延伸檔名)"
msgid "The location {0} is already on screen. Cache not loaded."
msgstr "位置 {0} 已經在畫面上。快取未載入。"
@@ -27409,16 +27775,16 @@ msgid "Reset cookie"
msgstr "重設 cookie"
msgid "Get a new cookie (session timeout)"
-msgstr "取得新的 cookie（作業階段逾時）"
+msgstr "取得新的 cookie (作業階段逾時)"
msgid "Save image as..."
-msgstr ""
+msgstr "影像另存為..."
msgid "PNG files (*.png)"
msgstr "PNG 檔案 (*.png)"
msgid "GeoTiff files (*.tif)"
-msgstr ""
+msgstr "GeoTiff 檔案 (*.tif)"
msgid "Export image (only raster images)"
msgstr ""
@@ -27445,7 +27811,7 @@ msgid ""
"Do you want to cancel completely\n"
"or just retry "
msgstr ""
-"您是否想要完全取消或是\n"
+"你是否想要完全取消或是\n"
"要再試一次 "
msgid ""
@@ -27488,10 +27854,10 @@ msgstr ""
"請先選擇它們中的一個，然後重試"
msgid "Reset offset"
-msgstr ""
+msgstr "重設偏移"
msgid "Reset offset (only vector images)"
-msgstr ""
+msgstr "重設偏移 (只限向量影像)"
msgid "Blank Layer"
msgstr "空白圖層"
@@ -27506,7 +27872,7 @@ msgid "Bounding box: {0}"
msgstr ""
msgid "Image size (px): {0}/{1}"
-msgstr ""
+msgstr "影像大小 (像數)：{0}/{1}"
msgid "Is vectorized."
msgstr "是向量化的。"
@@ -27540,7 +27906,7 @@ msgid "Please select a scheme to use."
msgstr "請選擇要使用的配置。"
msgid "Color Scheme"
-msgstr "色彩配置"
+msgstr "顏色配置"
msgid "Please select the scheme to delete."
msgstr "請選擇要刪除的配置。"
@@ -27591,7 +27957,7 @@ msgid "Remove selected matches"
msgstr ""
msgid "Remove ({0})"
-msgstr ""
+msgstr "移除 ({0})"
msgid "Conflate"
msgstr ""
@@ -27660,7 +28026,7 @@ msgid "Interrupted Sequence ({0}/{1}): {2}"
msgstr ""
msgid " Max: "
-msgstr ""
+msgstr " 最大： "
msgid "Filter by area. Min: "
msgstr ""
@@ -27678,19 +28044,19 @@ msgid "Weight"
msgstr "重量限制"
msgid "Standard Distance"
-msgstr ""
+msgstr "標準距離"
msgid "below"
msgstr ""
msgid "Maximum Distance"
-msgstr ""
+msgstr "最大距離"
msgid "Centroid Distance"
-msgstr ""
+msgstr "中心距離"
msgid "Hausdorff Distance (Centroids Aligned)"
-msgstr ""
+msgstr "郝斯多夫距離 (按幾何中心對齊)"
msgid "Symmetric Difference"
msgstr ""
@@ -27713,6 +28079,12 @@ msgstr ""
msgid "List of tags to match"
msgstr ""
+msgid "Identical Elements Filter"
+msgstr ""
+
+msgid "Avoid matching an element with itself"
+msgstr ""
+
msgid ""
"Filtering will speed up the matching process. Filter By Window weeds out "
"matches between features whose envelopes do not overlap. Filter By Area is "
@@ -27733,46 +28105,54 @@ msgstr ""
msgid "Unioning"
msgstr ""
-msgid "Simple Example"
+msgid "Programming"
msgstr ""
-msgid "Advanced Example"
+msgid "Replace Geometry"
msgstr ""
-msgid "<Please select data>"
+msgid "Merge Tags"
msgstr ""
-msgid "Configure conflation settings"
+msgid "List of tags to merge"
msgstr ""
-msgid "Generate matches"
+msgid "except"
msgstr ""
-msgid "Reference:"
+msgid "List of tags to NOT merge (they will be ignored)"
msgstr ""
-msgid "Subject:"
+msgid "Overwrite tags without confirmation"
msgstr ""
-msgid "Programming"
+msgid ""
+"List of tags to overwrite on conflict using reference layer without "
+"confirmation"
msgstr ""
-msgid "Merging"
+msgid "Simple Example"
msgstr ""
-msgid "Replace Geometry"
+msgid "Advanced Example"
msgstr ""
-msgid "Merge Tags"
+msgid "<Please select data>"
msgstr ""
-msgid "List of tags to merge"
+msgid "Configure conflation settings"
msgstr ""
-msgid "Overwrite tags without confirmation"
+msgid "Generate matches"
+msgstr ""
+
+msgid "Merging"
+msgstr "合併"
+
+msgid "Reference:"
msgstr ""
-msgid "List of tags to overwrite without confirmation"
+msgid "Subject:"
msgstr ""
msgid "Selections must be made for both reference and subject."
@@ -27805,23 +28185,29 @@ msgstr ""
msgid "Freeze reference selection"
msgstr ""
+msgid "Reference and subject sets should better be different."
+msgstr ""
+
+msgid "Relations are not supported yet, please do not select them."
+msgstr ""
+
msgid "Disambiguating"
msgstr ""
msgid "One to One"
-msgstr ""
+msgstr "一對一"
msgid "Distance"
-msgstr ""
+msgstr "距離"
msgid "Standard"
-msgstr ""
+msgstr "標準"
msgid "Centroid"
-msgstr ""
+msgstr "幾何中心"
msgid "Hausdorff"
-msgstr ""
+msgstr "郝斯多夫"
msgid "List of tags to match (default: none)"
msgstr ""
@@ -27842,7 +28228,7 @@ msgid "Supress the default modal progress monitor when downloading."
msgstr ""
msgid "Download Settings"
-msgstr ""
+msgstr "下載設定"
msgid "Settings for the continuous download."
msgstr ""
@@ -27858,7 +28244,7 @@ msgid ""
msgstr ""
msgid "Requires restart"
-msgstr ""
+msgstr "要求重新開始"
msgid "Max threads"
msgstr ""
@@ -27875,7 +28261,7 @@ msgid ""
msgstr ""
msgid "Wait time (milliseconds)"
-msgstr ""
+msgstr "等待時間 (毫秒)"
msgid ""
"How much extra area around the viewport is it going to download. Setting "
@@ -27883,7 +28269,7 @@ msgid ""
msgstr ""
msgid "Extra download area"
-msgstr ""
+msgstr "擴大下載面積"
msgid ""
"Max area to download in degrees^2. Increasing this number will cause the "
@@ -27891,7 +28277,7 @@ msgid ""
msgstr ""
msgid "Max download area"
-msgstr ""
+msgstr "最大下載面積"
msgid "The strategy for finding what areas to request from the server."
msgstr ""
@@ -27916,8 +28302,8 @@ msgid ""
"relation.\n"
"Remove the area from the relation before splitting it."
msgstr ""
-"選取的區域不能分離，因為它是某個關係的成員。\n"
-"在分離它之前請先將區域自關係中移除。"
+"選取的區域不能分離，因為它是某個關聯的成員。\n"
+"在分離它之前請先將區域自關聯中移除。"
msgid "TangoGPS Files (*.log)"
msgstr "TangoGPS 檔案 (*.log)"
@@ -27993,7 +28379,7 @@ msgid ""
"\n"
"stderr contents:"
msgstr ""
-"子命令稿傳回了無效的資料。\n"
+"下層命令稿傳回了無效的資料。\n"
"\n"
"stderr 內容為："
@@ -28016,7 +28402,7 @@ msgid "Delete tool \"{0}\"?"
msgstr "是否刪除工具「{0}」？"
msgid "Are you sure?"
-msgstr "您確定嗎？"
+msgstr "你確定嗎？"
msgid "New tool..."
msgstr "新增工具..."
@@ -28028,75 +28414,74 @@ msgid "Public"
msgstr ""
msgid "Could not get server response, check logs"
-msgstr ""
+msgstr "無法取得伺服器回應，檢查記錄擋"
msgid "Failed to login as {0}:"
-msgstr ""
+msgstr "無法登入為 {0}："
msgid "The server did not return user ID"
-msgstr ""
+msgstr "伺服器沒有傳回使用者 ID"
msgid "Failed to get messages as {0}:"
-msgstr ""
+msgstr "無法以 {0} 取得訊息："
msgid "GeoChat"
-msgstr ""
+msgstr "GeoChat"
msgid "Open GeoChat panel"
-msgstr ""
+msgstr "開啟 GeoChat 面板"
msgid "Zoom in to see messages"
-msgstr ""
+msgstr "放大以觀看訊息"
msgid "Enable autologin"
-msgstr ""
+msgstr "啟用自動登入"
msgid "{0} user"
msgid_plural "{0} users"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} 個使用者"
msgid "not logged in"
-msgstr ""
+msgstr "沒有登入"
msgid "Failed to log in to GeoChat:"
-msgstr ""
+msgstr "無法登入 GeoChat："
msgid "Failed to send message:"
-msgstr ""
+msgstr "無法傳送訊息："
msgid "User {0} has left"
-msgstr ""
+msgstr "使用者 {0} 已離開"
msgid "User {0} is mapping nearby"
-msgstr ""
+msgstr "使用者 {0} 在繪製附近地圖"
msgid "Users mapping nearby:"
-msgstr ""
+msgstr "在繪製附近地圖的使用者："
msgid "Private chat"
-msgstr ""
+msgstr "私密對談"
msgid "Close tab"
-msgstr ""
+msgstr "關閉分頁"
msgid "Clear log"
-msgstr ""
+msgstr "清除記錄"
msgid "Show users on map"
-msgstr ""
+msgstr "顯示地圖上的使用者"
msgid "GeoJSON file"
-msgstr ""
+msgstr "GeoJSON 檔案"
msgid "Loading json file..."
-msgstr ""
+msgstr "正在載入 JSON 檔案..."
msgid "Data Layer from GeoJSON: "
-msgstr ""
+msgstr "來自 GeoJSON 的資料圖層： "
msgid "Error loading geojson file {0}"
-msgstr ""
+msgstr "載入 GeoJson 檔案 {0} 時發生錯誤"
msgid "Position only"
msgstr "只有位置"
@@ -28178,7 +28563,7 @@ msgid ""
"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
"plugin/"
msgstr ""
-"不能載入 rxtxSerial 程式庫。如果您需要安裝上的支援，試試在 http://www.raphael-mack.de/josm-"
+"不能載入 rxtxSerial 程式庫。如果你需要安裝上的支援，試試在 http://www.raphael-mack.de/josm-"
"globalsat-gpx-import-plugin/ 的 Globalsat 首頁"
msgid "Globalsat Import"
@@ -28187,14 +28572,11 @@ msgstr "Globalsat 匯入"
msgid "Import Data from Globalsat Datalogger DG100 into GPX layer."
msgstr "從 Globalsat Datalogger DG100 匯入資料到 GPX 圖層。"
-msgid "Import"
-msgstr "匯入"
-
msgid "GPS Blams"
-msgstr ""
+msgstr "GPS Blams"
msgid "GPSBlam"
-msgstr ""
+msgstr "GPSBlam"
msgid "select gpx points and \"blam!\", find centre and direction of spread"
msgstr ""
@@ -28203,7 +28585,7 @@ msgid "Add EGPX layer"
msgstr "加入 EGPX 圖層"
msgid "GPX Data"
-msgstr ""
+msgstr "GPX 資料"
msgid "Classes element below root child level"
msgstr ""
@@ -28310,6 +28692,8 @@ msgid ""
"File not found:\n"
"{0}"
msgstr ""
+"找不到檔案：\n"
+"{0}"
msgid ""
"Problem when accessing a file:\n"
@@ -28319,37 +28703,37 @@ msgstr ""
"{0}"
msgid "File not found:\n"
-msgstr ""
+msgstr "找不到檔案：\n"
msgid "Couldn''t find built-in ruleset {0}"
msgstr ""
msgid "height (m)"
-msgstr ""
+msgstr "高度 (公尺)"
msgid "width (m)"
-msgstr ""
+msgstr "寬度 (公尺)"
msgid "length (m)"
-msgstr ""
+msgstr "長度 (公尺)"
msgid "speed (km/h)"
-msgstr ""
+msgstr "速度 (公里/小時)"
msgid "weight (t)"
-msgstr ""
+msgstr "重量 (噸)"
msgid "axleload (t)"
msgstr ""
msgid "Bookmark name"
-msgstr ""
+msgstr "書籤名稱"
msgid "Bookmark name already exists!"
-msgstr ""
+msgstr "已有的書籤名稱！"
msgid "Bookmark name must not contain ''{0}''!"
-msgstr ""
+msgstr "書籤名稱必須包含 ''{0}''！"
msgid "Access class"
msgstr "存取類別"
@@ -28361,10 +28745,10 @@ msgid "Access types"
msgstr "存取類型"
msgid "Vehicle properties"
-msgstr ""
+msgstr "車輛屬性"
msgid "Road requirements"
-msgstr ""
+msgstr "道路需求"
msgid "Max. incline up (%, pos.)"
msgstr ""
@@ -28399,34 +28783,34 @@ msgid "Edit access parameters"
msgstr "編輯存取參數"
msgid "Graph View Dialog"
-msgstr ""
+msgstr "圖形檢視對話框"
msgid "Open the dialog for graph view configuration."
msgstr ""
msgid "default"
-msgstr ""
+msgstr "預設"
msgid "end nodes"
-msgstr ""
+msgstr "尾端節點"
msgid "incline"
-msgstr ""
+msgstr "建立/更新圖形"
msgid "Ruleset:"
msgstr ""
msgid "Parameters:"
-msgstr ""
+msgstr "參數："
msgid "Coloring:"
-msgstr ""
+msgstr "顏色："
msgid "Create/update graph"
-msgstr ""
+msgstr "建立/更新圖形"
msgid "Graphview"
-msgstr ""
+msgstr "圖形檢視"
msgid "Settings for the Graphview plugin that visualizes routing graphs."
msgstr ""
@@ -28441,57 +28825,59 @@ msgid "External ruleset directory:"
msgstr ""
msgid "Select directory"
-msgstr ""
+msgstr "選取目錄"
msgid "Vehicle"
-msgstr ""
+msgstr "車輛"
msgid "Restore defaults"
-msgstr ""
+msgstr "恢復為預設"
msgid "Visualization"
-msgstr ""
+msgstr "視覺化"
msgid "Draw directions separately"
msgstr ""
msgid "Node color"
-msgstr ""
+msgstr "節點顏色"
msgid "Arrow color"
-msgstr ""
+msgstr "箭頭顏色"
msgid "Arrowhead fill color"
-msgstr ""
+msgstr "箭頭填滿顏色"
msgid "Arrowhead placement"
-msgstr ""
+msgstr "箭頭位置"
msgid "New bookmark"
-msgstr ""
+msgstr "新書嵌"
msgid "Really delete \"{0}\"?"
-msgstr ""
+msgstr "確定要刪除 \"{0}\" ？"
msgid "Bookmark deletion"
-msgstr ""
+msgstr "刪除書籤"
msgid ""
"Really restore default bookmarks?\n"
"All manually added or edited bookmarks will be lost!"
msgstr ""
+"確定要恢復為預設書籤？\n"
+"所有自行加入或編輯的書籤都會消失！"
msgid "Bookmark reset"
-msgstr ""
+msgstr "重設書籤"
msgid "Choose node color"
-msgstr ""
+msgstr "選取節點顏色"
msgid "Choose arrow color"
-msgstr ""
+msgstr "選取箭頭顏色"
msgid "Choose arrowhead fill color"
-msgstr ""
+msgstr "選取箭頭填滿顏色"
msgid "Routing graph calculated by the GraphView plugin"
msgstr ""
@@ -28537,10 +28923,10 @@ msgid ""
msgstr ""
msgid "Imagery XML Files"
-msgstr ""
+msgstr "影像 XML 檔案"
msgid "Save Imagery XML file"
-msgstr ""
+msgstr "儲存影像 XML 檔案"
msgid "XML Imagery Bounds"
msgstr ""
@@ -28561,22 +28947,22 @@ msgid ""
msgstr ""
msgid "Open Imagery XML file"
-msgstr ""
+msgstr "開幾影像 XML 檔案"
msgid "Export tiles"
-msgstr ""
+msgstr "匯出圖磚"
msgid "Export cached tiles to file system."
-msgstr ""
+msgstr "將已取得的圖磚匯出到檔案系統。"
msgid "Exporting cached tiles"
-msgstr ""
+msgstr "匯出已取得的圖磚"
msgid "Failed to write image file {0}: {1}"
-msgstr ""
+msgstr "無法寫入影像檔案 {0}：{1}"
msgid "Failed to write image file {0}."
-msgstr ""
+msgstr "無法寫入養像檔案 {0}。"
msgid "Exported {0} tile from layer {1}."
msgid_plural "Exported {0} tiles from layer {1}."
@@ -28596,34 +28982,34 @@ msgid "Append cache name"
msgstr ""
msgid "Export Tiles"
-msgstr ""
+msgstr "匯出圖磚"
msgid "Cache name:"
-msgstr ""
+msgstr "快取名稱："
msgid "Object count:"
-msgstr ""
+msgstr "物件數："
msgid "file system path"
-msgstr ""
+msgstr "檔案系統路徑"
msgid "File system path the tiles are exported to."
-msgstr ""
+msgstr "要匯出圖磚的檔案系統路徑。"
msgid "Export directory:"
-msgstr ""
+msgstr "匯出目錄："
msgid "Append cache name to export directory."
-msgstr ""
+msgstr "將快取名稱加到要匯出的目錄。"
msgid "Tiles will be exported to directory {0}"
-msgstr ""
+msgstr "圖磚會被匯出到目錄 {0}"
msgid "No export directory set."
-msgstr ""
+msgstr "沒有設定匯出目錄。"
msgid "Calibration Layer"
-msgstr ""
+msgstr "校正圖層"
msgid "A deprecated calibration geometry of {0} nodes by {1}"
msgstr ""
@@ -28632,7 +29018,7 @@ msgid "A calibration geometry of {0} nodes by {1}"
msgstr ""
msgid "Change Color"
-msgstr ""
+msgstr "變換顏色"
msgid "Deprecate Offset"
msgstr ""
@@ -28676,20 +29062,17 @@ msgstr "載入圖片偏移..."
msgid "Error processing XML response: {0}"
msgstr ""
-msgid "Offset"
-msgstr ""
-
msgid "Imagery Offset Database"
msgstr "圖片偏移資料庫"
msgid "mm"
-msgstr ""
+msgstr "mm"
msgid "cm"
-msgstr ""
+msgstr "cm"
msgid "km"
-msgstr ""
+msgstr "km"
msgid "Calibration geometries"
msgstr ""
@@ -28715,22 +29098,22 @@ msgid "Created by {0} on {1}"
msgstr ""
msgid "Offset Information"
-msgstr ""
+msgstr "偏移資訊"
msgid "Report this offset"
-msgstr ""
+msgstr "回報有偏移"
msgid "You are to notify moderators of this offset. Why?"
-msgstr ""
+msgstr "你正要通知管理員有偏移，為什麼？"
msgid "Reporting the offset..."
-msgstr ""
+msgstr "正在回報偏移..."
msgid "An imagery offset of {0}"
msgstr "{0} 的圖片偏移"
msgid "Imagery ID"
-msgstr ""
+msgstr "影像 ID"
msgid "A calibration geometry of {0} nodes"
msgstr ""
@@ -28742,7 +29125,7 @@ msgid "Determined {0} away"
msgstr ""
msgid "Reason"
-msgstr ""
+msgstr "原因"
msgid "This entry has been reported."
msgstr ""
@@ -28799,24 +29182,6 @@ msgstr ""
msgid "This string should be 3 to 200 letters long."
msgstr ""
-msgid "Adjust imagery"
-msgstr ""
-
-msgid "Adjust the position of the selected imagery layer"
-msgstr ""
-
-msgid "Please select the imagery layer to adjust."
-msgstr ""
-
-msgid "Start adjusting"
-msgstr ""
-
-msgid "There are currently no imagery layer to adjust."
-msgstr ""
-
-msgid "No layers to adjust"
-msgstr ""
-
msgid "Normal"
msgstr "一般"
@@ -28829,12 +29194,21 @@ msgstr "旋轉 180 度"
msgid "Rotate 270"
msgstr "旋轉 270 度"
-msgid "Previous image"
-msgstr "上一幅圖片"
+msgid "WayPoint Image"
+msgstr "航點圖片"
+
+msgid "Display non-geotagged photos"
+msgstr "顯示無 geotag 的相片"
+
+msgid "Imported Images"
+msgstr "匯入的圖片"
msgid "Next image"
msgstr "下一幅圖片"
+msgid "Previous image"
+msgstr "上一幅圖片"
+
msgid "Rotate left"
msgstr "向左旋轉"
@@ -28847,15 +29221,6 @@ msgstr "向右旋轉"
msgid "Rotate image right"
msgstr "將圖片向右旋轉"
-msgid "WayPoint Image"
-msgstr "航點圖片"
-
-msgid "Display non-geotagged photos"
-msgstr "顯示無 geotag 的相片"
-
-msgid "Imported Images"
-msgstr "匯入的圖片"
-
msgid "Import vector graphics"
msgstr "匯入向量圖形"
@@ -28905,13 +29270,13 @@ msgid "Offset into background:"
msgstr ""
msgid "Indoor Mapping Helper"
-msgstr ""
+msgstr "室內製圖協助工具"
msgid "POWER"
msgstr ""
msgid "Activates the plug-in"
-msgstr ""
+msgstr "啟動這個插件"
msgid "Working Level"
msgstr ""
@@ -28935,7 +29300,7 @@ msgid "Sets the ref tag when the room-object is selected."
msgstr ""
msgid "Apply Tags"
-msgstr ""
+msgstr "套用標籤"
msgid "Fitting"
msgstr ""
@@ -28947,28 +29312,28 @@ msgid ""
msgstr ""
msgid "Level Selection"
-msgstr ""
+msgstr "樓層選擇"
msgid "Lowest Level"
-msgstr ""
+msgstr "最低樓層"
msgid "The lowest level of your building."
-msgstr ""
+msgstr "你的建築最低樓層。"
msgid "Highest Level"
-msgstr ""
+msgstr "最高樓層"
msgid "The highest level of your building."
-msgstr ""
+msgstr "你的建築最高樓層。"
msgid "Toolbox for indoor mapping assistance"
-msgstr ""
+msgstr "輔助室內製圖工具箱"
msgid "InfoMode"
-msgstr ""
+msgstr "資訊模式"
msgid "GPX info mode"
-msgstr ""
+msgstr "GPX 資訊模式"
msgid ""
"Move the mouse to show trackpoint info for current layer. Hold shift to "
@@ -28976,13 +29341,13 @@ msgid ""
msgstr ""
msgid "Delete this"
-msgstr ""
+msgstr "刪除這個"
msgid "Delete this&older"
msgstr ""
msgid "km/h"
-msgstr ""
+msgstr "公里/小時"
msgid "Track name: "
msgstr ""
@@ -28996,7 +29361,7 @@ msgid ""
"Resulting layer is to be saved as .osm and sent to Komzpa (me at komzpa.net) "
"with [irs rectify] in subject."
msgstr ""
-"這個選項會建立含有許些路徑的 IRS 調整圖層。您需要先調整 WMS 圖層的放置。\n"
+"這個選項會建立含有許些路徑的 IRS 調整圖層。你需要先調整 WMS 圖層的放置。\n"
"產生的圖層會儲存為 .osm 並以 [irs rectify] 為主旨寄給 Komzpa (me at komzpa.net)。"
msgid "IRS Adjustment Layer"
@@ -29054,11 +29419,11 @@ msgid "order of junction (n):"
msgstr "匯集點順序："
msgid "produce OSM-Relations: junction"
-msgstr "產生 OSM 關係：匯集點"
+msgstr "產生 OSM 關聯：匯集點"
msgid ""
"if enabled the plugin produces osm-relations from the junction subgraphs"
-msgstr "如果啟用則外掛程式會從匯集點副圖表產生 osm 關係"
+msgstr "如果啟用則外掛程式會從匯集點副圖表產生 osm 關聯"
msgid "create the channel digraph"
msgstr ""
@@ -29096,18 +29461,20 @@ 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 ""
@@ -29125,22 +29492,22 @@ msgid "<HTML><U>I</U>gnore this way</HTML>"
msgstr ""
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 ""
"This tool replaces coastline of one way with another, and so requires "
@@ -29229,19 +29596,19 @@ msgid "Maximum gray value to count as water (0-255)"
msgstr "判斷為水域的最大灰色值 (0-255)"
msgid "Line simplification accuracy (degrees)"
-msgstr "線條簡化準確度（度）"
+msgstr "線條簡化準確度 (度)"
msgid "Resolution of Landsat tiles (pixels per degree)"
-msgstr "Landsat 拼貼的解析度（每一度的像素）"
+msgstr "Landsat 拼貼的解析度 (每一度的像素)"
msgid "Size of Landsat tiles (pixels)"
-msgstr "Landsat 拼貼的大小（像素）"
+msgstr "Landsat 拼貼的大小 (像素)"
msgid "Shift all traces to east (degrees)"
-msgstr "所有軌跡向東平移（度）"
+msgstr "所有軌跡向東平移 (度)"
msgid "Shift all traces to north (degrees)"
-msgstr "所有軌跡向北平移（度）"
+msgstr "所有軌跡向北平移 (度)"
msgid "Direction to search for land"
msgstr "搜尋陸地的方向"
@@ -29256,7 +29623,7 @@ msgid "Maximum cache size (MB)"
msgstr "最大快取大小 (MB)"
msgid "Maximum cache age (days)"
-msgstr "最大快取留存時間（天）"
+msgstr "最大快取留存時間 (天)"
msgid "Source text"
msgstr "來源文字"
@@ -29279,7 +29646,7 @@ msgstr "在簡化線條前產生最大的節點數目。預設值為 50000。"
msgid ""
"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
"in the range 0-255. Default 90."
-msgstr "被認定為水域的最大灰色數值（基於 Landsat IR-1 資料。可以是範圍 0-255。預設值為 90。"
+msgstr "被認定為水域的最大灰色數值 (基於 Landsat IR-1 資料。可以是範圍 0-255。預設值為 90。"
msgid ""
"Accuracy of Douglas-Peucker line simplification, measured in "
@@ -29296,10 +29663,10 @@ msgid "Size of one landsat tile, measured in pixels. Default 2000."
msgstr "一個 landsat 拼貼的大小，以像素為測量單位。預設值為 2000。"
msgid "Offset all points in East direction (degrees). Default 0."
-msgstr "所有點向東方移位（度）。預設值為 0。"
+msgstr "所有點向東方移位 (度) 。預設值為 0。"
msgid "Offset all points in North direction (degrees). Default 0."
-msgstr "所有點向北方移位（度）。預設值為 0。"
+msgstr "所有點向北方移位 (度) 。預設值為 0。"
msgid "Direction to search for land. Default east."
msgstr "搜尋陸地方向。預設值為東方。"
@@ -29439,12 +29806,12 @@ msgstr ""
msgid ""
"<html>A role based relation membership was copied to all new ways.<br>You "
"should verify this and correct it when necessary.</html>"
-msgstr "<html>以角色為基礎的關係成員會複製到所有的新路徑。<br>必要時您應該檢驗並修正它。</html>"
+msgstr "<html>以角色為基礎的關聯成員會複製到所有的新路徑。<br>必要時你應該檢驗並修正它。</html>"
msgid ""
"<html>A relation membership was copied to all new ways.<br>You should verify "
"this and correct it when necessary.</html>"
-msgstr "<html>將關係成員複製到所有的新路徑。<br>您應該在必要時才檢驗這個項目並修正它。</html>"
+msgstr "<html>將關聯成員複製到所有的新路徑。<br>你應該在必要時才檢驗這個項目並修正它。</html>"
msgid "Split way"
msgstr ""
@@ -29459,7 +29826,7 @@ msgid "Please select 4 or 5 ways to assign no left turns."
msgstr "請選擇 4 或 5 條要指派禁止左轉的路徑。"
msgid "Please select 4 ways that form a closed relation."
-msgstr "請從封閉的關係選擇 4 條路徑。"
+msgstr "請從封閉的關聯選擇 4 條路徑。"
msgid "Unable to order the ways. Please verify their directions"
msgstr "無法排序路徑。請檢驗它們的方向"
@@ -29468,13 +29835,13 @@ msgid "Create Michigan left turn restriction"
msgstr "建立密西根左轉彎限制"
msgid "Unable to find via nodes. Please check your selection"
-msgstr "無法透過節點找到。請檢查您的選擇區域"
+msgstr "無法透過節點找到。請檢查你的選擇區域"
msgid "About Plugin"
msgstr "關於外掛程式"
msgid "Native password manager plugin"
-msgstr ""
+msgstr "原生密碼管理員插件"
msgid "No native password manager could be found!"
msgstr "找不到原生密碼管理程式！"
@@ -29482,7 +29849,7 @@ msgstr "找不到原生密碼管理程式！"
msgid ""
"Depending on your Operating System / Distribution, you may have to create a "
"default keyring / wallet first."
-msgstr "根據您的作業系統/發行版本，您可能必須先建立預設的鑰匙圈/錢包。"
+msgstr "根據你的作業系統/發行版本，你可能必須先建立預設的鑰匙圈/錢包。"
msgid "No thanks, use JOSM''s plain text preferences storage"
msgstr "不，謝謝，使用 JOSM 的純文字偏好設定儲存方式"
@@ -29496,7 +29863,7 @@ msgid "Transfer to password manager and remove from preference file"
msgstr "傳輸到密碼管理程式並從偏好設定檔案中移除"
msgid "No, just keep it"
-msgstr ""
+msgstr "不，繼續保持那樣"
msgid "Close the dialog and discard all changes"
msgstr "關閉對話盒並放棄所有變更"
@@ -29505,7 +29872,7 @@ msgid "Proceed and go to the next page"
msgstr "繼續並進入下一頁"
msgid "Finish"
-msgstr ""
+msgstr "完成"
msgid "Confirm the setup and close this dialog"
msgstr "確認設定並關閉這個對話盒"
@@ -29517,16 +29884,16 @@ msgid "JOSM/OSM API/Password"
msgstr "JOSM/OSM API/密碼"
msgid "{0}/Username"
-msgstr ""
+msgstr "{0}/使用者名車"
msgid "{0}/Password"
-msgstr ""
+msgstr "{0}/密碼"
msgid "JOSM/Proxy/Username"
-msgstr ""
+msgstr "JOSM/Proxy/使用者名稱"
msgid "JOSM/Proxy/Password"
-msgstr ""
+msgstr "JOSM/Proxy/密碼"
msgid "JOSM/OAuth/OSM API/Key"
msgstr "JOSM/OAuth/OSM API/金鑰"
@@ -29535,22 +29902,22 @@ msgid "JOSM/OAuth/OSM API/Secret"
msgstr "JOSM/OAuth/OSM API/密鑰"
msgid "Native Password Manager Plugin"
-msgstr ""
+msgstr "原生密碼管理員插件"
msgid "The username and password is protected by {0}."
-msgstr ""
+msgstr "使用者名稱與密碼已受 {0} 保護。"
msgid "username"
-msgstr ""
+msgstr "使用者名稱"
msgid "password"
-msgstr ""
+msgstr "密碼"
msgid "proxy username"
-msgstr ""
+msgstr "代理伺服器使用者名稱"
msgid "proxy password"
-msgstr ""
+msgstr "代理伺服器密碼"
msgid "oauth key"
msgstr ""
@@ -29564,13 +29931,13 @@ msgid ""
msgstr ""
msgid "Save user and password ({0})"
-msgstr ""
+msgstr "儲存使用者名稱與密碼 ({0})"
msgid "Plain text, JOSM default"
msgstr ""
msgid "Use {0}"
-msgstr ""
+msgstr "使用 {0}"
msgid "Encrypt data with Windows logon credentials"
msgstr ""
@@ -29593,16 +29960,16 @@ msgid "Invalid changeset id: {0}"
msgstr ""
msgid "Invalid timestamp: {0}"
-msgstr ""
+msgstr "無效的時間戳記：{0}"
msgid "wrong header byte "
-msgstr ""
+msgstr "錯誤的檔案標頭位元 "
msgid "unsupported header"
msgstr ""
msgid "Reading OSM data..."
-msgstr ""
+msgstr "正在讀取 OSM 資料..."
msgid "Split by municipality"
msgstr ""
@@ -29626,28 +29993,28 @@ msgid "Download open data"
msgstr "下載開放資料"
msgid "License URL not available: {0}"
-msgstr ""
+msgstr "授權許可的 URL 網址無法使用：{0}"
msgid "OpenData preferences"
msgstr "開放資料插件設定"
msgid "License Agreement"
-msgstr ""
+msgstr "授權許可"
msgid "Accept"
msgstr "接受"
msgid "Refuse"
-msgstr ""
+msgstr "拒絕"
msgid "I understand and accept these terms and conditions"
-msgstr ""
+msgstr "我瞭解並接受各條款"
msgid "View the full text of this license"
-msgstr ""
+msgstr "查看授權許可的完整內容"
msgid "I refuse these terms and conditions. Cancel download."
-msgstr ""
+msgstr "我不同意這些條款，取消下載。"
msgid "Module bundled with opendata plugin"
msgstr "模組與開放資料插件相捆"
@@ -29671,7 +30038,7 @@ msgstr[0] ""
msgstr[1] ""
msgid "Modules"
-msgstr ""
+msgstr "模組"
msgid "Accept the new module sites and close the dialog"
msgstr "套用新的模組網站並關閉對話盒"
@@ -29680,24 +30047,24 @@ msgid "Configure Module Sites"
msgstr "設定模組網站"
msgid "Download the list of available modules"
-msgstr ""
+msgstr "下載可用模組的清單"
msgid "Update modules"
-msgstr ""
+msgstr "更新模組"
msgid "Update the selected modules"
-msgstr ""
+msgstr "更新選取的模組"
msgid "Please restart JOSM to activate the downloaded modules."
-msgstr ""
+msgstr "請重新啟動 JOSM 以啟用下載的模組。"
msgid ""
"All installed modules are up to date. JOSM does not have to download newer "
"versions."
-msgstr ""
+msgstr "所有安裝的模組都是最新版，JOSM 不用下載新版。"
msgid "Modules up to date"
-msgstr ""
+msgstr "模組都是最新版"
msgid "Configure the list of sites where modules are downloaded from"
msgstr "設定用來下載模組的網站清單"
@@ -29715,7 +30082,7 @@ msgid "Download OSM data corresponding to the current data set."
msgstr ""
msgid "Diff"
-msgstr ""
+msgstr "差異"
msgid "Perform diff between current data set and existing OSM data."
msgstr ""
@@ -29730,7 +30097,7 @@ msgid "Open the OpenData window."
msgstr "開啟開放資料視窗"
msgid "Raw data"
-msgstr ""
+msgstr "原始資料"
msgid "OpenData Preferences"
msgstr "開放資料插件設定"
@@ -29756,7 +30123,7 @@ msgid "Overpass API server used to download OSM data"
msgstr "下載 OSM 資料連線的 Overpass API 伺服器"
msgid "XAPI server:"
-msgstr ""
+msgstr "XAPI 伺服器："
msgid ""
"XAPI server used to download OSM data when Overpass API is not available"
@@ -29766,10 +30133,10 @@ msgid "Download modules"
msgstr ""
msgid "View summary"
-msgstr ""
+msgstr "檢視概要"
msgid "View full text"
-msgstr ""
+msgstr "檢視完整文字"
msgid ""
"''Lambert CC 9 zones'' coordinates found with different zone codes for X and "
@@ -29780,22 +30147,22 @@ msgid "OpenData XML files"
msgstr "開放資料XML檔案"
msgid "File to load"
-msgstr ""
+msgstr "要載入的檔案"
msgid "7Zip Files"
-msgstr ""
+msgstr "7Z 檔案"
msgid "Reading 7Zip file..."
-msgstr ""
+msgstr "正在讀取 7Z 檔案..."
msgid "Zip Files"
-msgstr ""
+msgstr "ZIP 檔案"
msgid "Reading Zip file..."
-msgstr ""
+msgstr "正在讀取 ZIP 檔案..."
msgid "Cannot transform to WGS84"
-msgstr ""
+msgstr "無法轉換至 WGS84"
msgid ""
"JOSM was unable to find a strict mathematical transformation between ''{0}'' "
@@ -29808,13 +30175,13 @@ msgid "Try lenient method"
msgstr ""
msgid "GML files"
-msgstr ""
+msgstr "GML 檔案"
msgid "KML/KMZ files"
-msgstr ""
+msgstr "KML/KMZ 檔案"
msgid "MapInfo files"
-msgstr ""
+msgstr "MapInfo 檔案"
msgid "Shapefiles"
msgstr ""
@@ -29828,7 +30195,7 @@ msgid "Warning: CRS not found"
msgstr ""
msgid "Unable to detect CRS !"
-msgstr ""
+msgstr "無法偵測 CRS！"
msgid "Unable to find a data store for file {0}"
msgstr ""
@@ -29837,10 +30204,10 @@ msgid "Loading shapefile ({0} features)"
msgstr ""
msgid "CSV files"
-msgstr ""
+msgstr "CSV 檔案"
msgid "ODS files"
-msgstr ""
+msgstr "ODS 檔案"
msgid "No valid coordinates have been found."
msgstr ""
@@ -29849,10 +30216,10 @@ msgid "Invalid file. Bad length on line {0}. Expected {1} columns, got {2}."
msgstr ""
msgid "XLS files"
-msgstr ""
+msgstr "XLS 檔案"
msgid "View OSM Wiki page"
-msgstr ""
+msgstr "檢視 OSM 維基頁面"
msgid "Launch browser to the OSM Wiki page of the selected data set"
msgstr ""
@@ -29870,19 +30237,19 @@ msgid "Launch browser to the national portal page of the selected data set"
msgstr ""
msgid "View License"
-msgstr ""
+msgstr "查看授權許可"
msgid "Launch browser to the license page of the selected data set"
-msgstr ""
+msgstr "在瀏覽器開啟選取資料組合的授權許可頁"
msgid "View License (summary)"
-msgstr ""
+msgstr "查看授權許可 (概要)"
msgid "Launch browser to the summary license page of the selected data set"
-msgstr ""
+msgstr "在瀏覽器開啟選取資料組合的授權許可概要頁"
msgid "View the license of the selected data set"
-msgstr ""
+msgstr "查看選取資料組合的授權許可"
msgid ""
"Warning: Cannot download module ''{0}''. Its download link is not known. "
@@ -29895,7 +30262,7 @@ msgid ""
msgstr ""
msgid "Downloading Module {0}..."
-msgstr ""
+msgstr "正在下載模組 ''{0}''..."
msgid "An error occurred in module {0}"
msgstr ""
@@ -29920,10 +30287,10 @@ msgid ""
msgstr ""
msgid "Could not load module {0}. Delete from preferences?"
-msgstr ""
+msgstr "無法載入 {0} 模組，要從偏好設定中刪除嗎？"
msgid "loading module ''{0}'' (version {1})"
-msgstr ""
+msgstr "正在載入 ''{0}'' 模組 (版本 {1})"
msgid ""
"<html>Could not load module {0} because the module<br>main class ''{1}'' was "
@@ -29931,13 +30298,13 @@ msgid ""
msgstr ""
msgid "Loading modules ..."
-msgstr ""
+msgstr "正在載入模組 ..."
msgid "Checking module preconditions..."
msgstr ""
msgid "Loading module ''{0}''..."
-msgstr ""
+msgstr "正在載入模組 ''{0}''..."
msgid "JOSM could not find information about the following module:"
msgid_plural "JOSM could not find information about the following modules:"
@@ -29946,34 +30313,32 @@ msgstr[1] ""
msgid "The module is not going to be loaded."
msgid_plural "The modules are not going to be loaded."
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "模組不會被載入。"
msgid "Updating the following module has failed:"
msgid_plural "Updating the following modules has failed:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "更新模組失敗："
msgid "Module update failed"
-msgstr ""
+msgstr "模組更新失敗"
msgid "Warning: failed to download module information list"
-msgstr ""
+msgstr "警告：無法下載模組資訊清單"
msgid "Disable module"
-msgstr ""
+msgstr "停用模組"
msgid "Click to delete the module ''{0}''"
-msgstr ""
+msgstr "點擊刪除 ''{0}'' 模組"
msgid "Keep module"
-msgstr ""
+msgstr "保留模組"
msgid "Click to keep the module ''{0}''"
-msgstr ""
+msgstr "點擊保留 ''{0}'' 模組"
msgid "Warning: failed to delete outdated module ''{0}''."
-msgstr ""
+msgstr "警告：無法刪除過期的模組 ''{0}'' 。"
msgid ""
"Warning: failed to install already downloaded module ''{0}''. Skipping "
@@ -29988,13 +30353,13 @@ msgstr ""
msgid ""
"Do not ask again and remember my decision (go to Preferences->Modules to "
"change it later)"
-msgstr ""
+msgstr "下次不要再問，並記住我的決定 (之後可到 偏好設定 > 模組 變更)"
msgid "The module file ''{0}'' does not include a Manifest."
msgstr ""
msgid "Invalid URL ''{0}'' in module {1}"
-msgstr ""
+msgstr "{1} 模組裏的 URL 網址 ''{0}'' 無效"
msgid "<b>Module provided by an external source:</b> {0}"
msgstr ""
@@ -30019,13 +30384,13 @@ msgid "Processing module site cache icon files..."
msgstr "處理模組網站快取圖示檔案…"
msgid "Processing module files..."
-msgstr ""
+msgstr "正在處理模組檔案..."
msgid "Download module list..."
-msgstr ""
+msgstr "下載模組清單..."
msgid "Downloading module list from ''{0}''"
-msgstr ""
+msgstr "正在從 ''{0}'' 下載模組清單"
msgid ""
"Warning: failed to create module directory ''{0}''. Cannot cache module list "
@@ -30076,7 +30441,7 @@ msgid "OSM Server Files pbf compressed"
msgstr ""
msgid "Download PBF"
-msgstr ""
+msgstr "下載 PBF"
msgid "Invalid DenseNodes key/values table"
msgstr ""
@@ -30091,7 +30456,7 @@ msgid "Transform error: Points too close"
msgstr "變形錯誤：點太過靠近"
msgid "Transform error: Unsupported variant."
-msgstr "變形錯誤：不支援的變體。"
+msgstr "變形錯誤：不支援的變換。"
msgid "Transform error: Unsupported orientation"
msgstr "變形錯誤：不支援的方向"
@@ -30157,7 +30522,7 @@ msgid "Bind to coordinates"
msgstr "繫結到坐標"
msgid "Projection:"
-msgstr "投影方法："
+msgstr "投影法："
msgid "Bottom left (min) corner:"
msgstr "左下(最小)角："
@@ -30226,7 +30591,7 @@ msgid "Removing parallel segments"
msgstr "正在移除平行的區段"
msgid "Max distance is not a number"
-msgstr "最大距離不能為數字"
+msgstr "最大距離不是數字"
msgid "Joining nodes"
msgstr "正在連結節點"
@@ -30244,7 +30609,7 @@ msgid "Finalizing layers"
msgstr "正在完結圖層"
msgid "Please set a projection."
-msgstr "請設定一個投影方法。"
+msgstr "請設定一個投影法。"
msgid "Could not parse numbers. Please check."
msgstr "無法分析頁碼。請檢查。"
@@ -30289,10 +30654,10 @@ msgid "The PDF file must have exactly one page."
msgstr "PDF 檔案只能有一頁。"
msgid "Read error: "
-msgstr ""
+msgstr "讀取錯誤： "
msgid "Write error: "
-msgstr ""
+msgstr "寫入錯誤： "
msgid "Write coordinates to image header"
msgstr "將坐標寫入圖片檔頭"
@@ -30314,7 +30679,7 @@ msgid "to gps time"
msgstr "為 gps 時刻"
msgid "to previous value (unchanged mtime)"
-msgstr "回到前一個數值（未變更 mtime）"
+msgstr "回到前一個數值 (未變更 mtime)"
msgid "Photo Geotagging Plugin"
msgstr "相片地理標籤外掛程式"
@@ -30335,7 +30700,7 @@ msgid "Could not rename file!"
msgstr "檔案無法重新命名！"
msgid "Could not rename file {0} to {1}!"
-msgstr ""
+msgstr "無法將檔案 {0} 改名為 {1}！"
msgid "<html><h3>There are old backup files in the image directory!</h3>"
msgstr "<html><h3>在圖片目錄中有舊的備份檔案！</h3>"
@@ -30359,7 +30724,7 @@ msgid "Test failed: Could not write mtime."
msgstr "測試失敗：無法寫入 mtime。"
msgid "Adjust photos"
-msgstr ""
+msgstr "調整照片"
msgid "Move and position photos"
msgstr ""
@@ -30370,73 +30735,73 @@ msgid ""
msgstr ""
msgid "Please load some photos."
-msgstr ""
+msgstr "請載入一些照片。"
msgid "Edit photo GPS data"
-msgstr ""
+msgstr "編輯照片 GPS 資料"
msgid "Edit GPS data of selected photo."
-msgstr ""
+msgstr "編輯選取照片的 GPS 資料。"
msgid "Edit Photo GPS Data"
-msgstr ""
+msgstr "編輯照片 GPS 資料"
msgid "Please select an image first."
-msgstr ""
+msgstr "請先選取一張影像。"
msgid "(Empty values delete the according fields.)"
msgstr ""
msgid "coordinates"
-msgstr ""
+msgstr "座標"
msgid "Latitude and longitude"
-msgstr ""
+msgstr "緯度與精度"
msgid "Edit Image Coordinates"
-msgstr ""
+msgstr "編輯影像座標"
msgid "Edit coordinates in separate editor"
-msgstr ""
+msgstr "在外部編輯器編輯座標"
msgid "altitude"
-msgstr ""
+msgstr "高度"
msgid "Altitude:"
-msgstr ""
+msgstr "高度："
msgid "speed"
-msgstr ""
+msgstr "速度"
msgid "positive number or empty"
-msgstr ""
+msgstr "正數或空白"
msgid "Speed:"
-msgstr ""
+msgstr "速度："
msgid "direction"
-msgstr ""
+msgstr "方向"
msgid "range -360.0 .. 360.0, or empty"
-msgstr ""
+msgstr "區間 -360.0 .. 360.0，或是空白"
msgid "Direction:"
-msgstr ""
+msgstr "方向："
msgid "°"
-msgstr ""
+msgstr "°"
msgid "Undo changes made in this dialog"
msgstr ""
msgid "Reload GPS data from image file"
-msgstr ""
+msgstr "從影像檔案重新載入 GPS 資料"
msgid "New layer for untagged images"
-msgstr ""
+msgstr "沒有標籤影像的新圖層"
msgid "Untagged Images"
-msgstr ""
+msgstr "沒有標籤的影像"
msgid "Do you want to save current calibration of layer {0}?"
msgstr ""
@@ -30454,7 +30819,7 @@ msgid "Loading file failed: {0}"
msgstr "載入檔案失敗：{0}"
msgid "Problem occurred"
-msgstr ""
+msgstr "發生問題"
msgid "Import World File Calibration..."
msgstr ""
@@ -30463,13 +30828,13 @@ msgid "Loads calibration data from a world file"
msgstr ""
msgid "Reset Calibration"
-msgstr ""
+msgstr "重設校正"
msgid "Reset calibration"
-msgstr ""
+msgstr "重設校正"
msgid "Calibration reset"
-msgstr ""
+msgstr "校正重設"
msgid "Save Picture Calibration..."
msgstr "儲存相片校準..."
@@ -30502,13 +30867,13 @@ msgid ""
msgstr ""
msgid "Notification"
-msgstr ""
+msgstr "通知"
msgid "PicLayer move"
msgstr "PicLayer 移動"
msgid "Moved"
-msgstr ""
+msgstr "已移動"
msgid "Drag to move the picture"
msgstr "拖曳以移動相片"
@@ -30517,7 +30882,7 @@ msgid "PicLayer rotate"
msgstr "PicLayer 旋轉"
msgid "Rotated"
-msgstr ""
+msgstr "已旋轉"
msgid "Drag to rotate the picture"
msgstr "拖曳以旋轉相片"
@@ -30526,7 +30891,7 @@ msgid "PicLayer scale X"
msgstr "PicLayer 縮放 X"
msgid "Scaled by X"
-msgstr ""
+msgstr "按 X 縮放"
msgid "Drag to scale the picture in the X Axis"
msgstr "拖曳以縮放相片的 X 軸"
@@ -30535,7 +30900,7 @@ msgid "PicLayer scale"
msgstr "PicLayer 縮放"
msgid "Scaled"
-msgstr ""
+msgstr "已縮放"
msgid "Drag to scale the picture in the X and Y Axis"
msgstr "拖曳以縮放相片的 X 軸和 Y 軸"
@@ -30544,7 +30909,7 @@ msgid "PicLayer scale Y"
msgstr "PicLayer 縮放 Y"
msgid "Scaled by Y"
-msgstr ""
+msgstr "按 Y 縮放"
msgid "Drag to scale the picture in the Y Axis"
msgstr "拖曳以縮放相片的 Y 軸"
@@ -30553,7 +30918,7 @@ msgid "PicLayer shear"
msgstr "圖片圖層修剪"
msgid "Sheared"
-msgstr ""
+msgstr "已分享"
msgid "Drag to shear the picture"
msgstr "拖放以修剪圖片"
@@ -30604,7 +30969,7 @@ msgid "The clipboard data is not an image"
msgstr "剪貼簿資料不是圖片"
msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr "警告：無法處理 zip 檔案「{0}」。例外為：{1}"
+msgstr "警告：無法處理 zip 檔案「{0}」。異常為：{1}"
msgid "A calibration file associated to the picture file was found: {0}\n"
msgstr ""
@@ -30615,10 +30980,10 @@ msgid ""
msgstr ""
msgid "Do you want to apply it ?"
-msgstr "您想要套用它嗎？"
+msgstr "你想要套用它嗎？"
msgid "Load calibration file?"
-msgstr ""
+msgstr "載入校正檔案？"
msgid "It will be applied automatically."
msgstr "它將會自動套用。"
@@ -30634,19 +30999,19 @@ msgid "Point info."
msgstr ""
msgid "Connecting server"
-msgstr ""
+msgstr "正在連接伺服器"
msgid "PointInfo"
msgstr ""
msgid "Data not available."
-msgstr ""
+msgstr "資料無法使用。"
msgid "Add new address point"
msgstr ""
msgid "Tags copied to clipboard."
-msgstr ""
+msgstr "標籤已複製到剪貼簿。"
msgid "New address point added."
msgstr ""
@@ -30673,7 +31038,7 @@ msgid "Unable to parse {0} as a number"
msgstr ""
msgid "Invalid coordinates were found: {0}, {1}"
-msgstr ""
+msgstr "找到無效的座標：{0}，{1}"
msgid "{0} points were outside world bounds and were moved"
msgstr ""
@@ -30682,70 +31047,70 @@ msgid "Osmosis polygon filter files"
msgstr ""
msgid "Print..."
-msgstr ""
+msgstr "列印..."
msgid "Print the map"
-msgstr ""
+msgstr "列印這個地圖"
msgid "Print the Map"
-msgstr ""
+msgstr "列印這個地圖"
msgid "Printer"
msgstr "印表機"
msgid "Media"
-msgstr ""
+msgstr "媒體"
msgid "Orientation"
-msgstr ""
+msgstr "方向定位"
msgid "Printer settings"
msgstr "印表機設定"
msgid "Scale"
-msgstr ""
+msgstr "比例"
msgid "Resolution"
-msgstr ""
+msgstr "解析度"
msgid "Map information"
-msgstr ""
+msgstr "地圖資訊"
msgid "Map Preview"
-msgstr ""
+msgstr "地圖預覽"
msgid "Zoom To Page"
-msgstr ""
+msgstr "縮放至頁面大小"
msgid "Zoom To Actual Size"
-msgstr ""
+msgstr "縮放至實際大小"
msgid "Print"
-msgstr ""
+msgstr "列印"
msgid "Printing has been cancelled."
-msgstr ""
+msgstr "已取消列印。"
msgid "Printing stopped"
-msgstr ""
+msgstr "已停止列印"
msgid "Printing has failed."
-msgstr ""
+msgstr "列印失敗。"
msgid "Add stop position"
msgstr "增加停車位置"
msgid "Repeat last fix"
-msgstr ""
+msgstr "重複上次修正"
msgid "Do you want to download referrers of platforms and stop positions?"
-msgstr ""
+msgstr "你想要下載月台與停車位置的參照嗎？"
msgid "Remember my choice and do not ask me again in this session"
msgstr ""
msgid "PT_Assistant Fetch Request"
-msgstr ""
+msgstr "大眾運輸助手取得要求"
msgid ""
"Route relations have incomplete members.\n"
@@ -30760,63 +31125,61 @@ msgid "Include stop_area tests"
msgstr ""
msgid "PT_Assistant plugin found that this relation (id={0}) has errors:"
-msgstr ""
+msgstr "大眾運輸助手插件發現這個關聯 (id={0}) 有錯誤："
msgid "{0} direction error"
msgid_plural "{0} direction errors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} 方向錯誤"
msgid "{0} road type error"
msgid_plural "{0} road type errors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} 道路類型錯誤"
msgid "How do you want to proceed?"
-msgstr ""
+msgstr "你想要怎麼處理？"
msgid "PT_Assistant Proceed Request"
-msgstr ""
+msgstr "大眾運輸助手已處理要求"
msgid "PT: Stop_position is not part of a way"
-msgstr ""
+msgstr "大眾運輸：停車位置不是路徑的一部分"
msgid "PT: Platform should not be part of a way"
-msgstr ""
+msgstr "大眾運輸：月台不能是路徑的一部分"
msgid "PT: Stop position or platform is not part of a stop area relation"
-msgstr ""
+msgstr "大眾運輸：停車位置或月台不是車站區域關聯的一部分"
msgid "PT_Assistant Message"
-msgstr ""
+msgstr "大眾運輸助手訊息"
msgid "Public Transport Assistant tests"
-msgstr ""
+msgstr "大眾運輸助手測試"
msgid ""
"Check if route relations are compatible with public transport version 2"
-msgstr ""
+msgstr "檢查路線關聯是否與 大眾運數V2 相容"
msgid "Fix error"
-msgstr ""
+msgstr "修正錯誤"
msgid "PT: dummy test warning"
-msgstr ""
+msgstr "大眾運輸：偽測試警告"
msgid "PT: Route contains a gap that can be fixed by sorting"
-msgstr ""
+msgstr "大眾運輸：路線裏有間隙，重整即可修正"
msgid "PT: Relation member roles do not match tags"
-msgstr ""
+msgstr "大眾運輸：關聯成員角色與標籤不符"
msgid "PT: Route should start and end with a stop_position"
-msgstr ""
+msgstr "大眾運輸：路線的開始與結束應該要是停車位置"
msgid "PT: First or last way needs to be split"
msgstr ""
msgid "PT: Stop not served"
-msgstr ""
+msgstr "大眾運輸：停靠暫已停用"
msgid "PT: Problem in the route segment with no automatic fix"
msgstr ""
@@ -30831,7 +31194,7 @@ msgid "Type letter to select the fix variant or press Escape for no fix"
msgstr ""
msgid "PT: Stop area relation has no stop position"
-msgstr ""
+msgstr "大眾運輸：停靠站區域關聯沒有停車位"
msgid "PT: Stop area relation has no platform"
msgstr ""
@@ -30851,7 +31214,7 @@ msgid "PT: Route passes a oneway road in the wrong direction"
msgstr ""
msgid "moved"
-msgstr ""
+msgstr "已移動"
msgid "rail"
msgstr "軌"
@@ -30860,10 +31223,10 @@ msgid "Can''t parse a time from this string."
msgstr ""
msgid "Invalid value"
-msgstr ""
+msgstr "無效的值"
msgid "added"
-msgstr ""
+msgstr "已加入"
msgid "Public Transport: Enable GTFSStops"
msgstr "大眾運輸：啟用 GTFSStops"
@@ -30872,7 +31235,7 @@ msgid "Public Transport: Catch GTFS stops"
msgstr "大眾運輸：抓取 GTFS stops"
msgid "skipped"
-msgstr ""
+msgstr "已跳過"
msgid "Public Transport: Disable GTFS"
msgstr "大眾運輸：停用 GTFS"
@@ -30884,7 +31247,7 @@ msgid "Create Stops from a GTFS file"
msgstr "從 GTFS 檔案建立停止點"
msgid "Select GTFS file (stops.txt)"
-msgstr ""
+msgstr "選取 GTFS 檔案 (stops.txt)"
msgid "File \"{0}\" does not exist"
msgstr "檔案「{0}」不存在"
@@ -30895,64 +31258,61 @@ msgstr "發生 IOException「{0}」"
msgid ""
"There exists no dataset. Try to download data from the server or open an OSM "
"file."
-msgstr ""
+msgstr "沒有資料組合，試著從伺服器下載或開啟 OSM 檔案。"
msgid "No data found"
-msgstr ""
+msgstr "找不到資料"
msgid "The GTFS file was empty."
-msgstr ""
+msgstr "GTFS 檔案是空的。"
msgid "Create Stops from GTFS"
-msgstr ""
+msgstr "從 GTFS 建立停靠站。"
msgid "GTFS-Stops"
msgstr "GTFS-停止點"
msgid "Type of stops to add"
-msgstr ""
+msgstr "要加入的停靠站類型"
msgid "Time on your GPS device"
-msgstr ""
+msgstr "GPS 裝置的時間"
msgid "HH:MM:SS.sss"
msgstr "HH:MM:SS.sss"
msgid "Time on your stopwatch"
-msgstr ""
+msgstr "你的碼表上時間"
msgid "Time window"
-msgstr ""
+msgstr "時間視窗"
msgid "seconds"
-msgstr ""
+msgstr "秒"
msgid "Move Threshold"
-msgstr ""
+msgstr "移動門檻值"
msgid "Suggest Stops"
-msgstr ""
+msgstr "建議停靠站"
msgid "Find"
-msgstr ""
+msgstr "尋找"
msgid "Show"
msgstr "顯示"
msgid "Mark"
-msgstr ""
+msgstr "標記"
msgid "Catch"
-msgstr ""
+msgstr "抓取"
msgid "Join"
-msgstr ""
+msgstr "加入"
msgid "Public Transport: Join GTFS stops"
-msgstr ""
-
-msgid "Id"
-msgstr ""
+msgstr "大眾運輸：加入 GTFS 停靠站"
msgid "State"
msgstr "州"
@@ -30961,16 +31321,16 @@ msgid "pending"
msgstr ""
msgid "[incomplete]"
-msgstr ""
+msgstr "[不完整]"
msgid "[empty way]"
-msgstr ""
+msgstr "[空白路徑]"
msgid "[ID] {0}"
-msgstr ""
+msgstr "[ID] {0}"
msgid "[gap]"
-msgstr ""
+msgstr "[空隙]"
msgid "Route patterns ..."
msgstr "路線模式 ..."
@@ -30979,7 +31339,7 @@ msgid "Edit Route patterns for public transport"
msgstr "編輯大眾運輸的路線模式"
msgid "Route Patterns"
-msgstr ""
+msgstr "路線的模式："
msgid "Overview"
msgstr "概覽"
@@ -30988,13 +31348,13 @@ msgid "Itinerary"
msgstr "行程"
msgid "Stops"
-msgstr "公車站牌"
+msgstr "公車停靠站"
msgid "Meta"
msgstr "中繼"
msgid "Existing route patterns:"
-msgstr ""
+msgstr "已存在路線的模式："
msgid "Reflect"
msgstr ""
@@ -31009,31 +31369,31 @@ msgid "Additional tags:"
msgstr "額外的標籤:"
msgid "Add a new Tag"
-msgstr ""
+msgstr "新入先的標籤"
msgid "Name/Id"
-msgstr ""
+msgstr "名稱/ID"
msgid "Ref"
msgstr ""
msgid "Stops are possible on the"
-msgstr ""
+msgstr "停靠站可能是在"
msgid "right hand side"
-msgstr ""
+msgstr "右手邊"
msgid "left hand side"
-msgstr ""
+msgstr "左手邊"
msgid "Maximum distance from route"
-msgstr ""
+msgstr "從路線最大距離"
msgid " [ID] {0}"
-msgstr ""
+msgstr " [ID] {0}"
msgid "Public Transport: Change stop type"
-msgstr ""
+msgstr "大眾運輸：變更停靠站類型"
msgid "Create Stops from GPX ..."
msgstr "從 GPX 建立停止點..."
@@ -31042,16 +31402,16 @@ msgid "Create Stops from a GPX file"
msgstr "從 GPX 檔案建立停止點"
msgid "Select GPX file"
-msgstr ""
+msgstr "選取 GPX 檔案"
msgid "The GPX file contained no tracks or waypoints."
-msgstr ""
+msgstr "GPX 檔案裏沒有軌跡或航點。"
msgid "Create Stops from GPX"
-msgstr ""
+msgstr "從 GPX 建立停靠站"
msgid "Tracks in this GPX file:"
-msgstr ""
+msgstr "GPX 檔案裏的軌跡："
msgid "Detach"
msgstr ""
@@ -31062,10 +31422,10 @@ msgstr ""
msgid ""
"The GPX file doesn''t contain valid trackpoints. Please use a GPX file that "
"has trackpoints."
-msgstr ""
+msgstr "GPX 檔案裏沒有有效的軌跡點位，請使用含有正確軌跡的 GPX 檔案。"
msgid "GPX File Trouble"
-msgstr ""
+msgstr "GPX 檔案有問題"
msgid "unnamed"
msgstr "未命名的"
@@ -31089,10 +31449,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 ""
@@ -31107,49 +31467,49 @@ msgid "Public Transport: Edit waypoint name"
msgstr ""
msgid "Distance between stops"
-msgstr "站牌之間距離"
+msgstr "停靠站之間距離"
msgid "A valid public_transport:version=2 route is required"
-msgstr ""
+msgstr "需要有效的 public_transport:version=2 路線"
msgid "Invalid selection"
msgstr "無效的選擇範圍"
msgid "Public transport routes"
-msgstr ""
+msgstr "大眾運輸路線"
msgid "Toggle direction arrows"
-msgstr ""
+msgstr "切換方向箭頭"
msgid "Toggle reference labels"
msgstr ""
msgid "Visualize public transport routes"
-msgstr ""
+msgstr "視覺化大眾運輸路線"
msgid "Filters"
-msgstr ""
+msgstr "過濾條件"
msgid "Choose Filter"
-msgstr ""
+msgstr "選擇過濾條件"
msgid "JSlider initialization error. Make sure your meta-inf is correct."
msgstr ""
msgid "Relation Toolbox"
-msgstr "關係工具箱"
+msgstr "關聯工具箱"
msgid "Open relation/multipolygon editor panel"
-msgstr "開啟關係/多重多邊形編輯器面板"
+msgstr "開啟關聯/多重多邊形編輯器面板"
msgid "Specify role"
msgstr "指定角色"
msgid "Change relation member roles to {0}"
-msgstr "將關係成員角色改變為 {0}"
+msgstr "將關聯成員角色改變為 {0}"
msgid "Create administrative boundary relations"
-msgstr "新增行政邊界關係"
+msgstr "新增行政邊界關聯"
msgid "Add tags boundary and admin_level to boundary relation ways"
msgstr ""
@@ -31170,16 +31530,16 @@ msgid "Enter role for selected members"
msgstr ""
msgid "Relation Toolbox: {0}"
-msgstr "關係工具箱：{0}"
+msgstr "關聯工具箱：{0}"
msgid "another..."
msgstr "另一個..."
msgid "Add/remove members from the chosen relation"
-msgstr "從選取的關係中加入/移除成員"
+msgstr "從選取的關聯中加入/移除成員"
msgid "Clear the chosen relation"
-msgstr "清除選取的關係"
+msgstr "清除選取的關聯"
msgid "Create a multipolygon from selected objects"
msgstr "從選取的物件建立多重多邊形"
@@ -31191,22 +31551,22 @@ msgid "Move tags from ways to relation"
msgstr ""
msgid "Enter admin level and name for the border relation:"
-msgstr "輸作邊界關係的行政層級和名稱："
+msgstr "輸入邊界關聯的行政層級和名稱："
msgid "Admin level"
msgstr "行政層級"
msgid "Create a relation from selected objects"
-msgstr "從選取的物件中建立關係"
+msgstr "從選取的物件中建立關聯"
msgid "Choose a type for the relation:"
-msgstr "選擇關係的類型："
+msgstr "選擇關聯的類型："
msgid "Delete relation"
-msgstr "刪除關係"
+msgstr "刪除關聯"
msgid "Download incomplete members for the chosen relation"
-msgstr "下載選取關係中不完整的成員"
+msgstr "下載選取關聯中不完整的成員"
msgid "Download referrers"
msgstr "下載參照"
@@ -31215,16 +31575,16 @@ msgid "Download referrers for the chosen relation and its members."
msgstr ""
msgid "Duplicate relation"
-msgstr ""
+msgstr "複製關聯"
msgid "Open relation editor for the chosen relation"
-msgstr "開啟選取關係的關係編輯器"
+msgstr "開啟選取關聯的關聯編輯器"
msgid "Find a relation"
-msgstr "尋找關係"
+msgstr "尋找關聯"
msgid "Reconstruct polygon"
-msgstr ""
+msgstr "重建多邊形"
msgid "Multipolygon must consist only of ways"
msgstr ""
@@ -31233,16 +31593,16 @@ msgid "Reconstruct polygons from relation {0}"
msgstr ""
msgid "Reconstruct route"
-msgstr ""
+msgstr "重建路線"
msgid "Open relation wiki page"
-msgstr "開啟關係 wiki 頁面"
+msgstr "開啟關聯 wiki 頁面"
msgid "Select relation in main selection."
-msgstr "選擇主要選擇區域的關係。"
+msgstr "選擇主要選擇區域的關聯。"
msgid "Fix roles of the chosen relation members"
-msgstr "修正選取關係成員的角色"
+msgstr "修正選取關聯成員的角色"
msgid "Complete multipolygon for way {0}"
msgstr ""
@@ -31254,40 +31614,40 @@ msgid "Multipolygon from rings"
msgstr ""
msgid "Node without ''house'' role found"
-msgstr ""
+msgstr "發現沒有 \"house\" 角色的節點"
msgid "Way without ''house'' or ''street'' role found"
-msgstr ""
+msgstr "發現沒有 \"house\" 或 \"street\" 角色的路徑"
msgid "Relation without ''house'' role found"
-msgstr ""
+msgstr "發現沒有 \"house\" 角色的關聯"
msgid "Relation does not have name"
-msgstr ""
+msgstr "發現沒有名稱的關聯"
msgid "Relation has streets with different names"
-msgstr ""
+msgstr "關聯有不同名稱的街道"
msgid "fix associatedStreet relation"
-msgstr ""
+msgstr "修正 associatedStreet 關聯"
msgid "Relation without ''subarea'' role found"
-msgstr ""
+msgstr "發現沒有 \"subarea\" 角色的關聯"
msgid "Node without ''label'' or ''admin_centre'' role found"
-msgstr ""
+msgstr "發現沒有 \"inner\" 或 \"outer\" 角色的節點"
msgid "Way without ''inner'' or ''outer'' role found"
-msgstr ""
+msgstr "發現沒有 \"inner\" 或 \"outer\" 角色的路徑"
msgid "Node without ''stop'' or ''platform'' role found"
-msgstr ""
+msgstr "發現沒有 \"stop\" 或 \"platform\" 角色的節點"
msgid "Way platform without ''platform'' role found"
-msgstr ""
+msgstr "發現沒有 \"platform\" 角色的路徑月台"
msgid "Revert changeset fully"
-msgstr "還原整個變更組合"
+msgstr "還原整個變更集"
msgid "Revert selection only"
msgstr "只還原選擇區域"
@@ -31296,22 +31656,22 @@ msgid "Revert selection and restore deleted objects"
msgstr "還原選擇區域並復原已刪除的物件"
msgid "Revert changeset"
-msgstr "還原變更組合"
+msgstr "還原變更集"
msgid "Revert"
msgstr "還原"
msgid "Enter the ID of the changeset that should be reverted"
-msgstr ""
+msgstr "輸入要還原的變更集 ID"
msgid "Reverted changeset"
msgstr "回退變更集"
msgid "It is not allowed to revert changeset from {0}"
-msgstr ""
+msgstr "不允許從 {0} 還原變更集"
msgid "Downloading objects history"
-msgstr ""
+msgstr "正在下載物件歷史"
msgid "Missing merge target for {0} with id {1}"
msgstr "缺少 id {1} {0} 的合併目標"
@@ -31323,13 +31683,13 @@ msgid "History reverter"
msgstr "歷史紀錄還原"
msgid "Tool: Display objects history dialog"
-msgstr ""
+msgstr "工具：顯示物件歷史對話框"
msgid "Preparing history data..."
msgstr "正在準備歷史紀錄資料..."
msgid "Remote Control has been asked to revert a changeset."
-msgstr ""
+msgstr "遠端控制已要求復原一個變更集。"
msgid "Reverting..."
msgstr "回退中..."
@@ -31349,7 +31709,7 @@ msgid "Downloading changeset"
msgstr "下載變更集中"
msgid "See {0}"
-msgstr ""
+msgstr "查看 {0}"
msgid "Revert changeset #{0}"
msgstr "回退變更集 #{0}"
@@ -31357,12 +31717,12 @@ msgstr "回退變更集 #{0}"
msgid ""
"Warning: unsupported start element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
-msgstr "警告：在變更組合內容的位置 ({1},{2}) 有不支援的起始元素「{0}」。正在略過。"
+msgstr "警告：在變更集內容的位置 ({1},{2}) 有不支援的起始元素「{0}」。正在略過。"
msgid ""
"Warning: unsupported end element ''{0}'' in changeset content at position "
"({1},{2}). Skipping."
-msgstr "警告：在變更組合內容的位置 ({1},{2}) 有不支援的結尾元素「{0}」。正在略過。"
+msgstr "警告：在變更集內容的位置 ({1},{2}) 有不支援的結尾元素「{0}」。正在略過。"
msgid "Create Roundabout"
msgstr ""
@@ -31389,19 +31749,19 @@ msgid "Show a selection of the most useful signs"
msgstr ""
msgid "Belgium"
-msgstr ""
+msgstr "比利時"
msgid "Spain"
-msgstr ""
+msgstr "西班牙"
msgid "Germany"
-msgstr ""
+msgstr "德國"
msgid "Poland"
-msgstr ""
+msgstr "波蘭"
msgid "Slovakia"
-msgstr ""
+msgstr "斯洛伐克"
msgid "Roadsign tagging"
msgstr "路標的標籤"
@@ -31413,7 +31773,7 @@ msgid "Roadsigns plugin: open dialog"
msgstr "Roadsigns 外掛程式：開啟對話盒"
msgid "custom"
-msgstr ""
+msgstr "自訂"
msgid "Could not read tagging preset source: ''{0}''"
msgstr "無法讀取標籤預設組合來源：「{0}」"
@@ -31428,22 +31788,22 @@ msgid "Additional sign {0}"
msgstr "額外路標 {0}"
msgid "Edit relation"
-msgstr "編輯關係"
+msgstr "編輯關聯"
msgid "Edit relations"
-msgstr "編輯關係"
+msgstr "編輯關聯"
msgid "No relation is selected"
-msgstr "尚未選取關係"
+msgstr "尚未選取關聯"
msgid "Remove node ''{0}'' at position {1} from relation ''{2}''"
-msgstr "從關係「{2}」移除位置 {1} 的節點「{0}」"
+msgstr "從關聯「{2}」移除位置 {1} 的節點「{0}」"
msgid "Remove way ''{0}'' at position {1} from relation ''{2}''"
-msgstr "從關係「{2}」移除位置 {1} 的路徑「{0}」"
+msgstr "從關聯「{2}」移除位置 {1} 的路徑「{0}」"
msgid "Remove relation ''{0}'' at position {1} from relation ''{2}''"
-msgstr "從關係「{2}」移除位置 {1} 的關係「{0}」"
+msgstr "從關聯「{2}」移除位置 {1} 的關聯「{0}」"
msgid "routing active route"
msgstr ""
@@ -31534,28 +31894,28 @@ msgid ""
msgstr ""
msgid "SDS data file"
-msgstr ""
+msgstr "SDS 資料檔案"
msgid "Load..."
-msgstr ""
+msgstr "載入..."
msgid "Load separate data store data from a file."
msgstr ""
msgid "Loading files"
-msgstr ""
+msgstr "正在載入檔案"
msgid "SDS"
-msgstr ""
+msgstr "SDS"
msgid "Information about SDS."
-msgstr ""
+msgstr "關於 SDS 的資訊。"
msgid "About SDS..."
-msgstr ""
+msgstr "關於 SDS..."
msgid "Open a preferences dialog for SDS."
-msgstr ""
+msgstr "開啟 SDS 的偏好設定對話視窗。"
msgid "Separate Data Store"
msgstr ""
@@ -31564,7 +31924,7 @@ msgid "Configures access to the Separate Data Store."
msgstr "設定存取個別資料儲存區。"
msgid "Server"
-msgstr ""
+msgstr "伺服器"
msgid "The URL under which the SDS server can be contacted."
msgstr ""
@@ -31585,13 +31945,13 @@ msgid ""
msgstr ""
msgid "SDS server URL"
-msgstr ""
+msgstr "SDS 伺服器 URL 網址"
msgid "SDS username"
-msgstr ""
+msgstr "SDS 使用者名稱"
msgid "SDS password"
-msgstr ""
+msgstr "SDS 密碼"
msgid "Test credentials now"
msgstr ""
@@ -31603,22 +31963,22 @@ msgid "Connection successful."
msgstr ""
msgid "Cannot connect to SDS server: "
-msgstr ""
+msgstr "無法連到 SDS 伺服器： "
msgid "Save..."
-msgstr ""
+msgstr "儲存..."
msgid "Save the current separate data store information to a file."
msgstr ""
msgid "Save SDS file"
-msgstr ""
+msgstr "儲存 SDS 檔案"
msgid "No object selected"
-msgstr ""
+msgstr "沒有選取物件"
msgid "SeaChart Editor"
-msgstr ""
+msgstr "海圖編輯工具"
msgid "Seamark Inspector"
msgstr ""
@@ -31636,40 +31996,40 @@ msgid "Shape mode control panel"
msgstr ""
msgid "Rotate Mode:"
-msgstr ""
+msgstr "旋轉模式："
msgid "Clockwise"
-msgstr ""
+msgstr "順時針"
msgid "Counter Clockwise"
-msgstr ""
+msgstr "逆時針"
msgid "Input angle here"
-msgstr ""
+msgstr "輸入角度"
msgid "Rotate"
-msgstr ""
+msgstr "旋轉"
msgid "Align building "
-msgstr ""
+msgstr "對齊建築霧 "
msgid "Select building"
-msgstr ""
+msgstr "選取建築霧"
msgid "Select road"
-msgstr ""
+msgstr "選取道路"
msgid "Select none"
msgstr ""
msgid "Min Distance:"
-msgstr ""
+msgstr "最小距離："
msgid "Input min distance"
-msgstr ""
+msgstr "輸入最小距離"
msgid "Align all buildings"
-msgstr ""
+msgstr "對齊所有建築霧"
msgid "Delete overlay"
msgstr ""
@@ -31714,25 +32074,25 @@ msgid ""
msgstr ""
msgid "Angle Threshold"
-msgstr ""
+msgstr "角度門檻值"
msgid "Angle Factor"
-msgstr ""
+msgstr "角度係數"
msgid "Area Threshold"
-msgstr ""
+msgstr "面積門檻值"
msgid "Area Factor"
-msgstr ""
+msgstr "面積係數"
msgid "Distance Threshold"
-msgstr ""
+msgstr "距離門檻值"
msgid "Distance Factor"
-msgstr ""
+msgstr "距離係數"
msgid "Merge Nearby Nodes Threshold"
-msgstr ""
+msgstr "合併附近節點的門檻值"
msgid "SeaMap Editor"
msgstr "海圖編輯器"
@@ -31768,19 +32128,19 @@ msgid "Curve steps"
msgstr ""
msgid "Undelete node {0}"
-msgstr ""
+msgstr "反刪除節點 {0}"
msgid "OSM Export"
-msgstr ""
+msgstr "匯出 OSM"
msgid "Export traffic data to SUMO network file."
msgstr ""
msgid "SUMO Export"
-msgstr ""
+msgstr "匯出 SUMO"
msgid "Export"
-msgstr ""
+msgstr "匯出"
msgid "AutoSave LiveData"
msgstr "自動儲存即時資料"
@@ -31870,7 +32230,7 @@ msgid ""
msgstr "開啟標籤預設組合測試工具以預覽標籤預設組合對話盒。"
msgid "You have to specify tagging preset sources in the preferences first."
-msgstr "您必須先在偏好設定中指定標籤預設組合來源。"
+msgstr "你必須先在偏好設定中指定標籤預設組合來源。"
msgid "Enter housenumbers or amount of segments"
msgstr "輸入門牌號碼或一些區段"
@@ -31894,10 +32254,10 @@ msgid "List of Numbers"
msgstr "編號清單"
msgid "add to existing associatedStreet relation"
-msgstr "加入已經存在的 associatedStreet 關係"
+msgstr "加入已經存在的 associatedStreet 關聯"
msgid "create an associatedStreet relation"
-msgstr "建立 associatedStreet 關係"
+msgstr "建立 associatedStreet 關聯"
msgid "keep outline way"
msgstr ""
@@ -31954,7 +32314,7 @@ msgid ""
"Select a single, closed way of at least four nodes. (Optionally you can also "
"select a street for the addr:street tag and a node to mark the start of "
"numbering.)"
-msgstr "請選擇單一、封閉、最少四個節點的路徑。（或者您可以從 addr:street 標籤選擇一條街道和要標記為編號開始處的節點。）"
+msgstr "請選擇單一、封閉、最少四個節點的路徑。 (或者你可以從 addr:street 標籤選擇一條街道和要標記為編號開始處的節點。)"
msgid "Terrace"
msgstr "連棟建築"
@@ -31966,91 +32326,91 @@ msgid "Mark element done"
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 ""
msgid "Select and zoom to all of the unmarked items in the todo list."
-msgstr ""
+msgstr "選取並梭放到待處理清單裏沒有標記的項目。"
msgid "Pass"
msgstr ""
msgid "Moves on to the next item but leaves this item in the todo list. ([)."
-msgstr ""
+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 ""
+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 ""
+msgstr "待修正"
msgid "Open to-fix window."
-msgstr ""
+msgstr "開啟待修正視窗。"
msgid "Tool:To-fix"
-msgstr ""
+msgstr "工具：待修正"
msgid "Enable Tofix plugin"
-msgstr ""
+msgstr "啟用「待修正」插件"
msgid "Auto delete layer"
-msgstr ""
+msgstr "自動刪除圖層"
msgid "Select the checkbox to:"
msgstr ""
msgid "Skip"
-msgstr ""
+msgstr "已跳過"
msgid "Skip Error"
-msgstr ""
+msgstr "已跳過的錯誤"
msgid "Fixed"
-msgstr ""
+msgstr "已修正"
msgid "Fixed Error"
-msgstr ""
+msgstr "已修正的錯誤"
msgid "Not an error"
-msgstr ""
+msgstr "不是錯誤"
msgid "<html><a href=\"\">List of tasks</a></html>"
msgstr ""
@@ -32059,16 +32419,16 @@ msgid "Select a task ..."
msgstr ""
msgid "Set download area (m²)"
-msgstr ""
+msgstr "設定下載面積 (平方公尺)"
msgid "~.02"
-msgstr ""
+msgstr "~.02"
msgid "Tasks"
-msgstr ""
+msgstr "工作"
msgid "Config"
-msgstr ""
+msgstr "設定"
msgid "Activation"
msgstr ""
@@ -32086,7 +32446,7 @@ msgid "Activate to-fix plugin."
msgstr ""
msgid "Maintenance server"
-msgstr ""
+msgstr "維護用伺服器"
msgid ""
"<html>Something went wrong, please update the plugin or report an issue at "
@@ -32094,10 +32454,10 @@ msgid ""
msgstr ""
msgid "Something went wrong, try again"
-msgstr ""
+msgstr "好像有什麼東西錯了，再重試一次"
msgid "No change to upload!"
-msgstr ""
+msgstr "沒有變更可以上傳！"
msgid "The bounding box is too big."
msgstr ""
@@ -32127,78 +32487,80 @@ msgid "Tracer building"
msgstr "描出建築物"
msgid "Tracer2"
-msgstr ""
+msgstr "Tracer2"
msgid "Tracer2."
-msgstr ""
+msgstr "Tracer2。"
msgid "Change tag {0} to {1}"
-msgstr ""
+msgstr "標籤 {0} 變更為 {1}"
msgid ""
"The Tracer2Server version isn''t compatible with this plugin. Please "
"download version {0} from\n"
"{1}."
msgstr ""
+"Tracer2Server 的版本跟這個插件不相容，請下載版本 {0} ：\n"
+"{1}"
msgid ""
"New version of Tracer2Server is available. For best results please upgrade "
"to version {0}."
-msgstr ""
+msgstr "有新版本的 Tracer2Server，為了得到最好的成果，請升級到版本 {0}。"
msgid "No set of parameter is active!"
msgstr ""
msgid "Select parameter"
-msgstr ""
+msgstr "選取參數"
msgid "Tracer2: add a way with {0} points"
-msgstr ""
+msgstr "Tracer2：加入 {0} 點的路徑"
msgid "Tracer2: modify way to {0} points"
-msgstr ""
+msgstr "Tracer2：路徑修改為 {0} 點"
msgid "Tracer2 error"
-msgstr ""
+msgstr "Tracer2 錯誤"
msgid "Parameter for server request"
msgstr ""
msgid "Resolution:"
-msgstr ""
+msgstr "解析度："
msgid "Mode:"
-msgstr ""
+msgstr "模式："
msgid "Threshold:"
-msgstr ""
+msgstr "門檻值："
msgid "Points per circle:"
-msgstr ""
+msgstr "每個圓形的點數："
msgid "Tag:"
-msgstr ""
+msgstr "標籤："
msgid "Preferred values:"
msgstr ""
msgid "Delete parameter \"{0}\"?"
-msgstr ""
+msgstr "刪除參數 \"{0}\"？"
msgid "Add new"
-msgstr ""
+msgstr "新增"
msgid "Add predefined"
-msgstr ""
+msgstr "加入預先定義的"
msgid "Select predefined parameter"
-msgstr ""
+msgstr "選取預先定義的參數"
msgid "Modify list of parameter for server request."
msgstr ""
msgid "Parameter:"
-msgstr ""
+msgstr "參數："
msgid ""
"Tracer2Server isn''t running. Please start the Server.\n"
@@ -32242,7 +32604,7 @@ msgid ""
"Do you want to load them from OSM-Server?"
msgstr ""
"{0} /{1} OSM 物件被參照但不在這裡。\n"
-"您是否想要從 OSM-伺服器下載它們？"
+"你是否想要從 OSM-伺服器下載它們？"
msgid "Load objects from server"
msgstr "從伺服器載入物件"
@@ -32251,7 +32613,7 @@ msgid "Download signed data"
msgstr "下載簽署的資料"
msgid "Warning: Ignoring exception because task was canceled. Exception: {0}"
-msgstr "警告：忽略例外，因為工作已被取消。例外：{0}"
+msgstr "警告：忽略異常，因為工作已被取消。例外：{0}"
msgid ""
"Generating new Keypair.\n"
@@ -32291,7 +32653,7 @@ msgid "Sign"
msgstr "簽署"
msgid "Digital sign selected Tags, if you believe they are correct."
-msgstr "數位簽章選擇的標籤，如果您相信它們是正確的。"
+msgstr "數位簽章選擇的標籤，如果你相信它們是正確的。"
msgid "Show all available signatures for selected attribute."
msgstr "顯示所有選取屬性可用的簽章。"
@@ -32302,7 +32664,7 @@ msgstr ""
msgid ""
"Use default (and maybe existing) GnuPG directory ({0}) to store new keys and "
"configs."
-msgstr "使用預設（可能是現有的） GnuPG 目錄 ({0}) 來儲存新的金鑰與設定。"
+msgstr "使用預設 (可能是現有的) GnuPG 目錄 ({0}) 來儲存新的金鑰與設定。"
msgid "Use separate GnuPG directory ({0}) to store new keys and configs."
msgstr "使用個別的 GnuPG 目錄 ({0}) 來儲存新的金鑰與設定。"
@@ -32320,7 +32682,7 @@ msgid "GnuPG"
msgstr "GnuPG"
msgid "Dialog"
-msgstr ""
+msgstr "對話框"
msgid "Signed key value pair was: {0}={1}"
msgstr "簽署的設定鍵值對為： {0}={1}"
@@ -32385,7 +32747,7 @@ msgid "Manipulation Warning"
msgstr ""
msgid "Select a signing key from your keyring-file:"
-msgstr "從您的鑰匙圈檔案選擇簽署金鑰："
+msgstr "從你的鑰匙圈檔案選擇簽署金鑰："
msgid "Don''t ask again for the key"
msgstr "不要再詢問這個金鑰"
@@ -32405,7 +32767,7 @@ msgid ""
"uploading it to the OSM-server."
msgstr ""
"ID \"{0}\" ({1}) 的物件最近才建立。\n"
-"您不能簽署它，因為簽章會在上傳到 OSM-伺服器後失去 ID-參照。"
+"你不能簽署它，因為簽章會在上傳到 OSM-伺服器後失去 ID-參照。"
msgid "Signing canceled!"
msgstr "簽署已取消！"
@@ -32414,7 +32776,7 @@ msgid "Please give a tolerance in meters"
msgstr ""
msgid "Select as much as you like:"
-msgstr "選擇您想要的："
+msgstr "選擇你想要的："
msgid "Survey"
msgstr "探察"
@@ -32429,7 +32791,7 @@ msgid "Trusted persons told me"
msgstr "信任的人告訴我"
msgid "Which source did you use?"
-msgstr "您使用哪個來源？"
+msgstr "你使用哪個來源？"
msgid "never"
msgstr "永不"
@@ -32477,90 +32839,90 @@ 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 ""
+msgstr " 車道數量：順向側已根據轉彎數修正"
msgid " The number of lanes:both_ways has fixed according number of turns"
-msgstr ""
+msgstr " 車道數量：雙向都已根據轉彎數修正"
msgid " The number of lanes:backward has fixed according number of turns"
-msgstr ""
+msgstr " 車道數量：逆向側已根據轉彎數修正"
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 "使用「無」"
msgid "use \"none\" instead of empty values"
-msgstr ""
+msgstr "使用「無」取代空白數值"
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 "逆向車道數"
msgid "Number of forward lanes"
-msgstr ""
+msgstr "順向車道數"
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 ""
+msgstr "沒有這種車道。"
msgid ""
"<html>The number of lanes is not specified for one or more roads; please add "
"missing lanes tags.</html>"
-msgstr ""
+msgstr "<html>有 1 或多條道路沒有指定車道數量：請添加缺少的車道相關標籤。</html>"
msgid ""
"<html>An error occurred while constructing the model. Please run the "
@@ -32568,40 +32930,40 @@ msgid ""
msgstr ""
msgid "Edit turn relations and lane lengths for selected node."
-msgstr ""
+msgstr "請編輯選取節點的轉彎關聯與車道長度。"
msgid "Validate turn- and lane-length-relations for consistency."
-msgstr ""
+msgstr "驗證轉彎與車道長度關聯的一致性。"
msgid "Turn Lanes"
-msgstr ""
+msgstr "轉彎車道"
msgid "Edit turn lanes"
-msgstr ""
+msgstr "編輯轉彎車道"
msgid "Quick-Fix"
msgstr "快速修正"
msgid "Revalidate all turnlanes-relations."
-msgstr ""
+msgstr "重新驗證所有轉彎車道關聯。"
msgid "Automatically fixes the issue."
msgstr "自動修正問題。"
msgid "Selects the offending relation."
-msgstr ""
+msgstr "選取有問題的關聯。"
msgid "Add turn"
-msgstr ""
+msgstr "加入轉彎"
msgid "Delete lane."
-msgstr ""
+msgstr "刪除車道。"
msgid "Delete turn."
-msgstr ""
+msgstr "刪除轉彎。"
msgid "{0} lanes are not referenced in any turn-relation."
-msgstr ""
+msgstr "{0} 個車道沒有參照任何轉彎關聯。"
msgid "Put the ways in order."
msgstr "將路徑依序放置。"
@@ -32624,12 +32986,12 @@ msgstr "建立或編輯轉彎限制。"
msgid ""
"In the following table you can edit the <strong>raw tags</strong> of the OSM "
"relation representing this turn restriction."
-msgstr "在下列表格中您可以編輯代表這個轉彎限制的 OSM 關係的<strong>原始標籤</strong>。"
+msgstr "在下列表格中你可以編輯代表這個轉彎限制的 OSM 關聯的<strong>原始標籤</strong>。"
msgid ""
"In the following table you can edit the <strong>raw members</strong> of the "
"OSM relation representing this turn restriction."
-msgstr "在下列表格中您可以編輯代表這個轉彎限制的 OSM 關係的<strong>原始成員</strong>。"
+msgstr "在下列表格中你可以編輯代表這個轉彎限制的 OSM 關聯的<strong>原始成員</strong>。"
msgid "Type:"
msgstr "類型："
@@ -32652,19 +33014,19 @@ msgstr "在圖層「{1}」中找不到 id「{0}」的物件"
msgid ""
"Cannot add object ''{0}'' as relation member because it is deleted or "
"invisible in layer ''{1}''"
-msgstr "不能將物件「{0}」加入為關係成員，因為它已被刪除或是在圖層「{1}」中是不可視的"
+msgstr "不能將物件「{0}」加入為關聯成員，因為它已被刪除或是在圖層「{1}」中是不可視的"
msgid "Clear the selected roles or delete the selected members"
msgstr "清除選取的角色或刪除選取的成員"
msgid "Insert new relation members from object in the clipboard"
-msgstr "從剪貼簿的物件插入新的關係成員"
+msgstr "從剪貼簿的物件插入新的關聯成員"
msgid "Move the selected relation members down by one position"
-msgstr "將選取的關係成員下移一個位置"
+msgstr "將選取的關聯成員下移一個位置"
msgid "Move the selected relation members up by one position"
-msgstr "將選取的關係成員上移一個位置"
+msgstr "將選取的關聯成員上移一個位置"
msgid "Edit basic attributes of a turn restriction"
msgstr "編輯轉彎限制的基本屬性"
@@ -32693,10 +33055,10 @@ msgid ""
msgid_plural ""
"There are still {0} errors and/or warnings identified for this turn "
"restriction. You are recommended to resolve these issues first."
-msgstr[0] "這個轉彎限制仍有 {0} 未調解的錯誤或警告。建議您先調解這些問題。"
+msgstr[0] "這個轉彎限制仍有 {0} 未調解的錯誤或警告。建議你先調解這些問題。"
msgid "Do you want to save anyway?"
-msgstr "您要强制儲存嗎？"
+msgstr "你要强制儲存嗎？"
msgid "Yes, save anyway"
msgstr "是，強制儲存"
@@ -32725,7 +33087,7 @@ msgstr[1] ""
msgid ""
"Updates to this turn restriction can''t be saved unless deleted members are "
"removed.<br>How to you want to proceed?"
-msgstr "除非先移除已刪除的成員否則不能儲存對這個轉彎限制的更新。<br>您想要如何處理？"
+msgstr "除非先移除已刪除的成員否則不能儲存對這個轉彎限制的更新。<br>你想要如何處理？"
msgid "Remove deleted members and save"
msgstr "移除已刪除成員並儲存"
@@ -32747,7 +33109,7 @@ msgid ""
"cannot apply your changes and continue editing.<br><br>Do you want to create "
"a conflict and close the editor?</html>"
msgstr ""
-"<html>這個轉彎限制已經在編輯器之外被改變了。<br>您不能套用您的變更並繼續編輯。<br><br>您是否要建立一個衝突並關閉這個編輯器？</html"
+"<html>這個轉彎限制已經在編輯器之外被改變了。<br>你不能套用你的變更並繼續編輯。<br><br>你是否要建立一個衝突並關閉這個編輯器？</html"
">"
msgid "Already participating in a conflict"
@@ -32804,16 +33166,16 @@ msgid "No U-Turn"
msgstr "禁止廻轉"
msgid "No Straight On"
-msgstr ""
+msgstr "禁止直行"
msgid "Only Right Turn"
-msgstr ""
+msgstr "右轉專用"
msgid "Only Left Turn"
-msgstr ""
+msgstr "左轉專用"
msgid "Only Straight On"
-msgstr ""
+msgstr "直行專用"
msgid "Warning: failed to load icon for turn restriction type ''{0}''"
msgstr "警告：無法載入轉彎限制類型「{0}」的圖示"
@@ -32824,16 +33186,16 @@ msgstr "選擇轉彎限制類型"
msgid ""
"Select the vehicle types this turn restriction is <strong>not</strong> "
"applicable for."
-msgstr "選擇這個轉彎限制 <strong>不</strong> 適用的車輛類型。"
+msgstr "選擇這個轉彎限制 <strong>不</strong> 適用的車種。"
msgid "Public Service Vehicles"
msgstr "大眾運輸車輛"
msgid "Public service vehicles like buses, tramways, etc."
-msgstr "大眾服務車輛如公車、路面電車等"
+msgstr "大眾運輸車輛，像是公車、路面電車等。"
msgid "Heavy Goods Vehicles"
-msgstr "大型車"
+msgstr "大型載重車"
msgid "Motorcars"
msgstr "汽車"
@@ -32842,7 +33204,7 @@ msgid "Bicycles"
msgstr "自行車"
msgid "Mopeds"
-msgstr ""
+msgstr "動力自行車"
msgid "Use standard exceptions"
msgstr "使用標準例外"
@@ -32900,7 +33262,7 @@ msgid "Display and manage turn restrictions in the current data set"
msgstr "顯示並管理在目前資料組合中的轉彎限制"
msgid "Open an editor for the selected turn restriction"
-msgstr ""
+msgstr "開啟選取轉彎限制的編輯工具"
msgid "Delete the selected turn restriction"
msgstr "刪除選取的轉彎限制"
@@ -33015,7 +33377,7 @@ msgstr "移至基本編輯器並手動修正 via-物件清單"
msgid ""
"A turn restriction must declare the type of restriction. Please select a "
"type in the Basic Editor."
-msgstr "轉彎限制必須宣告限制的種類。請在基本編輯器中選擇一個類型。"
+msgstr "轉彎限制必須宣告限制的類型。請在基本編輯器中選擇一個類型。"
msgid "A way with role <tt>from</tt> is required in a turn restriction."
msgstr "在轉彎限制中需要角色為 <tt>from</tt> 的路徑。"
@@ -33043,7 +33405,7 @@ msgstr "在轉彎限制中的兩條路徑<strong>並沒有相連。</strong>"
msgid ""
"Make sure you add one or more via objects (nodes or ways) to the turn "
"restriction."
-msgstr "請確定您在轉彎限制中加入一或多個 via 物件。"
+msgstr "請確定你在轉彎限制中加入一或多個 via 物件。"
msgid "Go to the Advanced Editor and add via objects"
msgstr "移至進階編輯器並加入 via 物件"
@@ -33141,7 +33503,7 @@ msgstr "取消刪除物件"
msgid ""
"Enter the type and ID of the objects that should be undeleted, e.g., ''n1 "
"w2''"
-msgstr ""
+msgstr "輸入物件的類型和 ID (例如「n1 w2」) 就可以反刪除"
msgid "Select if the data should be added into a new layer"
msgstr "如果資料要加入到新的圖層裡請選擇此項"
@@ -33153,7 +33515,7 @@ msgid "Close dialog and cancel"
msgstr "關閉對話盒並取消"
msgid "Add nodes at intersections"
-msgstr ""
+msgstr "在交叉點加入節點"
msgid "Add missing nodes at intersections of selected ways."
msgstr ""
@@ -33162,7 +33524,7 @@ msgid "Please select one or more ways with intersections of segments."
msgstr ""
msgid "Align Way Nodes"
-msgstr ""
+msgstr "路徑上的節點成列"
msgid "Align nodes in a way"
msgstr "對齊路徑中的節點"
@@ -33191,11 +33553,11 @@ msgid "Extract node from line"
msgstr ""
msgid "Paste Relations"
-msgstr "貼上關係"
+msgstr "貼上關聯"
msgid ""
"Paste relation membership from objects in the buffer onto selected object(s)"
-msgstr "從緩衝區物件貼上關係成員到選取的物件"
+msgstr "從緩衝區物件貼上關聯成員到選取的物件"
msgid "Split Object"
msgstr "分割物件"
@@ -33233,7 +33595,7 @@ msgid ""
msgstr ""
msgid "Symmetry"
-msgstr ""
+msgstr "對稱"
msgid ""
"Please select at least two nodes for symmetry axis and something else to "
@@ -33253,32 +33615,32 @@ msgid "Add remembered source tag"
msgstr ""
msgid "UnGlue Relation"
-msgstr ""
+msgstr "分離關聯"
msgid ""
"Duplicate nodes, ways and relations that are used by multiple relations."
-msgstr "用於多重關係中重複的節點、路徑和關係"
+msgstr "用於多重關聯中重複的節點、路徑和關聯"
msgid "UnGlue Relations"
-msgstr ""
+msgstr "分離關聯"
msgid "Unglued Relations"
-msgstr ""
+msgstr "分離的關聯"
msgid "Change relation member for {0} {1}"
msgstr ""
msgid "Circle arc"
-msgstr ""
+msgstr "圓弧"
msgid "Create a circle arc"
-msgstr ""
+msgstr "建立圓弧"
msgid "Select custom URL"
-msgstr ""
+msgstr "選取自訂 URL 網址"
msgid "Please select one of custom URLs (configured in Preferences)"
-msgstr ""
+msgstr "請選取一個自訂的 URL 網址 (在「偏好設定」裏設定)"
msgid "Ask every time"
msgstr "每次詢問"
@@ -33318,7 +33680,7 @@ msgid "Custom URL configuration"
msgstr "自訂 URL 組態"
msgid "Lat Lon tool"
-msgstr ""
+msgstr "經緯度工具"
msgid "Create geometry by entering lat lon coordinates for it."
msgstr ""
@@ -33360,7 +33722,7 @@ msgid "Sync with JOSM selection"
msgstr ""
msgid "Zoom to objects"
-msgstr ""
+msgstr "縮放到物件大小"
msgid "Remove tag"
msgstr ""
@@ -33438,7 +33800,7 @@ msgstr[0] ""
msgstr[1] ""
msgid "The first selected object ''{0}'' is not part of any relation"
-msgstr ""
+msgstr "第一個選取的物件「{0}」不屬於任何關聯"
msgid "Range of child primitives count"
msgstr ""
@@ -33453,16 +33815,16 @@ msgid "Range of attached ways count"
msgstr ""
msgid "Adjacent nodes"
-msgstr ""
+msgstr "相鄰的節點"
msgid "Select adjacent nodes"
-msgstr ""
+msgstr "選取相鄰的節點"
msgid "Adjacent ways"
-msgstr ""
+msgstr "相鄰的路徑"
msgid "Adjacent ways will be selected. Nodes will be deselected."
-msgstr ""
+msgstr "相鄰的路徑會背選取，節點會被取消選取。"
msgid "All connected ways"
msgstr "所有連接的路徑"
@@ -33471,40 +33833,40 @@ msgid "Select all connected ways"
msgstr "選擇所有連接的路徑"
msgid "Intersecting ways"
-msgstr ""
+msgstr "相交的路徑"
msgid "Select intersecting ways"
-msgstr ""
+msgstr "選取相交的路徑"
msgid "Please select some ways to find connected and intersecting ways!"
-msgstr ""
+msgstr "請選取路徑再找出有連接與香蕉的路徑！"
msgid "All intersecting ways"
-msgstr ""
+msgstr "所有相交的路徑"
msgid "Select all intersecting ways"
-msgstr ""
+msgstr "選取所有相交的路徑"
msgid "Please select some ways to find all connected and intersecting ways!"
-msgstr ""
+msgstr "請選取路徑再找出所有連接與香蕉的路徑！"
msgid "Middle nodes"
-msgstr ""
+msgstr "中間節點"
msgid "Select middle nodes"
-msgstr ""
+msgstr "選取中間節點"
msgid "Please select two nodes connected by way!"
-msgstr ""
+msgstr "請選取有以路徑連接的兩個節點。"
msgid "Too many ways are added: {0}!"
msgstr "加入太多路徑：{0}！"
msgid "All inside [testing]"
-msgstr ""
+msgstr "所有內部"
msgid "Select all inside selected polygons"
-msgstr ""
+msgstr "選取所有在內部已選取的多邊形"
msgid ""
"Nothing found. Please select some closed ways or multipolygons to find all "
@@ -33520,7 +33882,7 @@ msgstr ""
msgid ""
"Nothing found. Please select way that is a part of some polygon formed by "
"connected ways"
-msgstr ""
+msgstr "找不到東西，請選取屬於某相連的路徑組成的多邊形裏的路徑"
msgid "Select Highway"
msgstr "選擇道路"
@@ -33544,7 +33906,7 @@ msgid "Select all nodes of a selected way."
msgstr "選擇選取路徑的所有節點。"
msgid "Undo selection"
-msgstr ""
+msgstr "重作選取項目"
msgid "Reselect last added object or selection form history"
msgstr ""
@@ -33574,7 +33936,7 @@ msgid "starts/pauses video playback"
msgstr "開始/暫停影片的播放"
msgid "Video: {0}"
-msgstr ""
+msgstr "影片：{0}"
msgid "jumps n sec back"
msgstr "向後 n 秒"
@@ -33610,7 +33972,7 @@ msgid "Keep centered"
msgstr "保持置中"
msgid "follows the video icon automatically"
-msgstr ""
+msgstr "自動跟循影片圖示"
msgid "Subtitles"
msgstr "字幕"
@@ -33637,10 +33999,10 @@ msgid "no deinterlacing"
msgstr "沒有非交錯式"
msgid "deinterlacing using line doubling"
-msgstr ""
+msgstr "使用線性加倍法去交錯"
msgid "deinterlacing using linear interpolation"
-msgstr ""
+msgstr "使用線性內插法去交錯"
msgid ""
"VLC library is not correctly initialized. Please check that VLC {0} is "
@@ -33808,7 +34170,7 @@ msgstr "獲取含有地理坐標的維基百科條目"
msgid ""
"Double click on item to search for object with article name (and center "
"coordinate)"
-msgstr "點撃兩下以條目名稱（和中心坐標）搜索物件"
+msgstr "點撃兩下以條目名稱 (和中心坐標) 搜索物件"
msgid "Available via WIWOSM server"
msgstr "可透過 WIWOSM 伺服器利用"
diff --git a/i18n/specialmessages.java b/i18n/specialmessages.java
index 8cf5c7f..3472e85 100644
--- a/i18n/specialmessages.java
+++ b/i18n/specialmessages.java
@@ -17,14 +17,24 @@
/* Landuse type used in multipolygons */ trc("landuse", "forest");
/* Landuse type used in multipolygons */ trc("landuse", "meadow");
/* Landuse type used in multipolygons */ trc("landuse", "farmland");
+/* Landuse type used in multipolygons */ trc("landuse", "farmyard");
+/* Landuse type used in multipolygons */ trc("landuse", "cemetery");
/* Landuse type used in multipolygons */ trc("landuse", "residential");
/* Landuse type used in multipolygons */ trc("landuse", "greenfield");
/* Landuse type used in multipolygons */ trc("landuse", "village_green");
/* Landuse type used in multipolygons */ trc("landuse", "greenfield");
/* Landuse type used in multipolygons */ trc("landuse", "quarry");
+/* Landuse type used in multipolygons */ trc("landuse", "allotments");
+/* Landuse type used in multipolygons */ trc("landuse", "vineyard");
/* Landuse type used in multipolygons */ trc("natural", "scrub");
/* Landuse type used in multipolygons */ trc("natural", "wood");
/* Landuse type used in multipolygons */ trc("natural", "grassland");
+/* Landuse type used in multipolygons */ trc("natural", "wetland");
+/* Landuse type used in multipolygons */ trc("natural", "heath");
+/* Amenity used in multipolygons */ trc("amenity", "fire_station");
+/* Leisure used in multipolygons */ trc("leisure", "park");
+/* Leisure used in multipolygons */ trc("leisure", "track");
+/* Building used in multipolygons */ trc("building", "industrial");
/* relation type */ trc("Relation type", "associatedStreet");
/* relation type */ trc("Relation type", "boundary");
/* relation type */ trc("Relation type", "bridge");
diff --git a/josm-latest.jnlp b/josm-latest.jnlp
index 737fd94..4e5d9df 100644
--- a/josm-latest.jnlp
+++ b/josm-latest.jnlp
@@ -23,5 +23,5 @@
<jar href="josm-latest.jar"/>
<property name="java.util.Arrays.useLegacyMergeSort" value="true"/>
</resources>
- <application-desc main-class="JOSM"/>
+ <application-desc main-class="org.openstreetmap.josm.gui.MainApplication"/>
</jnlp>
diff --git a/josm.jnlp b/josm.jnlp
index f7239e8..f500e73 100644
--- a/josm.jnlp
+++ b/josm.jnlp
@@ -23,5 +23,5 @@
<jar href="josm-tested.jar"/>
<property name="java.util.Arrays.useLegacyMergeSort" value="true"/>
</resources>
- <application-desc main-class="JOSM"/>
+ <application-desc main-class="org.openstreetmap.josm.gui.MainApplication"/>
</jnlp>
diff --git a/linux/latest/DEBIAN/control b/linux/latest/DEBIAN/control
index 9190b0b..6b69802 100644
--- a/linux/latest/DEBIAN/control
+++ b/linux/latest/DEBIAN/control
@@ -5,7 +5,8 @@ Maintainer: josm developers <josm-dev at openstreetmap.org>
Homepage: https://josm.openstreetmap.de
Priority: extra
Architecture: all
-Depends: openjdk-8-jre | java8-runtime
+Depends: openjdk-8-jre | java8-runtime,
+ proj-data
Description: Editor for OpenStreetMap (daily development snapshot)
JOSM is an editor for OpenStreetMap (OSM) written in Java.
The current version supports stand alone GPX tracks, GPX track data
diff --git a/linux/tested/DEBIAN/control b/linux/tested/DEBIAN/control
index e905637..560696c 100644
--- a/linux/tested/DEBIAN/control
+++ b/linux/tested/DEBIAN/control
@@ -5,7 +5,8 @@ Maintainer: josm developers <josm-dev at openstreetmap.org>
Homepage: https://josm.openstreetmap.de
Priority: extra
Architecture: all
-Depends: openjdk-8-jre | java8-runtime
+Depends: openjdk-8-jre | java8-runtime,
+ proj-data
Conflicts: josm-plugins
Replaces: josm-plugins
Description: Editor for OpenStreetMap
diff --git a/scripts/SyncEditorLayerIndex.groovy b/scripts/SyncEditorLayerIndex.groovy
index 149e605..a19e169 100644
--- a/scripts/SyncEditorLayerIndex.groovy
+++ b/scripts/SyncEditorLayerIndex.groovy
@@ -1,9 +1,9 @@
// License: GPL. For details, see LICENSE file.
/**
- * Compare and analyse the differences of the editor imagery index and the JOSM imagery list.
+ * Compare and analyse the differences of the editor layer index and the JOSM imagery list.
* The goal is to keep both lists in sync.
*
- * The editor imagery index project (https://github.com/osmlab/editor-imagery-index)
+ * The editor layer index project (https://github.com/osmlab/editor-layer-index)
* provides also a version in the JOSM format, but the GEOJSON is the original source
* format, so we read that.
*
@@ -12,21 +12,21 @@
*
* Main JOSM binary needs to be in classpath, e.g.
*
- * $ groovy -cp ../dist/josm-custom.jar SyncEditorImageryIndex.groovy
+ * $ groovy -cp ../dist/josm-custom.jar SyncEditorLayerIndex.groovy
*
* Add option "-h" to show the available command line flags.
*/
+import java.text.DecimalFormat
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 {
+class SyncEditorLayerIndex {
List<ImageryInfo> josmEntries;
JsonArray eliEntries;
@@ -35,9 +35,9 @@ class SyncEditorImageryIndex {
def josmUrls = new HashMap<String, ImageryInfo>()
def josmMirrors = new HashMap<String, ImageryInfo>()
- static String eliInputFile = 'imagery.geojson'
- static String josmInputFile = 'maps.xml'
- static String ignoreInputFile = 'maps_ignores.txt'
+ static String eliInputFile = 'imagery_eli.geojson'
+ static String josmInputFile = 'imagery_josm.imagery.xml'
+ static String ignoreInputFile = 'imagery_josm.ignores.txt'
static FileWriter outputFile = null
static BufferedWriter outputStream = null
def skip = [:]
@@ -48,12 +48,23 @@ class SyncEditorImageryIndex {
* Main method.
*/
static main(def args) {
+ Locale.setDefault(Locale.ROOT);
parse_command_line_arguments(args)
- def script = new SyncEditorImageryIndex()
+ def script = new SyncEditorLayerIndex()
script.loadSkip()
script.start()
script.loadJosmEntries()
+ if(options.josmxml) {
+ def file = new FileWriter(options.josmxml)
+ def stream = new BufferedWriter(file)
+ script.printentries(script.josmEntries, stream)
+ }
script.loadELIEntries()
+ if(options.elixml) {
+ def file = new FileWriter(options.elixml)
+ def stream = new BufferedWriter(file)
+ script.printentries(script.eliEntries, stream)
+ }
script.checkInOneButNotTheOther()
script.checkCommonEntries()
script.end()
@@ -71,14 +82,16 @@ class SyncEditorImageryIndex {
static void parse_command_line_arguments(args) {
def cli = new CliBuilder(width: 160)
cli.o(longOpt:'output', args:1, argName: "output", "Output file, - prints to stdout (default: -)")
- cli.e(longOpt:'eli_input', args:1, argName:"eli_input", "Input file for the editor imagery index (geojson). Default is $eliInputFile (current directory).")
+ cli.e(longOpt:'eli_input', args:1, argName:"eli_input", "Input file for the editor layer index (geojson). Default is $eliInputFile (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")
cli.X(longOpt:'xhtml', argName:"xhtml", "create XHTML for display in a web page")
- cli.m(longOpt:'nomissingeli', argName:"nomissingeli", "don't show missing editor imagery index entries")
+ cli.p(longOpt:'elixml', args:1, argName:"elixml", "ELI entries for use in JOSM as XML file (incomplete)")
+ cli.q(longOpt:'josmxml', args:1, argName:"josmxml", "JOSM entries reoutput as XML file (incomplete)")
+ cli.m(longOpt:'noeli', argName:"noeli", "don't show output for ELI problems")
cli.h(longOpt:'help', "show this help")
options = cli.parse(args)
@@ -120,10 +133,10 @@ class SyncEditorImageryIndex {
void myprintlnfinal(String s) {
if(outputStream != null) {
- outputStream.write(s);
- outputStream.newLine();
+ outputStream.write(s)
+ outputStream.newLine()
} else {
- println s;
+ println s
}
}
@@ -135,12 +148,15 @@ class SyncEditorImageryIndex {
s = "<pre style=\"margin:3px;color:"+color+"\">"+s.replaceAll("&","&").replaceAll("<","<").replaceAll(">",">")+"</pre>"
}
if (!options.noskip) {
- return;
+ return
}
} else if(options.xhtmlbody || options.xhtml) {
String color = s.startsWith("***") ? "black" : ((s.startsWith("+ ") || s.startsWith("+++ ELI")) ? "blue" : "red")
s = "<pre style=\"margin:3px;color:"+color+"\">"+s.replaceAll("&","&").replaceAll("<","<").replaceAll(">",">")+"</pre>"
}
+ if ((s.startsWith("+ ") || s.startsWith("+++ ELI")) && options.noeli) {
+ return
+ }
myprintlnfinal(s)
}
@@ -180,6 +196,103 @@ class SyncEditorImageryIndex {
}
myprintln "*** Loaded ${eliEntries.size()} entries (ELI). ***"
}
+ String cdata(def s, boolean escape = false) {
+ if(escape) {
+ return s.replaceAll("&", "&").replaceAll("<", "<").replaceAll(">", ">")
+ } else if(s =~ /[<>&]/)
+ return "<![CDATA[$s]]>"
+ return s
+ }
+
+ String maininfo(def entry, String offset) {
+ String t = getType(entry)
+ String res = offset + "<type>$t</type>\n"
+ res += offset + "<url>${cdata(getUrl(entry))}</url>\n"
+ if(t == "tms") {
+ if(getMinZoom(entry) != null)
+ res += offset + "<min-zoom>${getMinZoom(entry)}</min-zoom>\n"
+ if(getMaxZoom(entry) != null)
+ res += offset + "<max-zoom>${getMaxZoom(entry)}</max-zoom>\n"
+ } else if (t == "wms") {
+ def p = getProjections(entry)
+ if (p) {
+ res += offset + "<projections>\n"
+ for (def c : p)
+ res += offset + " <code>$c</code>\n"
+ res += offset + "</projections>\n"
+ }
+ }
+ return res
+ }
+
+ void printentries(def entries, def stream) {
+ DecimalFormat df = new DecimalFormat("#.#######")
+ df.setRoundingMode(java.math.RoundingMode.CEILING)
+ stream.write "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n"
+ stream.write "<imagery xmlns=\"http://josm.openstreetmap.de/maps-1.0\">\n"
+ for (def e : entries) {
+ def best = "eli-best".equals(getQuality(e))
+ stream.write " <entry"+(best ? " eli-best=\"true\"" : "" )+">\n"
+ stream.write " <name>${cdata(getName(e), true)}</name>\n"
+ stream.write " <id>${getId(e)}</id>\n"
+ def t
+ if((t = getDate(e)))
+ stream.write " <date>$t</date>\n"
+ if((t = getCountryCode(e)))
+ stream.write " <country-code>$t</country-code>\n"
+ stream.write maininfo(e, " ")
+ if((t = getAttributionText(e)))
+ stream.write " <attribution-text mandatory=\"true\">${cdata(t, true)}</attribution-text>\n"
+ if((t = getAttributionUrl(e)))
+ stream.write " <attribution-url>${cdata(t)}</attribution-url>\n"
+ if((t = getTermsOfUseText(e)))
+ stream.write " <terms-of-use-text>${cdata(t, true)}</terms-of-use-text>\n"
+ if((t = getTermsOfUseUrl(e)))
+ stream.write " <terms-of-use-url>${cdata(t)}</terms-of-use-url>\n"
+ if((t = getPermissionReferenceUrl(e)))
+ stream.write " <permission-ref>${cdata(t)}</permission-ref>\n"
+ if((getValidGeoreference(e)))
+ stream.write " <valid-georeference>true</valid-georeference>\n"
+ if((t = getIcon(e)))
+ stream.write " <icon>${cdata(t)}</icon>\n"
+ for (def d : getDescriptions(e)) {
+ stream.write " <description lang=\"${d.getKey()}\">${d.getValue()}</description>\n"
+ }
+ for (def m : getMirrors(e)) {
+ stream.write " <mirror>\n"+maininfo(m, " ")+" </mirror>\n"
+ }
+ def minlat = 1000
+ def minlon = 1000
+ def maxlat = -1000
+ def maxlon = -1000
+ def shapes = ""
+ def sep = "\n "
+ for(def s: getShapes(e)) {
+ shapes += " <shape>"
+ def i = 0
+ 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
+ if(!(i++%3)) {
+ shapes += sep + " "
+ }
+ shapes += "<point lat='${df.format(lat)}' lon='${df.format(lon)}'/>"
+ }
+ shapes += sep + "</shape>\n"
+ }
+ if(shapes) {
+ stream.write " <bounds min-lat='${df.format(minlat)}' min-lon='${df.format(minlon)}' max-lat='${df.format(maxlat)}' max-lon='${df.format(maxlon)}'>\n"
+ stream.write shapes + " </bounds>\n"
+ }
+ stream.write " </entry>\n"
+ }
+ stream.write "</imagery>\n"
+ stream.close()
+ }
void loadJosmEntries() {
def reader = new ImageryReader(josmInputFile)
@@ -230,8 +343,6 @@ class SyncEditorImageryIndex {
}
}
- if (options.nomissingeli)
- return
def l2 = inOneButNotTheOther(josmUrls, eliUrls)
myprintln "*** URLs found in JOSM but not in ELI (${l2.size()}): ***"
if (!l2.isEmpty()) {
@@ -247,7 +358,9 @@ class SyncEditorImageryIndex {
def e = eliUrls.get(url)
if (!josmUrls.containsKey(url)) continue
def j = josmUrls.get(url)
- if (!getName(e).equals(getName(j))) {
+ def ename = getName(e).replace("'","’")
+ def jname = getName(j).replace("'","’")
+ if (!ename.equals(jname)) {
myprintln "* Name differs ('${getName(e)}' != '${getName(j)}'): $url"
}
}
@@ -311,12 +424,12 @@ class SyncEditorImageryIndex {
def j = josmUrls.get(url)
def jd = getDate(j)
// The forms 2015;- or -;2015 or 2015;2015 are handled equal to 2015
- String ef = ed.replaceAll("\\A-;","").replaceAll(";-\\z","").replaceAll("\\A([0-9-]+);\\1\\z","\$1");
+ String ef = ed.replaceAll("\\A-;","").replaceAll(";-\\z","").replaceAll("\\A([0-9-]+);\\1\\z","\$1")
// ELI has a strange and inconsistent used end_date definition, so we try again with subtraction by one
- String ed2 = ed;
+ String ed2 = ed
def reg = (ed =~ /^(.*;)(\d\d\d\d)(-(\d\d)(-(\d\d))?)?$/)
if(reg != null && reg.count == 1) {
- Calendar cal = Calendar.getInstance();
+ Calendar cal = Calendar.getInstance()
cal.set(reg[0][2] as Integer, reg[0][4] == null ? 0 : (reg[0][4] as Integer)-1, reg[0][6] == null ? 1 : reg[0][6] as Integer)
cal.add(Calendar.DAY_OF_MONTH, -1)
ed2 = reg[0][1] + cal.get(Calendar.YEAR)
@@ -325,11 +438,11 @@ class SyncEditorImageryIndex {
if (reg[0][6] != null)
ed2 += "-" + String.format("%02d", cal.get(Calendar.DAY_OF_MONTH))
}
- String ef2 = ed2.replaceAll("\\A-;","").replaceAll(";-\\z","").replaceAll("\\A([0-9-]+);\\1\\z","\$1");
+ String ef2 = ed2.replaceAll("\\A-;","").replaceAll(";-\\z","").replaceAll("\\A([0-9-]+);\\1\\z","\$1")
if (!ed.equals(jd) && !ef.equals(jd) && !ed2.equals(jd) && !ef2.equals(jd)) {
- String t = "'${ed}'";
+ String t = "'${ed}'"
if (!ed.equals(ef)) {
- t += " or '${ef}'";
+ t += " or '${ef}'"
}
if (jd.isEmpty()) {
myprintln "- Missing JOSM date (${t}): ${getDescription(j)}"
@@ -340,6 +453,78 @@ class SyncEditorImageryIndex {
}
}
}
+ myprintln "*** Same URL, but different information: ***"
+ for (def url : eliUrls.keySet()) {
+ if (!josmUrls.containsKey(url)) continue
+ def e = eliUrls.get(url)
+ def j = josmUrls.get(url)
+
+ def et = getDescriptions(e)
+ def jt = getDescriptions(j)
+ et = (et.size() > 0) ? et["en"] : ""
+ jt = (jt.size() > 0) ? jt["en"] : ""
+ def et2 = et.replaceAll("channels (\\d+) ", "\$1 channels ") // imagico entries
+ if (!et.equals(jt) && !(et && jt && (et.endsWith(jt) || et2.endsWith(jt)))) {
+ if (!jt) {
+ myprintln "+ SKIP - Missing JOSM description (${et}): ${getDescription(j)}"
+ } else if (et) {
+ myprintln "+ SKIP * Description differs (${et} != '${jt}'): ${getDescription(j)}"
+ } else if (!options.nomissingeli) {
+ myprintln "+ Missing ELI description ('${jt}'): ${getDescription(j)}"
+ }
+ }
+
+ et = getPermissionReferenceUrl(e)
+ jt = getPermissionReferenceUrl(j)
+ if (!jt) jt = getTermsOfUseUrl(j)
+ if (!et.equals(jt)) {
+ if (!jt) {
+ myprintln "+ SKIP - Missing JOSM license URL (${et}): ${getDescription(j)}"
+ } else if (et) {
+ myprintln "+ SKIP * License URL differs (${et} != '${jt}'): ${getDescription(j)}"
+ } else if (!options.nomissingeli) {
+ myprintln "+ Missing ELI license URL ('${jt}'): ${getDescription(j)}"
+ }
+ }
+
+ et = getAttributionUrl(e)
+ jt = getAttributionUrl(j)
+ if (!et.equals(jt)) {
+ if (!jt) {
+ myprintln "+ SKIP - Missing JOSM attribution URL (${et}): ${getDescription(j)}"
+ } else if (et) {
+ myprintln "+ SKIP * Attribution URL differs (${et} != '${jt}'): ${getDescription(j)}"
+ } else if (!options.nomissingeli) {
+ myprintln "+ Missing ELI attribution URL ('${jt}'): ${getDescription(j)}"
+ }
+ }
+
+ et = getAttributionText(e)
+ jt = getAttributionText(j)
+ if (!et.equals(jt)) {
+ if (!jt) {
+ myprintln "+ SKIP - Missing JOSM attribution text (${et}): ${getDescription(j)}"
+ } else if (et) {
+ myprintln "+ SKIP * Attribution text differs (${et} != '${jt}'): ${getDescription(j)}"
+ } else if (!options.nomissingeli) {
+ myprintln "+ Missing ELI attribution text ('${jt}'): ${getDescription(j)}"
+ }
+ }
+
+ et = getProjections(e)
+ jt = getProjections(j)
+ if (et) { et = new LinkedList(et); Collections.sort(et); et = String.join(" ", et) }
+ if (jt) { jt = new LinkedList(jt); Collections.sort(jt); jt = String.join(" ", jt) }
+ if (!et.equals(jt)) {
+ if (!jt) {
+ myprintln "+ SKIP - Missing JOSM projections (${et}): ${getDescription(j)}"
+ } else if (et) {
+ myprintln "+ SKIP * Projections differ (${et} != '${jt}'): ${getDescription(j)}"
+ } else if (!options.nomissingeli) {
+ myprintln "+ Missing ELI projections ('${jt}'): ${getDescription(j)}"
+ }
+ }
+ }
myprintln "*** Mismatching shapes: ***"
for (def url : josmUrls.keySet()) {
def j = josmUrls.get(url)
@@ -349,6 +534,11 @@ class SyncEditorImageryIndex {
if(!p[0].equals(p[p.size()-1])) {
myprintln "+++ JOSM shape $num unclosed: ${getDescription(j)}"
}
+ for (def nump = 1; nump < p.size(); ++nump) {
+ if (p[nump-1] == p[nump]) {
+ myprintln "+++ JOSM shape $num double point at ${nump-1}: ${getDescription(j)}"
+ }
+ }
++num
}
}
@@ -361,6 +551,11 @@ class SyncEditorImageryIndex {
if(!p[0].equals(p[p.size()-1]) && !options.nomissingeli) {
myprintln "+++ ELI shape $num unclosed: ${getDescription(e)}"
}
+ for (def nump = 1; nump < p.size(); ++nump) {
+ if (p[nump-1] == p[nump]) {
+ myprintln "+++ ELI shape $num double point at ${nump-1}: ${getDescription(e)}"
+ }
+ }
++num
}
if (!josmUrls.containsKey(url)) {
@@ -424,14 +619,14 @@ class SyncEditorImageryIndex {
def j = josmUrls.get(url)
def id = getId(j)
if(josmMirrors.containsKey(url)) {
- continue;
+ 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);
+ josmIds.put(id, j)
}
def d = getDate(j)
if(!d.isEmpty()) {
@@ -440,8 +635,8 @@ class SyncEditorImageryIndex {
myprintln "* JOSM-Date '${d}' is strange: ${getDescription(j)}"
} else {
try {
- def first = verifyDate(reg[0][2],reg[0][4],reg[0][6]);
- def second = verifyDate(reg[0][9],reg[0][11],reg[0][13]);
+ def first = verifyDate(reg[0][2],reg[0][4],reg[0][6])
+ def second = verifyDate(reg[0][9],reg[0][11],reg[0][13])
if(second.compareTo(first) < 0) {
myprintln "* JOSM-Date '${d}' is strange (second earlier than first): ${getDescription(j)}"
}
@@ -453,21 +648,21 @@ class SyncEditorImageryIndex {
}
def js = getShapes(j)
if(js.size()) {
- def minlat = 1000;
- def minlon = 1000;
- def maxlat = -1000;
- def maxlon = -1000;
+ 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 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();
+ 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)}"
}
@@ -493,14 +688,15 @@ class SyncEditorImageryIndex {
return start+";-"
else if(!end.isEmpty())
return "-;"+end
- return "";
+ return ""
}
static Date verifyDate(String year, String month, String day) {
def date
- if(year == null)
+ if(year == null) {
date = "3000-01-01"
- else
+ } else {
date = year + "-" + (month == null ? "01" : month) + "-" + (day == null ? "01" : day)
+ }
def df = new java.text.SimpleDateFormat("yyyy-MM-dd")
df.setLenient(false)
return df.parse(date)
@@ -513,11 +709,29 @@ class SyncEditorImageryIndex {
if (e instanceof ImageryInfo) return e.getOriginalName()
return e.get("properties").getString("name")
}
+ static List<Object> getMirrors(Object e) {
+ if (e instanceof ImageryInfo) return e.getMirrors()
+ return []
+ }
+ static List<Object> getProjections(Object e) {
+ def r
+ if (e instanceof ImageryInfo) {
+ r = e.getServerProjections()
+ } else {
+ def s = e.get("properties").get("available_projections")
+ if (s) {
+ r = []
+ for (def p : s)
+ r += p.getString()
+ }
+ }
+ return r ? r : []
+ }
static List<Shape> getShapes(Object e) {
if (e instanceof ImageryInfo) {
- def bounds = e.getBounds();
+ def bounds = e.getBounds()
if(bounds != null) {
- return bounds.getShapes();
+ return bounds.getShapes()
}
return []
}
@@ -546,6 +760,8 @@ class SyncEditorImageryIndex {
}
static Integer getMinZoom(Object e) {
if (e instanceof ImageryInfo) {
+ if("wms".equals(getType(e)) && e.getName() =~ / mirror/)
+ return null;
int mz = e.getMinZoom()
return mz == 0 ? null : mz
} else {
@@ -556,6 +772,8 @@ class SyncEditorImageryIndex {
}
static Integer getMaxZoom(Object e) {
if (e instanceof ImageryInfo) {
+ if("wms".equals(getType(e)) && e.getName() =~ / mirror/)
+ return null;
int mz = e.getMaxZoom()
return mz == 0 ? null : mz
} else {
@@ -577,6 +795,41 @@ class SyncEditorImageryIndex {
if (e instanceof ImageryInfo) return e.getIcon()
return e.get("properties").getString("icon", null)
}
+ static String getAttributionText(Object e) {
+ if (e instanceof ImageryInfo) return e.getAttributionText(0, null, null)
+ try {return e.get("properties").get("attribution").getString("text", null)} catch (NullPointerException ex) {return null}
+ }
+ static String getAttributionUrl(Object e) {
+ if (e instanceof ImageryInfo) return e.getAttributionLinkURL()
+ try {return e.get("properties").get("attribution").getString("url", null)} catch (NullPointerException ex) {return null}
+ }
+ static String getTermsOfUseText(Object e) {
+ if (e instanceof ImageryInfo) return e.getTermsOfUseText()
+ return null
+ }
+ static String getTermsOfUseUrl(Object e) {
+ if (e instanceof ImageryInfo) return e.getTermsOfUseURL()
+ return null
+ }
+ static String getPermissionReferenceUrl(Object e) {
+ if (e instanceof ImageryInfo) return e.getPermissionReferenceURL()
+ return e.get("properties").getString("license_url", null)
+ }
+ static Map<String,String> getDescriptions(Object e) {
+ Map<String,String> res = new HashMap<String, String>()
+ if (e instanceof ImageryInfo) {
+ String a = e.getDescription()
+ if (a) res.put("en", a)
+ } else {
+ String a = e.get("properties").getString("description", null)
+ if (a) res.put("en", a)
+ }
+ return res
+ }
+ static Boolean getValidGeoreference(Object e) {
+ if (e instanceof ImageryInfo) return e.isGeoreferenceValid()
+ return false
+ }
String getDescription(Object o) {
def url = getUrl(o)
def cc = getCountryCode(o)
diff --git a/scripts/TagInfoExtract.groovy b/scripts/TagInfoExtract.groovy
index 3192519..b5dc528 100644
--- a/scripts/TagInfoExtract.groovy
+++ b/scripts/TagInfoExtract.groovy
@@ -42,6 +42,7 @@ 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.Logging
import org.openstreetmap.josm.tools.RightAndLefthandTraffic
import org.openstreetmap.josm.tools.Territories
import org.openstreetmap.josm.tools.Utils
@@ -376,6 +377,7 @@ class TagInfoExtract {
*/
def init() {
Main.determinePlatformHook()
+ Logging.setLogLevel(Logging.LEVEL_INFO)
Main.pref.enableSaveOnPut(false)
Main.setProjection(Projections.getProjectionByCode("EPSG:3857"))
Path tmpdir = Files.createTempDirectory(FileSystems.getDefault().getPath(base_dir), "pref")
diff --git a/scripts/presets_lang.pl b/scripts/presets_lang.pl
index 8e1db9a..67feb26 100755
--- a/scripts/presets_lang.pl
+++ b/scripts/presets_lang.pl
@@ -36,10 +36,6 @@ sub handle_start
my $main = `wget "$data{href}" -O - -q`;
my $h = uri_unescape($data{href});
my $v = "href=\"$h\"";
- if($h eq "http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema")
- {
- $datan{"de"} = "/wiki/Proposed_features/De:Hausnummern";
- }
while($main =~ /<a href="(\/wiki\/[^"]+)"[^>]+><b>·<\/b> <bdi lang="([a-z_A-Z-]+)"(?: style="unicode-bidi:embed;unicode-bidi:-webkit-isolate;unicode-bidi:isolate")?>/g)
{
my $lang = lc($2);
@@ -68,7 +64,7 @@ sub handle_start
$v .= "\n" . (" " x 18) . "$l.href=\"http://wiki.openstreetmap.org$datan{$l}\"";
}
print "$v\n";
- print "Replace failed for $data{href}.\n" if !($file =~ s/(<link )href="\Q$data{href}\E.*?( ?\/>)/$1$v$2/s);
+ print "Replace failed for $data{href}.\n" if !($file =~ s/(<link )href="\Q$data{href}\E".*?( ?\/>)/$1$v$2/s);
$skip++;
}
diff --git a/snapcraft.yaml b/snapcraft.yaml
index c2d230a..f62cfe8 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -2,10 +2,11 @@ name: josm
version: 0.git
summary: Editor for OpenStreetMap
description: |
- JOSM is an editor for OpenStreetMap (OSM) written in Java.
- The current version supports stand alone GPX tracks, GPX track data
- from OSM database and existing nodes, line segments and metadata tags
- from the OSM database.
+ JOSM is an extensible editor for OpenStreetMap (OSM) written in Java.
+ It supports loading GPX tracks, background imagery and OSM data from
+ local sources as well as from online sources and allows to edit the
+ OSM data (nodes, ways and relations) and their metadata tags.
+ JOSM is open source and licensed under GPL.
OpenStreetMap is a project aimed squarely at creating and providing
free geographic data such as street maps to anyone who wants them.
diff --git a/src/JOSM.java b/src/JOSM.java
deleted file mode 100644
index 06e9d16..0000000
--- a/src/JOSM.java
+++ /dev/null
@@ -1,16 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-import org.openstreetmap.josm.gui.MainApplication;
-
-/**
- * JOSM main class (entry point of the application).<br/>
- *
- * The name of the main class will be the name of the application menu on OS X.
- * so instead of exposing "org.openstreetmap.josm.gui.MainApplication" to the
- * user, we subclass it with a nicer name "JOSM".
- * An alternative is to set the name in the plist file for the OS X Application Bundle.
- *
- * @since 1023
- */
-public class JOSM extends MainApplication {
-
-}
diff --git a/src/org/openstreetmap/josm/Main.java b/src/org/openstreetmap/josm/Main.java
index 8de8833..4d0e308 100644
--- a/src/org/openstreetmap/josm/Main.java
+++ b/src/org/openstreetmap/josm/Main.java
@@ -6,10 +6,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.GraphicsEnvironment;
-import java.awt.Window;
import java.awt.event.KeyEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
import java.io.File;
import java.io.IOException;
import java.lang.ref.WeakReference;
@@ -20,6 +17,7 @@ import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Iterator;
@@ -57,9 +55,7 @@ import org.openstreetmap.josm.actions.mapmode.DrawAction;
import org.openstreetmap.josm.actions.search.SearchAction;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.Preferences;
-import org.openstreetmap.josm.data.ProjectionBounds;
import org.openstreetmap.josm.data.UndoRedoHandler;
-import org.openstreetmap.josm.data.ViewportData;
import org.openstreetmap.josm.data.cache.JCSCacheManager;
import org.openstreetmap.josm.data.coor.CoordinateFormat;
import org.openstreetmap.josm.data.coor.LatLon;
@@ -76,7 +72,6 @@ import org.openstreetmap.josm.gui.MapFrameListener;
import org.openstreetmap.josm.gui.ProgramArguments;
import org.openstreetmap.josm.gui.ProgramArguments.Option;
import org.openstreetmap.josm.gui.io.SaveLayersDialog;
-import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.MainLayerManager;
import org.openstreetmap.josm.gui.layer.OsmDataLayer.CommandQueueListener;
import org.openstreetmap.josm.gui.layer.TMSLayer;
@@ -516,7 +511,7 @@ public abstract class Main {
undoRedo.addCommandQueueListener(redoUndoListener);
// creating toolbar
- contentPanePrivate.add(toolbar.control, BorderLayout.NORTH);
+ GuiHelper.runInEDTAndWait(() -> contentPanePrivate.add(toolbar.control, BorderLayout.NORTH));
registerActionShortcut(menu.help, Shortcut.registerShortcut("system:help", tr("Help"),
KeyEvent.VK_F1, Shortcut.DIRECT));
@@ -574,11 +569,11 @@ public abstract class Main {
FeatureAdapter.registerTranslationAdapter(I18n.getTranslationAdapter());
FeatureAdapter.registerLoggingAdapter(name -> Logging.getLogger());
- new InitializationTask(tr("Updating user interface"), () -> {
+ new InitializationTask(tr("Updating user interface"), () -> GuiHelper.runInEDTAndWait(() -> {
toolbar.refreshToolbarControl();
toolbar.control.updateUI();
contentPanePrivate.updateUI();
- }).call();
+ })).call();
}
/**
@@ -587,7 +582,7 @@ public abstract class Main {
*/
protected abstract void initializeMainWindow();
- private static class InitializationTask implements Callable<Void> {
+ static final class InitializationTask implements Callable<Void> {
private final String name;
private final Runnable task;
@@ -621,35 +616,6 @@ public abstract class Main {
}
/**
- * Add a new layer to the map.
- *
- * If no map exists, create one.
- *
- * @param layer the layer
- * @param bounds the bounds of the layer (target zoom area); can be null, then
- * the viewport isn't changed
- */
- public final void addLayer(Layer layer, ProjectionBounds bounds) {
- addLayer(layer, bounds == null ? null : new ViewportData(bounds));
- }
-
- /**
- * Add a new layer to the map.
- *
- * If no map exists, create one.
- *
- * @param layer the layer
- * @param viewport the viewport to zoom to; can be null, then the viewport isn't changed
- */
- public final void addLayer(Layer layer, ViewportData viewport) {
- getLayerManager().addLayer(layer);
- if (viewport != null && Main.map.mapView != null) {
- // MapView may be null in headless mode here.
- Main.map.mapView.scheduleZoomTo(viewport);
- }
- }
-
- /**
* Replies the current selected primitives, from a end-user point of view.
* It is not always technically the same collection of primitives than {@link DataSet#getSelected()}.
* Indeed, if the user is currently in drawing mode, only the way currently being drawn is returned,
@@ -828,20 +794,32 @@ public abstract class Main {
}
}
- protected static void postConstructorProcessCmdLine(ProgramArguments args) {
+ /**
+ * Handle command line instructions after GUI has been initialized.
+ * @param args program arguments
+ * @return the list of submitted tasks
+ */
+ protected static List<Future<?>> postConstructorProcessCmdLine(ProgramArguments args) {
+ List<Future<?>> tasks = new ArrayList<>();
List<File> fileList = new ArrayList<>();
for (String s : args.get(Option.DOWNLOAD)) {
- DownloadParamType.paramType(s).download(s, fileList);
+ tasks.addAll(DownloadParamType.paramType(s).download(s, fileList));
}
if (!fileList.isEmpty()) {
- OpenFileAction.openFiles(fileList, true);
+ tasks.add(OpenFileAction.openFiles(fileList, true));
}
for (String s : args.get(Option.DOWNLOADGPS)) {
- DownloadParamType.paramType(s).downloadGps(s);
+ tasks.addAll(DownloadParamType.paramType(s).downloadGps(s));
}
- for (String s : args.get(Option.SELECTION)) {
- SearchAction.search(s, SearchAction.SearchMode.add);
+ final Collection<String> selectionArguments = args.get(Option.SELECTION);
+ if (!selectionArguments.isEmpty()) {
+ tasks.add(Main.worker.submit(() -> {
+ for (String s : selectionArguments) {
+ SearchAction.search(s, SearchAction.SearchMode.add);
+ }
+ }));
}
+ return tasks;
}
/**
@@ -870,6 +848,9 @@ public abstract class Main {
return false;
}
+ /**
+ * Shutdown JOSM.
+ */
protected void shutdown() {
if (!GraphicsEnvironment.isHeadless()) {
worker.shutdown();
@@ -899,12 +880,12 @@ public abstract class Main {
enum DownloadParamType {
httpUrl {
@Override
- void download(String s, Collection<File> fileList) {
- new OpenLocationAction().openUrl(false, s);
+ List<Future<?>> download(String s, Collection<File> fileList) {
+ return new OpenLocationAction().openUrl(false, s);
}
@Override
- void downloadGps(String s) {
+ List<Future<?>> downloadGps(String s) {
final Bounds b = OsmUrlToBounds.parse(s);
if (b == null) {
JOptionPane.showMessageDialog(
@@ -913,13 +894,13 @@ public abstract class Main {
tr("Warning"),
JOptionPane.WARNING_MESSAGE
);
- return;
+ return Collections.emptyList();
}
- downloadFromParamBounds(true, b);
+ return downloadFromParamBounds(true, b);
}
}, fileUrl {
@Override
- void download(String s, Collection<File> fileList) {
+ List<Future<?>> download(String s, Collection<File> fileList) {
File f = null;
try {
f = new File(new URI(s));
@@ -935,6 +916,7 @@ public abstract class Main {
if (f != null) {
fileList.add(f);
}
+ return Collections.emptyList();
}
}, bounds {
@@ -942,31 +924,33 @@ public abstract class Main {
* Download area specified on the command line as bounds string.
* @param rawGps Flag to download raw GPS tracks
* @param s The bounds parameter
+ * @return the complete download task (including post-download handler), or {@code null}
*/
- private void downloadFromParamBounds(final boolean rawGps, String s) {
+ private List<Future<?>> downloadFromParamBounds(final boolean rawGps, String s) {
final StringTokenizer st = new StringTokenizer(s, ",");
if (st.countTokens() == 4) {
- Bounds b = new Bounds(
+ return Main.downloadFromParamBounds(rawGps, new Bounds(
new LatLon(Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken())),
new LatLon(Double.parseDouble(st.nextToken()), Double.parseDouble(st.nextToken()))
- );
- Main.downloadFromParamBounds(rawGps, b);
+ ));
}
+ return Collections.emptyList();
}
@Override
- void download(String param, Collection<File> fileList) {
- downloadFromParamBounds(false, param);
+ List<Future<?>> download(String param, Collection<File> fileList) {
+ return downloadFromParamBounds(false, param);
}
@Override
- void downloadGps(String param) {
- downloadFromParamBounds(true, param);
+ List<Future<?>> downloadGps(String param) {
+ return downloadFromParamBounds(true, param);
}
}, fileName {
@Override
- void download(String s, Collection<File> fileList) {
+ List<Future<?>> download(String s, Collection<File> fileList) {
fileList.add(new File(s));
+ return Collections.emptyList();
}
};
@@ -974,20 +958,25 @@ public abstract class Main {
* Performs the download
* @param param represents the object to be downloaded
* @param fileList files which shall be opened, should be added to this collection
+ * @return the download task, or {@code null}
*/
- abstract void download(String param, Collection<File> fileList);
+ abstract List<Future<?>> download(String param, Collection<File> fileList);
/**
* Performs the GPS download
* @param param represents the object to be downloaded
+ * @return the download task, or {@code null}
*/
- void downloadGps(String param) {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("Parameter \"downloadgps\" does not accept file names or file URLs"),
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE
- );
+ List<Future<?>> downloadGps(String param) {
+ if (!GraphicsEnvironment.isHeadless()) {
+ JOptionPane.showMessageDialog(
+ Main.parent,
+ tr("Parameter \"downloadgps\" does not accept file names or file URLs"),
+ tr("Warning"),
+ JOptionPane.WARNING_MESSAGE
+ );
+ }
+ return Collections.emptyList();
}
/**
@@ -1010,13 +999,14 @@ public abstract class Main {
* Download area specified as Bounds value.
* @param rawGps Flag to download raw GPS tracks
* @param b The bounds value
+ * @return the complete download task (including post-download handler)
*/
- private static void downloadFromParamBounds(final boolean rawGps, Bounds b) {
+ private static List<Future<?>> downloadFromParamBounds(final boolean rawGps, Bounds b) {
DownloadTask task = rawGps ? new DownloadGpsTask() : new DownloadOsmTask();
// asynchronously launch the download task ...
Future<?> future = task.download(true, b, null);
// ... and the continuation when the download is finished (this will wait for the download to finish)
- Main.worker.execute(new PostDownloadHandler(task, future));
+ return Collections.singletonList(Main.worker.submit(new PostDownloadHandler(task, future)));
}
/**
@@ -1159,167 +1149,25 @@ public abstract class Main {
void fromOtherApplication();
}
- private static final List<WeakReference<WindowSwitchListener>> windowSwitchListeners = new ArrayList<>();
-
/**
- * Register a window switch listener.
- *
- * @param listener the listener. Ignored if <code>null</code>.
- */
- public static void addWindowSwitchListener(WindowSwitchListener listener) {
- if (listener == null) return;
- synchronized (Main.class) {
- for (WeakReference<WindowSwitchListener> wr : windowSwitchListeners) {
- // already registered ? => abort
- if (wr.get() == listener) return;
- }
- boolean wasEmpty = windowSwitchListeners.isEmpty();
- windowSwitchListeners.add(new WeakReference<>(listener));
- if (wasEmpty) {
- // The following call will have no effect, when there is no window
- // at the time. Therefore, MasterWindowListener.setup() will also be
- // called, as soon as the main window is shown.
- MasterWindowListener.setup();
- }
- }
- }
-
- /**
- * Removes a window switch listener.
- *
- * @param listener the listener. Ignored if <code>null</code>.
- */
- public static void removeWindowSwitchListener(WindowSwitchListener listener) {
- if (listener == null) return;
- synchronized (Main.class) {
- // 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();
- }
- }
- }
-
- /**
- * WindowListener, that is registered on all Windows of the application.
- *
- * Its purpose is to notify WindowSwitchListeners, that the user switches to
- * another application, e.g. a browser, or back to JOSM.
- *
- * When changing from JOSM to another application and back (e.g. two times
- * alt+tab), the active Window within JOSM may be different.
- * Therefore, we need to register listeners to <strong>all</strong> (visible)
- * Windows in JOSM, and it does not suffice to monitor the one that was
- * deactivated last.
- *
- * This class is only "active" on demand, i.e. when there is at least one
- * WindowSwitchListener registered.
- */
- protected static class MasterWindowListener extends WindowAdapter {
-
- private static MasterWindowListener INSTANCE;
-
- public static synchronized MasterWindowListener getInstance() {
- if (INSTANCE == null) {
- INSTANCE = new MasterWindowListener();
- }
- return INSTANCE;
- }
-
- /**
- * Register listeners to all non-hidden windows.
- *
- * Windows that are created later, will be cared for in {@link #windowDeactivated(WindowEvent)}.
- */
- public static void setup() {
- if (!windowSwitchListeners.isEmpty()) {
- for (Window w : Window.getWindows()) {
- if (w.isShowing() && !Arrays.asList(w.getWindowListeners()).contains(getInstance())) {
- w.addWindowListener(getInstance());
- }
- }
- }
- }
-
- /**
- * Unregister all listeners.
- */
- public static void teardown() {
- for (Window w : Window.getWindows()) {
- w.removeWindowListener(getInstance());
- }
- }
-
- @Override
- public void windowActivated(WindowEvent e) {
- if (e.getOppositeWindow() == null) { // we come from a window of a different application
- // fire WindowSwitchListeners
- synchronized (Main.class) {
- Iterator<WeakReference<WindowSwitchListener>> it = windowSwitchListeners.iterator();
- while (it.hasNext()) {
- WeakReference<WindowSwitchListener> wr = it.next();
- WindowSwitchListener listener = wr.get();
- if (listener == null) {
- it.remove();
- continue;
- }
- listener.fromOtherApplication();
- }
- }
- }
- }
-
- @Override
- public void windowDeactivated(WindowEvent e) {
- // set up windows that have been created in the meantime
- for (Window w : Window.getWindows()) {
- if (!w.isShowing()) {
- w.removeWindowListener(getInstance());
- } else {
- if (!Arrays.asList(w.getWindowListeners()).contains(getInstance())) {
- w.addWindowListener(getInstance());
- }
- }
- }
- if (e.getOppositeWindow() == null) { // we go to a window of a different application
- // fire WindowSwitchListeners
- synchronized (Main.class) {
- Iterator<WeakReference<WindowSwitchListener>> it = windowSwitchListeners.iterator();
- while (it.hasNext()) {
- WeakReference<WindowSwitchListener> wr = it.next();
- WindowSwitchListener listener = wr.get();
- if (listener == null) {
- it.remove();
- continue;
- }
- listener.toOtherApplication();
- }
- }
- }
- }
- }
-
- /**
- * Registers a new {@code MapFrameListener} that will be notified of MapFrame changes
+ * Registers a new {@code MapFrameListener} that will be notified of MapFrame changes.
+ * <p>
+ * It will fire an initial mapFrameInitialized event when the MapFrame is present.
+ * Otherwise will only fire when the MapFrame is created or destroyed.
* @param listener The MapFrameListener
- * @param fireWhenMapViewPresent If true, will fire an initial mapFrameInitialized event
- * when the MapFrame is present. Otherwise will only fire when the MapFrame is created
- * or destroyed.
* @return {@code true} if the listeners collection changed as a result of the call
+ * @see #addMapFrameListener
+ * @since 11904
*/
- public static boolean addMapFrameListener(MapFrameListener listener, boolean fireWhenMapViewPresent) {
- if (fireWhenMapViewPresent) {
- return mainPanel.addAndFireMapFrameListener(listener);
- } else {
- return mainPanel.addMapFrameListener(listener);
- }
+ public static boolean addAndFireMapFrameListener(MapFrameListener listener) {
+ return mainPanel.addAndFireMapFrameListener(listener);
}
/**
* Registers a new {@code MapFrameListener} that will be notified of MapFrame changes
* @param listener The MapFrameListener
* @return {@code true} if the listeners collection changed as a result of the call
+ * @see #addAndFireMapFrameListener
* @since 5957
*/
public static boolean addMapFrameListener(MapFrameListener listener) {
@@ -1382,6 +1230,14 @@ public abstract class Main {
}
/**
+ * Clears the network errors cache.
+ * @since 12011
+ */
+ public static void clearNetworkErrors() {
+ NETWORK_ERRORS.clear();
+ }
+
+ /**
* Returns the JOSM website URL.
* @return the josm website URL
* @since 6897
diff --git a/src/org/openstreetmap/josm/actions/AbstractMergeAction.java b/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
index 3638b01..07d01d4 100644
--- a/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
+++ b/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
@@ -9,7 +9,6 @@ import java.awt.GridBagLayout;
import java.util.List;
import javax.swing.DefaultListCellRenderer;
-import javax.swing.Icon;
import javax.swing.JLabel;
import javax.swing.JList;
import javax.swing.JOptionPane;
@@ -21,12 +20,16 @@ import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.widgets.JosmComboBox;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
+/**
+ * Abstract superclass of different "Merge" actions.
+ * @since 1890
+ */
public abstract class AbstractMergeAction extends JosmAction {
/**
* the list cell renderer used to render layer list entries
- *
*/
public static class LayerListCellRenderer extends DefaultListCellRenderer {
@@ -34,8 +37,7 @@ public abstract class AbstractMergeAction extends JosmAction {
public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
Layer layer = (Layer) value;
JLabel label = (JLabel) super.getListCellRendererComponent(list, layer.getName(), index, isSelected, cellHasFocus);
- Icon icon = layer.getIcon();
- label.setIcon(icon);
+ label.setIcon(layer.getIcon());
label.setToolTipText(layer.getToolTipText());
return label;
}
@@ -43,20 +45,44 @@ public abstract class AbstractMergeAction extends JosmAction {
/**
* Constructs a new {@code AbstractMergeAction}.
+ * @param name the action's text as displayed on the menu (if it is added to a menu)
+ * @param iconName the filename of the icon to use
+ * @param tooltip a longer description of the action that will be displayed in the tooltip. Please note
+ * that html is not supported for menu actions on some platforms.
+ * @param shortcut a ready-created shortcut object or null if you don't want a shortcut. But you always
+ * do want a shortcut, remember you can always register it with group=none, so you
+ * won't be assigned a shortcut unless the user configures one. If you pass null here,
+ * the user CANNOT configure a shortcut for your action.
+ * @param register register this action for the toolbar preferences?
*/
- public AbstractMergeAction() {
- super();
- }
-
public AbstractMergeAction(String name, String iconName, String tooltip, Shortcut shortcut, boolean register) {
super(name, iconName, tooltip, shortcut, register);
}
+ /**
+ * Constructs a new {@code AbstractMergeAction}.
+ * @param name the action's text as displayed on the menu (if it is added to a menu)
+ * @param iconName the filename of the icon to use
+ * @param tooltip a longer description of the action that will be displayed in the tooltip. Please note
+ * that html is not supported for menu actions on some platforms.
+ * @param shortcut a ready-created shortcut object or null if you don't want a shortcut. But you always
+ * do want a shortcut, remember you can always register it with group=none, so you
+ * won't be assigned a shortcut unless the user configures one. If you pass null here,
+ * the user CANNOT configure a shortcut for your action.
+ * @param register register this action for the toolbar preferences?
+ * @param toolbar identifier for the toolbar preferences. The iconName is used, if this parameter is null
+ * @param installAdapters false, if you don't want to install layer changed and selection changed adapters
+ */
public AbstractMergeAction(String name, String iconName, String tooltip, Shortcut shortcut,
boolean register, String toolbar, boolean installAdapters) {
super(name, iconName, tooltip, shortcut, register, toolbar, installAdapters);
}
+ /**
+ * Ask user to choose the target layer.
+ * @param targetLayers list of candidate target layers.
+ * @return the chosen layer
+ */
protected static Layer askTargetLayer(List<Layer> targetLayers) {
return askTargetLayer(targetLayers.toArray(new Layer[targetLayers.size()]),
tr("Please select the target layer."),
@@ -97,9 +123,15 @@ public abstract class AbstractMergeAction extends JosmAction {
return (T) layerList.getSelectedItem();
}
+ /**
+ * Warns user when there no layers the source layer could be merged to.
+ * @param sourceLayer source layer
+ */
protected void warnNoTargetLayersForSourceLayer(Layer sourceLayer) {
- JOptionPane.showMessageDialog(Main.parent,
- tr("<html>There are no layers the source layer<br>''{0}''<br>could be merged to.</html>", sourceLayer.getName()),
- tr("No target layers"), JOptionPane.WARNING_MESSAGE);
+ String message = tr("<html>There are no layers the source layer<br>''{0}''<br>could be merged to.</html>",
+ Utils.escapeReservedCharactersHTML(sourceLayer.getName()));
+ if (!GraphicsEnvironment.isHeadless()) {
+ JOptionPane.showMessageDialog(Main.parent, message, tr("No target layers"), JOptionPane.WARNING_MESSAGE);
+ }
}
}
diff --git a/src/org/openstreetmap/josm/actions/AlignInLineAction.java b/src/org/openstreetmap/josm/actions/AlignInLineAction.java
index daa848d..1046001 100644
--- a/src/org/openstreetmap/josm/actions/AlignInLineAction.java
+++ b/src/org/openstreetmap/josm/actions/AlignInLineAction.java
@@ -89,7 +89,7 @@ public final class AlignInLineAction extends JosmAction {
// Get ways passing though all selected nodes.
Set<Way> waysRef = null;
for (Node n: nodes) {
- Collection<Way> ref = OsmPrimitive.getFilteredList(n.getReferrers(), Way.class);
+ Collection<Way> ref = n.getParentWays();
if (waysRef == null)
waysRef = new HashSet<>(ref);
else
@@ -186,7 +186,7 @@ public final class AlignInLineAction extends JosmAction {
List<Way> involvedWays;
if (selectedWays.isEmpty())
// No selected way, all way containing this node are used
- involvedWays = OsmPrimitive.getFilteredList(selectedNode.getReferrers(), Way.class);
+ involvedWays = selectedNode.getParentWays();
else
// Selected way, use only these ways
involvedWays = selectedWays;
diff --git a/src/org/openstreetmap/josm/actions/MergeLayerAction.java b/src/org/openstreetmap/josm/actions/MergeLayerAction.java
index 5dc9e6e..acc88ca 100644
--- a/src/org/openstreetmap/josm/actions/MergeLayerAction.java
+++ b/src/org/openstreetmap/josm/actions/MergeLayerAction.java
@@ -9,6 +9,7 @@ import java.awt.event.KeyEvent;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.concurrent.Future;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
@@ -37,12 +38,19 @@ public class MergeLayerAction extends AbstractMergeAction {
putValue("help", ht("/Action/MergeLayer"));
}
- protected void doMerge(List<Layer> targetLayers, final Collection<Layer> sourceLayers) {
+ /**
+ * Submits merge of layers.
+ * @param targetLayers possible target layers
+ * @param sourceLayers source layers
+ * @return a Future representing pending completion of the merge task, or {@code null}
+ * @since 11885 (return type)
+ */
+ protected Future<?> doMerge(List<Layer> targetLayers, final Collection<Layer> sourceLayers) {
final Layer targetLayer = askTargetLayer(targetLayers);
if (targetLayer == null)
- return;
+ return null;
final Object actionName = getValue(NAME);
- Main.worker.submit(() -> {
+ return Main.worker.submit(() -> {
final long start = System.currentTimeMillis();
boolean layerMerged = false;
for (final Layer sourceLayer: sourceLayers) {
@@ -68,24 +76,28 @@ public class MergeLayerAction extends AbstractMergeAction {
/**
* Merges a list of layers together.
* @param sourceLayers The layers to merge
+ * @return a Future representing pending completion of the merge task, or {@code null}
+ * @since 11885 (return type)
*/
- public void merge(List<Layer> sourceLayers) {
- doMerge(sourceLayers, sourceLayers);
+ public Future<?> merge(List<Layer> sourceLayers) {
+ return doMerge(sourceLayers, sourceLayers);
}
/**
* Merges the given source layer with another one, determined at runtime.
* @param sourceLayer The source layer to merge
+ * @return a Future representing pending completion of the merge task, or {@code null}
+ * @since 11885 (return type)
*/
- public void merge(Layer sourceLayer) {
+ public Future<?> merge(Layer sourceLayer) {
if (sourceLayer == null)
- return;
+ return null;
List<Layer> targetLayers = LayerListDialog.getInstance().getModel().getPossibleMergeTargets(sourceLayer);
if (targetLayers.isEmpty()) {
warnNoTargetLayersForSourceLayer(sourceLayer);
- return;
+ return null;
}
- doMerge(targetLayers, Collections.singleton(sourceLayer));
+ return doMerge(targetLayers, Collections.singleton(sourceLayer));
}
@Override
@@ -111,8 +123,12 @@ public class MergeLayerAction extends AbstractMergeAction {
});
}
+ /**
+ * Returns the source layer.
+ * @return the source layer
+ */
protected Layer getSourceLayer() {
- return Main.map != null ? Main.getLayerManager().getActiveLayer() : null;
+ return Main.getLayerManager().getActiveLayer();
}
/**
@@ -129,7 +145,10 @@ public class MergeLayerAction extends AbstractMergeAction {
"Merging them will result to enforce the stricter policy (upload discouraged) to ''{1}''.<br /><br />"+
"<b>This is not the recommended way of merging such data</b>.<br />"+
"You should instead check and merge each object, one by one, by using ''<i>Merge selection</i>''.<br /><br />"+
- "Are you sure you want to continue?", sourceLayer.getName(), targetLayer.getName(), targetLayer.getName())+
+ "Are you sure you want to continue?",
+ Utils.escapeReservedCharactersHTML(sourceLayer.getName()),
+ Utils.escapeReservedCharactersHTML(targetLayer.getName()),
+ Utils.escapeReservedCharactersHTML(targetLayer.getName()))+
"</html>",
ImageProvider.get("dialogs", "mergedown"), tr("Ignore this hint and merge anyway"));
}
diff --git a/src/org/openstreetmap/josm/actions/MergeSelectionAction.java b/src/org/openstreetmap/josm/actions/MergeSelectionAction.java
index af117cb..21bc361 100644
--- a/src/org/openstreetmap/josm/actions/MergeSelectionAction.java
+++ b/src/org/openstreetmap/josm/actions/MergeSelectionAction.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;
/**
* Merge the currently selected objects into another layer.
@@ -89,7 +90,9 @@ public class MergeSelectionAction extends AbstractMergeAction {
"<b>This is not the recommended way of merging such data</b>.<br />"+
"You should instead check and merge each object, <b>one by one</b>.<br /><br />"+
"Are you sure you want to continue?",
- getLayerManager().getEditLayer().getName(), targetLayer.getName(), targetLayer.getName())+
+ Utils.escapeReservedCharactersHTML(getLayerManager().getEditLayer().getName()),
+ Utils.escapeReservedCharactersHTML(targetLayer.getName()),
+ Utils.escapeReservedCharactersHTML(targetLayer.getName()))+
"</html>",
ImageProvider.get("dialogs", "mergedown"), tr("Ignore this hint and merge anyway"));
}
diff --git a/src/org/openstreetmap/josm/actions/MoveAction.java b/src/org/openstreetmap/josm/actions/MoveAction.java
index 9dcea4a..87dce48 100644
--- a/src/org/openstreetmap/josm/actions/MoveAction.java
+++ b/src/org/openstreetmap/josm/actions/MoveAction.java
@@ -27,7 +27,19 @@ import org.openstreetmap.josm.tools.Shortcut;
*/
public class MoveAction extends JosmAction {
- public enum Direction { UP, LEFT, RIGHT, DOWN }
+ /**
+ * Move direction.
+ */
+ public enum Direction {
+ /** Move up */
+ UP,
+ /** Move left */
+ LEFT,
+ /** Move right */
+ RIGHT,
+ /** Move down */
+ DOWN
+ }
private final Direction myDirection;
diff --git a/src/org/openstreetmap/josm/actions/OpenFileAction.java b/src/org/openstreetmap/josm/actions/OpenFileAction.java
index 4dcf43f..3e06c5c 100644
--- a/src/org/openstreetmap/josm/actions/OpenFileAction.java
+++ b/src/org/openstreetmap/josm/actions/OpenFileAction.java
@@ -21,6 +21,7 @@ import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.Future;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
@@ -38,6 +39,7 @@ import org.openstreetmap.josm.io.FileImporter;
import org.openstreetmap.josm.io.OsmTransferException;
import org.openstreetmap.josm.tools.MultiMap;
import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
import org.xml.sax.SAXException;
/**
@@ -82,20 +84,24 @@ public class OpenFileAction extends DiskAccessAction {
* Open a list of files. The complete list will be passed to batch importers.
* Filenames will not be saved in history.
* @param fileList A list of files
+ * @return the future task
+ * @since 11986 (return task)
*/
- public static void openFiles(List<File> fileList) {
- openFiles(fileList, false);
+ public static Future<?> openFiles(List<File> fileList) {
+ return openFiles(fileList, false);
}
/**
* Open a list of files. The complete list will be passed to batch importers.
* @param fileList A list of files
* @param recordHistory {@code true} to save filename in history (default: false)
+ * @return the future task
+ * @since 11986 (return task)
*/
- public static void openFiles(List<File> fileList, boolean recordHistory) {
+ public static Future<?> openFiles(List<File> fileList, boolean recordHistory) {
OpenFileTask task = new OpenFileTask(fileList, null);
task.setRecordHistory(recordHistory);
- Main.worker.submit(task);
+ return Main.worker.submit(task);
}
/**
@@ -181,7 +187,7 @@ public class OpenFileAction extends DiskAccessAction {
"Cannot open {0} files with the file importer ''{1}''.",
files.size(),
files.size(),
- importer.filter.getDescription()
+ Utils.escapeReservedCharactersHTML(importer.filter.getDescription())
)
).append("<br><ul>");
for (File f: files) {
diff --git a/src/org/openstreetmap/josm/actions/OpenLocationAction.java b/src/org/openstreetmap/josm/actions/OpenLocationAction.java
index 2e9037b..25ed91e 100644
--- a/src/org/openstreetmap/josm/actions/OpenLocationAction.java
+++ b/src/org/openstreetmap/josm/actions/OpenLocationAction.java
@@ -56,6 +56,9 @@ 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", false);
+ /**
+ * the list of download tasks
+ */
protected final transient List<Class<? extends DownloadTask>> downloadTasks;
static class WhichTasksToPerformDialog extends ExtendedDialog {
@@ -199,44 +202,44 @@ public class OpenLocationAction extends JosmAction {
* Open the given URL.
* @param newLayer true if the URL needs to be opened in a new layer, false otherwise
* @param url The URL to open
+ * @return the list of tasks that have been started successfully (can be empty).
+ * @since 11986 (return type)
*/
- public void openUrl(boolean newLayer, String url) {
- realOpenUrl(newLayer, url);
+ public List<Future<?>> openUrl(boolean newLayer, String url) {
+ return 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
+ * @return the list of tasks that have been started successfully (can be empty).
+ * @since 11986 (return type)
*/
- public boolean openUrl(String url) {
+ public List<Future<?>> openUrl(String url) {
return realOpenUrl(USE_NEW_LAYER.get(), url);
}
- private boolean realOpenUrl(boolean newLayer, String url) {
+ private List<Future<?>> 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 false;
+ return Collections.emptyList();
}
PleaseWaitProgressMonitor monitor = new PleaseWaitProgressMonitor(tr("Download Data"));
- boolean hadAnySuccess = false;
+ List<Future<?>> result = new ArrayList<>();
for (final DownloadTask task : tasks) {
try {
- Future<?> future = task.loadUrl(newLayer, url, monitor);
- Main.worker.submit(new PostDownloadHandler(task, future));
- hadAnySuccess = true;
+ result.add(Main.worker.submit(new PostDownloadHandler(task, task.loadUrl(newLayer, url, monitor))));
} catch (IllegalArgumentException e) {
Main.error(e);
}
}
- return hadAnySuccess;
+ return result;
}
/**
diff --git a/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java b/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
index f4e7d52..dc0ff81 100644
--- a/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
+++ b/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java
@@ -494,7 +494,7 @@ public final class OrthogonalizeAction extends JosmAction {
}
}
- private enum Direction {
+ enum Direction {
RIGHT, UP, LEFT, DOWN;
public Direction changeBy(int directionChange) {
int tmp = (this.ordinal() + directionChange) % 4;
@@ -538,7 +538,7 @@ public final class OrthogonalizeAction extends JosmAction {
/**
* Class contains some auxiliary functions
*/
- private static final class EN {
+ static final class EN {
private EN() {
// Hide implicit public constructor for utility class
}
diff --git a/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java b/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java
index f66c8c3..97ee421 100644
--- a/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java
+++ b/src/org/openstreetmap/josm/actions/SearchNotesDownloadAction.java
@@ -9,6 +9,7 @@ import java.awt.event.ActionEvent;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
+import java.util.Optional;
import javax.swing.JLabel;
import javax.swing.JOptionPane;
@@ -60,8 +61,8 @@ public class SearchNotesDownloadAction extends JosmAction {
return;
}
- String searchTerm = searchTermBox.getText();
- if (searchTerm == null || searchTerm.trim().isEmpty()) {
+ String searchTerm = Optional.ofNullable(searchTermBox.getText()).orElse("").trim();
+ if (searchTerm.isEmpty()) {
Notification notification = new Notification(tr("You must enter a search term"));
notification.setIcon(JOptionPane.WARNING_MESSAGE);
notification.show();
diff --git a/src/org/openstreetmap/josm/actions/SessionLoadAction.java b/src/org/openstreetmap/josm/actions/SessionLoadAction.java
index 1f9c652..3109d72 100644
--- a/src/org/openstreetmap/josm/actions/SessionLoadAction.java
+++ b/src/org/openstreetmap/josm/actions/SessionLoadAction.java
@@ -189,7 +189,7 @@ public class SessionLoadAction extends DiskAccessAction {
HelpAwareOptionPane.showMessageDialogInEDT(
Main.parent,
tr("<html>Could not load session file ''{0}''.<br>Error is:<br>{1}</html>",
- uri != null ? uri : file.getName(), e.getMessage()),
+ uri != null ? uri : file.getName(), Utils.escapeReservedCharactersHTML(e.getMessage())),
dialogTitle,
JOptionPane.ERROR_MESSAGE,
null
diff --git a/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java b/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java
index 188a027..09f015a 100644
--- a/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java
+++ b/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java
@@ -169,7 +169,8 @@ public class SessionSaveAsAction extends DiskAccessAction implements MapFrameLis
Main.error(ex);
HelpAwareOptionPane.showMessageDialogInEDT(
Main.parent,
- tr("<html>Could not save session file ''{0}''.<br>Error is:<br>{1}</html>", file.getName(), ex.getMessage()),
+ tr("<html>Could not save session file ''{0}''.<br>Error is:<br>{1}</html>",
+ file.getName(), Utils.escapeReservedCharactersHTML(ex.getMessage())),
tr("IO Error"),
JOptionPane.ERROR_MESSAGE,
null
diff --git a/src/org/openstreetmap/josm/actions/SplitWayAction.java b/src/org/openstreetmap/josm/actions/SplitWayAction.java
index 0f14111..2eb8515 100644
--- a/src/org/openstreetmap/josm/actions/SplitWayAction.java
+++ b/src/org/openstreetmap/josm/actions/SplitWayAction.java
@@ -370,8 +370,7 @@ public class SplitWayAction extends JosmAction {
// Special case - one of the selected ways touches (not cross) way that we want to split
if (selectedNodes.size() == 1) {
Node n = selectedNodes.get(0);
- List<Way> referredWays =
- OsmPrimitive.getFilteredList(n.getReferrers(), Way.class);
+ List<Way> referredWays = n.getParentWays();
Way inTheMiddle = null;
for (Way w: referredWays) {
// Need to look at all nodes see #11184 for a case where node n is
diff --git a/src/org/openstreetmap/josm/actions/UnGlueAction.java b/src/org/openstreetmap/josm/actions/UnGlueAction.java
index af7bbe7..7ac4c11 100644
--- a/src/org/openstreetmap/josm/actions/UnGlueAction.java
+++ b/src/org/openstreetmap/josm/actions/UnGlueAction.java
@@ -95,7 +95,7 @@ public class UnGlueAction extends JosmAction {
if (checkSelectionOneNodeAtMostOneWay(selection)) {
checkAndConfirmOutlyingUnglue();
int count = 0;
- for (Way w : OsmPrimitive.getFilteredList(selectedNode.getReferrers(), Way.class)) {
+ for (Way w : selectedNode.getParentWays()) {
if (!w.isUsable() || w.getNodesCount() < 1) {
continue;
}
@@ -125,7 +125,7 @@ public class UnGlueAction extends JosmAction {
Set<Node> tmpNodes = new HashSet<>();
for (Node n : selectedNodes) {
int count = 0;
- for (Way w : OsmPrimitive.getFilteredList(n.getReferrers(), Way.class)) {
+ for (Way w : n.getParentWays()) {
if (!w.isUsable()) {
continue;
}
@@ -331,7 +331,7 @@ public class UnGlueAction extends JosmAction {
OsmPrimitive n = (OsmPrimitive) selection.toArray()[0];
if (!(n instanceof Node))
return false;
- if (OsmPrimitive.getFilteredList(n.getReferrers(), Way.class).isEmpty())
+ if (((Node) n).getParentWays().isEmpty())
return false;
selectedNode = (Node) n;
@@ -563,7 +563,7 @@ public class UnGlueAction extends JosmAction {
private boolean unglueSelfCrossingWay() {
// According to previous check, only one valid way through that node
Way way = null;
- for (Way w: OsmPrimitive.getFilteredList(selectedNode.getReferrers(), Way.class)) {
+ for (Way w: selectedNode.getParentWays()) {
if (w.isUsable() && w.getNodesCount() >= 1) {
way = w;
}
diff --git a/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java b/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java
index 49c2757..8b1e8a9 100644
--- a/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java
+++ b/src/org/openstreetmap/josm/actions/UnJoinNodeWayAction.java
@@ -151,9 +151,9 @@ public class UnJoinNodeWayAction extends JosmAction {
return null;
// List of ways shared by all nodes
- List<Way> result = new ArrayList<>(OsmPrimitive.getFilteredList(selectedNodes.get(0).getReferrers(), Way.class));
+ List<Way> result = new ArrayList<>(selectedNodes.get(0).getParentWays());
for (int i = 1; i < selectedNodes.size(); i++) {
- List<OsmPrimitive> ref = selectedNodes.get(i).getReferrers();
+ List<Way> ref = selectedNodes.get(i).getParentWays();
result.removeIf(way -> !ref.contains(way));
}
diff --git a/src/org/openstreetmap/josm/actions/UploadAction.java b/src/org/openstreetmap/josm/actions/UploadAction.java
index 60e93cc..fc0d3d2 100644
--- a/src/org/openstreetmap/josm/actions/UploadAction.java
+++ b/src/org/openstreetmap/josm/actions/UploadAction.java
@@ -28,6 +28,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 opens a connection to the osm server and uploads all changes.
@@ -153,7 +154,7 @@ public class UploadAction extends JosmAction {
HelpAwareOptionPane.showOptionDialog(
Main.parent,
tr("<html>The data to be uploaded participates in unresolved conflicts of layer ''{0}''.<br>"
- + "You have to resolve them first.</html>", layer.getName()
+ + "You have to resolve them first.</html>", Utils.escapeReservedCharactersHTML(layer.getName())
),
tr("Warning"),
JOptionPane.WARNING_MESSAGE,
@@ -172,7 +173,7 @@ public class UploadAction extends JosmAction {
tr("You are about to upload data from the layer ''{0}''.<br /><br />"+
"Sending data from this layer is <b>strongly discouraged</b>. If you continue,<br />"+
"it may require you subsequently have to revert your changes, or force other contributors to.<br /><br />"+
- "Are you sure you want to continue?", layer.getName())+
+ "Are you sure you want to continue?", Utils.escapeReservedCharactersHTML(layer.getName()))+
"</html>",
ImageProvider.get("upload"), tr("Ignore this hint and upload anyway"));
}
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java
index 2fbd612..28fb3a0 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmChangeTask.java
@@ -6,7 +6,6 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.Future;
@@ -24,7 +23,6 @@ import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.PrimitiveData;
import org.openstreetmap.josm.data.osm.PrimitiveId;
import org.openstreetmap.josm.data.osm.RelationData;
-import org.openstreetmap.josm.data.osm.RelationMemberData;
import org.openstreetmap.josm.data.osm.WayData;
import org.openstreetmap.josm.data.osm.history.History;
import org.openstreetmap.josm.data.osm.history.HistoryDataSet;
@@ -79,10 +77,18 @@ public class DownloadOsmChangeTask extends DownloadOsmTask {
return Main.worker.submit(downloadTask);
}
+ /**
+ * OsmChange download task.
+ */
protected class DownloadTask extends DownloadOsmTask.DownloadTask {
- public DownloadTask(boolean newLayer, OsmServerReader reader,
- ProgressMonitor progressMonitor) {
+ /**
+ * Constructs a new {@code DownloadTask}.
+ * @param newLayer if {@code true}, force download to a new layer
+ * @param reader OSM data reader
+ * @param progressMonitor progress monitor
+ */
+ public DownloadTask(boolean newLayer, OsmServerReader reader, ProgressMonitor progressMonitor) {
super(newLayer, reader, progressMonitor);
}
@@ -153,15 +159,12 @@ public class DownloadOsmChangeTask extends DownloadOsmTask {
switch (p.getType()) {
case NODE:
- data = new NodeData();
- ((NodeData) data).setCoor(((HistoryNode) hp).getCoords());
+ data = ((HistoryNode) hp).fillPrimitiveData(new NodeData());
break;
case WAY:
- data = new WayData();
- List<Long> nodeIds = ((HistoryWay) hp).getNodes();
- ((WayData) data).setNodes(nodeIds);
+ data = ((HistoryWay) hp).fillPrimitiveData(new WayData());
// Find incomplete nodes to load at next run
- for (Long nodeId : nodeIds) {
+ for (Long nodeId : ((HistoryWay) hp).getNodes()) {
if (p.getDataSet().getPrimitiveById(nodeId, OsmPrimitiveType.NODE) == null) {
Node n = new Node(nodeId);
p.getDataSet().addPrimitive(n);
@@ -170,23 +173,11 @@ public class DownloadOsmChangeTask extends DownloadOsmTask {
}
break;
case RELATION:
- data = new RelationData();
- List<RelationMemberData> members = ((HistoryRelation) hp).getMembers();
- ((RelationData) data).setMembers(members);
+ data = ((HistoryRelation) hp).fillPrimitiveData(new RelationData());
break;
default: throw new AssertionError("Unknown primitive type");
}
- data.setUser(hp.getUser());
- try {
- data.setVisible(hp.isVisible());
- } catch (IllegalStateException e) {
- Main.error(e, "Cannot change visibility for "+p+':');
- }
- data.setTimestamp(hp.getTimestamp());
- data.setKeys(hp.getTags());
- data.setOsmId(hp.getId(), (int) hp.getVersion());
-
// Load the history data
try {
p.load(data);
diff --git a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
index 9b2868a..bcc49d3 100644
--- a/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
+++ b/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java
@@ -7,6 +7,7 @@ import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Optional;
import java.util.Set;
@@ -265,8 +266,7 @@ public class DownloadOsmTask extends AbstractDownloadTask<DataSet> {
// or it is not clear which layer to merge to
//
final OsmDataLayer layer = createNewLayer(newLayerName);
- if (Main.main != null)
- Main.getLayerManager().addLayer(layer, zoomAfterDownload);
+ Main.getLayerManager().addLayer(layer, zoomAfterDownload);
return layer;
}
return null;
@@ -291,13 +291,15 @@ public class DownloadOsmTask extends AbstractDownloadTask<DataSet> {
/**
* Look for primitives deleted on server (thus absent from downloaded data)
* but still present in existing data layer
- * @param b download bounds
+ * @param bounds download bounds
* @param ds existing data set
* @return the primitives to update
*/
- private Collection<OsmPrimitive> searchPrimitivesToUpdate(Bounds b, DataSet ds) {
+ private Collection<OsmPrimitive> searchPrimitivesToUpdate(Bounds bounds, DataSet ds) {
+ if (bounds == null)
+ return Collections.emptySet();
Collection<OsmPrimitive> col = new ArrayList<>();
- ds.searchNodes(b.toBBox()).stream().filter(n -> !n.isNew() && !dataSet.containsNode(n)).forEachOrdered(col::add);
+ ds.searchNodes(bounds.toBBox()).stream().filter(n -> !n.isNew() && !dataSet.containsNode(n)).forEachOrdered(col::add);
if (!col.isEmpty()) {
Set<Way> ways = new HashSet<>();
Set<Relation> rels = new HashSet<>();
diff --git a/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java b/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
index aa0759e..fe55f72 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
@@ -59,7 +59,7 @@ public class DeleteAction extends MapMode implements ModifierListener {
private static final HighlightHelper highlightHelper = new HighlightHelper();
private boolean drawTargetHighlight;
- private enum DeleteMode {
+ enum DeleteMode {
none(/* ICON(cursor/modifier/) */ "delete"),
segment(/* ICON(cursor/modifier/) */ "delete_segment"),
node(/* ICON(cursor/modifier/) */ "delete_node"),
@@ -74,6 +74,10 @@ public class DeleteAction extends MapMode implements ModifierListener {
c = ImageProvider.getCursor("normal", cursorName);
}
+ /**
+ * Returns the mode cursor.
+ * @return the mode cursor
+ */
public Cursor cursor() {
return c;
}
diff --git a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
index b939e7f..d501bdd 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
@@ -1295,6 +1295,12 @@ public class DrawAction extends MapMode implements MapViewPaintable, SelectionCh
}
@Override
+ public Collection<? extends OsmPrimitive> getPreservedPrimitives() {
+ DataSet ds = getLayerManager().getEditDataSet();
+ return ds != null ? ds.getSelected() : null;
+ }
+
+ @Override
public boolean layerIsSupported(Layer l) {
return l instanceof OsmDataLayer;
}
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java b/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
index b6cfae7..61c191c 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
@@ -865,11 +865,7 @@ public class ExtrudeAction extends MapMode implements MapViewPaintable, KeyPress
boolean prevSegmentParallel = Geometry.segmentsParallel(n1en, prevNode.getEastNorth(), n1en, n2en);
boolean nextSegmentParallel = Geometry.segmentsParallel(n2en, nextNode.getEastNorth(), n1en, n2en);
- if (prevSegmentParallel || nextSegmentParallel) {
- return false;
- }
-
- return true;
+ return !prevSegmentParallel && !nextSegmentParallel;
}
/**
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
index 145d6da..bee1b62 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java
@@ -56,7 +56,9 @@ import org.openstreetmap.josm.tools.Shortcut;
public class ImproveWayAccuracyAction extends MapMode implements
SelectionChangedListener, ModifierListener {
- private enum State {
+ private static final String CROSSHAIR = "crosshair";
+
+ enum State {
SELECTING, IMPROVING
}
@@ -75,11 +77,11 @@ public class ImproveWayAccuracyAction extends MapMode implements
private final Cursor cursorSelect = ImageProvider.getCursor("normal", "mode");
private final Cursor cursorSelectHover = ImageProvider.getCursor("hand", "mode");
- private final Cursor cursorImprove = ImageProvider.getCursor("crosshair", null);
- private final Cursor cursorImproveAdd = ImageProvider.getCursor("crosshair", "addnode");
- private final Cursor cursorImproveDelete = ImageProvider.getCursor("crosshair", "delete_node");
- private final Cursor cursorImproveAddLock = ImageProvider.getCursor("crosshair", "add_node_lock");
- private final Cursor cursorImproveLock = ImageProvider.getCursor("crosshair", "lock");
+ private final Cursor cursorImprove = ImageProvider.getCursor(CROSSHAIR, null);
+ private final Cursor cursorImproveAdd = ImageProvider.getCursor(CROSSHAIR, "addnode");
+ private final Cursor cursorImproveDelete = ImageProvider.getCursor(CROSSHAIR, "delete_node");
+ private final Cursor cursorImproveAddLock = ImageProvider.getCursor(CROSSHAIR, "add_node_lock");
+ private final Cursor cursorImproveLock = ImageProvider.getCursor(CROSSHAIR, "lock");
private Color guideColor;
diff --git a/src/org/openstreetmap/josm/actions/mapmode/MapMode.java b/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
index 1cefec3..63ec427 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
@@ -7,11 +7,14 @@ import java.awt.event.InputEvent;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
+import java.util.Collection;
+import java.util.Collections;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.JosmAction;
import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -200,4 +203,13 @@ public abstract class MapMode extends JosmAction implements MouseListener, Mouse
public void preferenceChanged(PreferenceChangeEvent e) {
readPreferences();
}
+
+ /**
+ * Gets a collection of primitives that should not be hidden by the filter.
+ * @return The primitives that the filter should not hide.
+ * @since 11993
+ */
+ public Collection<? extends OsmPrimitive> getPreservedPrimitives() {
+ return Collections.emptySet();
+ }
}
diff --git a/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java b/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
index c477642..701fe58 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/ParallelWayAction.java
@@ -119,7 +119,7 @@ public class ParallelWayAction extends MapMode implements ModifierListener, MapV
// CHECKSTYLE.ON: SingleSpaceSeparator
// @formatter:on
- private enum Mode {
+ enum Mode {
DRAGGING, NORMAL
}
@@ -614,7 +614,7 @@ public class ParallelWayAction extends MapMode implements ModifierListener, MapV
}
}
- private enum Modifier {
+ enum Modifier {
CTRL('c'),
ALT('a'),
SHIFT('s');
diff --git a/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java b/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
index 38136ab..b6ec5f8 100644
--- a/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
+++ b/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java
@@ -67,6 +67,8 @@ import org.openstreetmap.josm.tools.Utils;
*/
public class SelectAction extends MapMode implements ModifierListener, KeyPressReleaseListener, SelectionEnded {
+ private static final String NORMAL = "normal";
+
/**
* Select action mode.
* @since 7543
@@ -83,22 +85,23 @@ public class SelectAction extends MapMode implements ModifierListener, KeyPressR
}
// contains all possible cases the cursor can be in the SelectAction
- private enum SelectActionCursor {
- rect("normal", /* ICON(cursor/modifier/) */ "selection"),
- rect_add("normal", /* ICON(cursor/modifier/) */ "select_add"),
- rect_rm("normal", /* ICON(cursor/modifier/) */ "select_remove"),
- way("normal", /* ICON(cursor/modifier/) */ "select_way"),
- way_add("normal", /* ICON(cursor/modifier/) */ "select_way_add"),
- way_rm("normal", /* ICON(cursor/modifier/) */ "select_way_remove"),
- node("normal", /* ICON(cursor/modifier/) */ "select_node"),
- node_add("normal", /* ICON(cursor/modifier/) */ "select_node_add"),
- node_rm("normal", /* ICON(cursor/modifier/) */ "select_node_remove"),
- virtual_node("normal", /* ICON(cursor/modifier/) */ "addnode"),
- scale(/* ICON(cursor/) */ "scale", null),
- rotate(/* ICON(cursor/) */ "rotate", null),
- merge(/* ICON(cursor/) */ "crosshair", null),
- lasso("normal", /* ICON(cursor/modifier/) */ "rope"),
- merge_to_node("crosshair", /* ICON(cursor/modifier/) */ "joinnode"),
+ enum SelectActionCursor {
+
+ rect(NORMAL, "selection"),
+ rect_add(NORMAL, "select_add"),
+ rect_rm(NORMAL, "select_remove"),
+ way(NORMAL, "select_way"),
+ way_add(NORMAL, "select_way_add"),
+ way_rm(NORMAL, "select_way_remove"),
+ node(NORMAL, "select_node"),
+ node_add(NORMAL, "select_node_add"),
+ node_rm(NORMAL, "select_node_remove"),
+ virtual_node(NORMAL, "addnode"),
+ scale("scale", null),
+ rotate("rotate", null),
+ merge("crosshair", null),
+ lasso(NORMAL, "rope"),
+ merge_to_node("crosshair", "joinnode"),
move(Cursor.MOVE_CURSOR);
private final Cursor c;
@@ -110,6 +113,10 @@ public class SelectAction extends MapMode implements ModifierListener, KeyPressR
c = Cursor.getPredefinedCursor(systemCursor);
}
+ /**
+ * Returns the action cursor.
+ * @return the cursor
+ */
public Cursor cursor() {
return c;
}
diff --git a/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java b/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java
index 955ea39..ff594c0 100644
--- a/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java
+++ b/src/org/openstreetmap/josm/actions/relation/AbstractRelationAction.java
@@ -17,9 +17,14 @@ import org.openstreetmap.josm.tools.SubclassFilteredCollection;
* @since 5793
*/
public abstract class AbstractRelationAction extends AbstractAction implements OsmPrimitiveAction {
+ /** relation collection */
protected transient Collection<Relation> relations = Collections.<Relation>emptySet();
- @SuppressWarnings("unused")
+ /**
+ * Returns the relations contained in the given collection.
+ * @param primitives collection of primitives
+ * @return the relation contained in {@code primitives}
+ */
protected static final Collection<Relation> getRelations(Collection<? extends OsmPrimitive> primitives) {
if (primitives == null || primitives.isEmpty()) {
return Collections.<Relation>emptySet();
@@ -34,6 +39,9 @@ public abstract class AbstractRelationAction extends AbstractAction implements O
updateEnabledState();
}
+ /**
+ * Override in subclasses to update the enabled state of the action when something changes.
+ */
protected void updateEnabledState() {
setEnabled(!relations.isEmpty());
}
diff --git a/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java b/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java
index 5c34097..ff90ab8 100644
--- a/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java
+++ b/src/org/openstreetmap/josm/actions/relation/RecentRelationsAction.java
@@ -32,7 +32,7 @@ import org.openstreetmap.josm.tools.Shortcut;
* Action for accessing recent relations.
* @since 9668
*/
-public class RecentRelationsAction extends JosmAction implements ActionListener, CommandQueueListener {
+public class RecentRelationsAction extends JosmAction implements CommandQueueListener {
private final SideButton editButton;
private final BasicArrowButton arrow;
diff --git a/src/org/openstreetmap/josm/actions/search/SearchAction.java b/src/org/openstreetmap/josm/actions/search/SearchAction.java
index 68144ab..aa0791e 100644
--- a/src/org/openstreetmap/josm/actions/search/SearchAction.java
+++ b/src/org/openstreetmap/josm/actions/search/SearchAction.java
@@ -9,6 +9,7 @@ import static org.openstreetmap.josm.tools.I18n.trn;
import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.FlowLayout;
+import java.awt.GraphicsEnvironment;
import java.awt.GridBagLayout;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
@@ -66,6 +67,9 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
private static final String SEARCH_EXPRESSION = "searchExpression";
+ /**
+ * Search mode.
+ */
public enum SearchMode {
/** replace selection */
replace('R'),
@@ -592,14 +596,18 @@ public class SearchAction extends JosmAction implements ParameterizedAction {
} else {
msg = null;
}
- Main.map.statusLine.setHelpText(msg);
- JOptionPane.showMessageDialog(
- Main.parent,
- msg,
- tr("Warning"),
- JOptionPane.WARNING_MESSAGE
- );
- } else {
+ if (Main.map != null) {
+ Main.map.statusLine.setHelpText(msg);
+ }
+ if (!GraphicsEnvironment.isHeadless()) {
+ JOptionPane.showMessageDialog(
+ Main.parent,
+ msg,
+ tr("Warning"),
+ JOptionPane.WARNING_MESSAGE
+ );
+ }
+ } else if (Main.map != null) {
Main.map.statusLine.setHelpText(tr("Found {0} matches", foundMatches));
}
}
diff --git a/src/org/openstreetmap/josm/actions/search/SearchCompiler.java b/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
index fe75ae3..b3913c9 100644
--- a/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
+++ b/src/org/openstreetmap/josm/actions/search/SearchCompiler.java
@@ -745,7 +745,7 @@ public class SearchCompiler {
*/
public static class ExactKeyValue extends TaggedMatch {
- private enum Mode {
+ enum Mode {
ANY, ANY_KEY, ANY_VALUE, EXACT, NONE, MISSING_KEY,
ANY_KEY_REGEXP, ANY_VALUE_REGEXP, EXACT_REGEXP, MISSING_KEY_REGEXP;
}
@@ -756,6 +756,13 @@ public class SearchCompiler {
private final Pattern valuePattern;
private final Mode mode;
+ /**
+ * Constructs a new {@code ExactKeyValue}.
+ * @param regexp regular expression
+ * @param key key
+ * @param value value
+ * @throws ParseError if a parse error occurs
+ */
public ExactKeyValue(boolean regexp, String key, String value) throws ParseError {
if ("".equals(key))
throw new ParseError(tr("Key cannot be empty when tag operator is used. Sample use: key=value"));
diff --git a/src/org/openstreetmap/josm/actions/upload/FixDataHook.java b/src/org/openstreetmap/josm/actions/upload/FixDataHook.java
index d2ce49d..92634af 100644
--- a/src/org/openstreetmap/josm/actions/upload/FixDataHook.java
+++ b/src/org/openstreetmap/josm/actions/upload/FixDataHook.java
@@ -26,6 +26,8 @@ import org.openstreetmap.josm.data.osm.Tag;
*/
public class FixDataHook implements UploadHook {
+ private static final String ONEWAY = "oneway";
+
/**
* List of checks to run on data
*/
@@ -39,10 +41,10 @@ public class FixDataHook implements UploadHook {
deprecated.add(new FixDataSpace());
deprecated.add(new FixDataKey("color", "colour"));
deprecated.add(new FixDataTag("highway", "ford", "ford", "yes"));
- deprecated.add(new FixDataTag("oneway", "false", "oneway", "no"));
- deprecated.add(new FixDataTag("oneway", "0", "oneway", "no"));
- deprecated.add(new FixDataTag("oneway", "true", "oneway", "yes"));
- deprecated.add(new FixDataTag("oneway", "1", "oneway", "yes"));
+ deprecated.add(new FixDataTag(ONEWAY, "false", ONEWAY, "no"));
+ deprecated.add(new FixDataTag(ONEWAY, "0", ONEWAY, "no"));
+ deprecated.add(new FixDataTag(ONEWAY, "true", ONEWAY, "yes"));
+ deprecated.add(new FixDataTag(ONEWAY, "1", ONEWAY, "yes"));
deprecated.add(new FixDataTag("highway", "stile", "barrier", "stile"));
// CHECKSTYLE.ON: SingleSpaceSeparator
deprecated.add((keys, osm) -> {
diff --git a/src/org/openstreetmap/josm/command/SequenceCommand.java b/src/org/openstreetmap/josm/command/SequenceCommand.java
index 0bd9ba4..536ccf3 100644
--- a/src/org/openstreetmap/josm/command/SequenceCommand.java
+++ b/src/org/openstreetmap/josm/command/SequenceCommand.java
@@ -27,17 +27,28 @@ public class SequenceCommand extends Command {
private boolean sequenceComplete;
private final String name;
/** Determines if the sequence execution should continue after one of its commands fails. */
- public boolean continueOnError;
+ protected final boolean continueOnError;
/**
* Create the command by specifying the list of commands to execute.
* @param name The description text
- * @param sequenz The sequence that should be executed.
+ * @param sequenz The sequence that should be executed
+ * @param continueOnError Determines if the sequence execution should continue after one of its commands fails
+ * @since 11874
*/
- public SequenceCommand(String name, Collection<Command> sequenz) {
- super();
+ public SequenceCommand(String name, Collection<Command> sequenz, boolean continueOnError) {
this.name = name;
this.sequence = sequenz.toArray(new Command[sequenz.size()]);
+ this.continueOnError = continueOnError;
+ }
+
+ /**
+ * Create the command by specifying the list of commands to execute.
+ * @param name The description text
+ * @param sequenz The sequence that should be executed.
+ */
+ public SequenceCommand(String name, Collection<Command> sequenz) {
+ this(name, sequenz, false);
}
/**
diff --git a/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java b/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java
index 99f8248..5c07adb 100644
--- a/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java
+++ b/src/org/openstreetmap/josm/command/conflict/ConflictAddCommand.java
@@ -16,6 +16,7 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.gui.DefaultNameFormatter;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
/**
* Command used to add a new conflict.
@@ -40,8 +41,8 @@ public class ConflictAddCommand extends Command {
tr("<html>Layer ''{0}'' already has a conflict for object<br>"
+ "''{1}''.<br>"
+ "This conflict cannot be added.</html>",
- getLayer().getName(),
- conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
+ Utils.escapeReservedCharactersHTML(getLayer().getName()),
+ Utils.escapeReservedCharactersHTML(conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance()))
),
tr("Double conflict"),
JOptionPane.ERROR_MESSAGE
diff --git a/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java b/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java
index 110ccb8..b1a6ce9 100644
--- a/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java
+++ b/src/org/openstreetmap/josm/corrector/ReverseWayNoTagCorrector.java
@@ -85,7 +85,7 @@ public final class ReverseWayNoTagCorrector {
+ "<br/> whose semantic meaning of these tags are defined by its direction:<br/>{1}"
+ "Do you really want to change the way direction, thus its semantic meaning?</html>",
tags.size(),
- way.getDisplayName(DefaultNameFormatter.getInstance()),
+ Utils.escapeReservedCharactersHTML(way.getDisplayName(DefaultNameFormatter.getInstance())),
Utils.joinAsHtmlUnorderedList(tags)
);
int ret = ConditionalOptionPaneUtil.showOptionDialog(
diff --git a/src/org/openstreetmap/josm/data/AutosaveTask.java b/src/org/openstreetmap/josm/data/AutosaveTask.java
index 1a4a999..a9f3587 100644
--- a/src/org/openstreetmap/josm/data/AutosaveTask.java
+++ b/src/org/openstreetmap/josm/data/AutosaveTask.java
@@ -132,7 +132,7 @@ public class AutosaveTask extends TimerTask implements LayerChangeListener, List
}
new Timer(true).schedule(this, TimeUnit.SECONDS.toMillis(1), TimeUnit.SECONDS.toMillis(PROP_INTERVAL.get()));
- Main.getLayerManager().addLayerChangeListener(this, true);
+ Main.getLayerManager().addAndFireLayerChangeListener(this);
}
}
diff --git a/src/org/openstreetmap/josm/data/Preferences.java b/src/org/openstreetmap/josm/data/Preferences.java
index ebf17d1..23db172 100644
--- a/src/org/openstreetmap/josm/data/Preferences.java
+++ b/src/org/openstreetmap/josm/data/Preferences.java
@@ -105,6 +105,8 @@ import org.xml.sax.SAXException;
*/
public class Preferences {
+ private static final String COLOR_PREFIX = "color.";
+
private static final String[] OBSOLETE_PREF_KEYS = {
"hdop.factor", /* remove entry after April 2017 */
"imagery.layers.addedIds" /* remove entry after June 2017 */
@@ -500,7 +502,7 @@ public class Preferences {
public synchronized Map<String, String> getAllColors() {
final Map<String, String> all = new TreeMap<>();
for (final Entry<String, Setting<?>> e : defaultsMap.entrySet()) {
- if (e.getKey().startsWith("color.") && e.getValue() instanceof StringSetting) {
+ if (e.getKey().startsWith(COLOR_PREFIX) && e.getValue() instanceof StringSetting) {
StringSetting d = (StringSetting) e.getValue();
if (d.getValue() != null) {
all.put(e.getKey().substring(6), d.getValue());
@@ -508,7 +510,7 @@ public class Preferences {
}
}
for (final Entry<String, Setting<?>> e : settingsMap.entrySet()) {
- if (e.getKey().startsWith("color.") && (e.getValue() instanceof StringSetting)) {
+ if (e.getKey().startsWith(COLOR_PREFIX) && (e.getValue() instanceof StringSetting)) {
all.put(e.getKey().substring(6), ((StringSetting) e.getValue()).getValue());
}
}
@@ -863,7 +865,7 @@ public class Preferences {
public synchronized Color getColor(String colName, String specName, Color def) {
String colKey = ColorProperty.getColorKey(colName);
registerColor(colKey, colName);
- String colStr = specName != null ? get("color."+specName) : "";
+ String colStr = specName != null ? get(COLOR_PREFIX+specName) : "";
if (colStr.isEmpty()) {
colStr = get(colKey, ColorHelper.color2html(def, true));
}
@@ -887,13 +889,13 @@ public class Preferences {
}
public synchronized Color getDefaultColor(String colKey) {
- StringSetting col = Utils.cast(defaultsMap.get("color."+colKey), StringSetting.class);
+ StringSetting col = Utils.cast(defaultsMap.get(COLOR_PREFIX+colKey), StringSetting.class);
String colStr = col == null ? null : col.getValue();
return colStr == null || colStr.isEmpty() ? null : ColorHelper.html2color(colStr);
}
public synchronized boolean putColor(String colKey, Color val) {
- return put("color."+colKey, val != null ? ColorHelper.color2html(val, true) : null);
+ return put(COLOR_PREFIX+colKey, val != null ? ColorHelper.color2html(val, true) : null);
}
public synchronized int getInteger(String key, int def) {
@@ -1531,9 +1533,9 @@ public class Preferences {
private void migrateOldColorKeys() {
settingsMap.keySet().stream()
- .filter(key -> key.startsWith("color."))
+ .filter(key -> key.startsWith(COLOR_PREFIX))
.flatMap(key -> {
- final String newKey = ColorProperty.getColorKey(key.substring("color.".length()));
+ final String newKey = ColorProperty.getColorKey(key.substring(COLOR_PREFIX.length()));
return key.equals(newKey) || settingsMap.containsKey(newKey)
? Stream.empty()
: Stream.of(new AbstractMap.SimpleImmutableEntry<>(key, newKey));
diff --git a/src/org/openstreetmap/josm/data/Version.java b/src/org/openstreetmap/josm/data/Version.java
index 5ed9cc9..03f24bc 100644
--- a/src/org/openstreetmap/josm/data/Version.java
+++ b/src/org/openstreetmap/josm/data/Version.java
@@ -6,6 +6,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.IOException;
import java.io.InputStream;
import java.util.Map.Entry;
+import java.util.Optional;
import java.util.Properties;
import org.openstreetmap.josm.Main;
@@ -13,7 +14,7 @@ import org.openstreetmap.josm.tools.LanguageInfo;
/**
* Provides basic information about the currently used JOSM build.
- *
+ * @since 2358
*/
public class Version {
/** constant to indicate that the current build isn't assigned a JOSM version number */
@@ -60,9 +61,8 @@ public class Version {
} catch (IOException e) {
Main.warn(e, tr("Error reading revision info from revision file: {0}", e.getMessage()));
}
- String value = properties.getProperty("Revision");
- if (value != null) {
- value = value.trim();
+ String value = Optional.ofNullable(properties.getProperty("Revision")).orElse("").trim();
+ if (!value.isEmpty()) {
try {
version = Integer.parseInt(value);
} catch (NumberFormatException e) {
@@ -82,19 +82,12 @@ public class Version {
// is this a local build ?
//
- isLocalBuild = false;
- value = properties.getProperty("Is-Local-Build");
- if (value != null && "true".equalsIgnoreCase(value.trim())) {
- isLocalBuild = true;
- }
+ isLocalBuild = "true".equalsIgnoreCase(
+ Optional.ofNullable(properties.getProperty("Is-Local-Build")).orElse("").trim());
// is this a specific build ?
//
- buildName = null;
- value = properties.getProperty("Build-Name");
- if (value != null && !value.trim().isEmpty()) {
- buildName = value.trim();
- }
+ buildName = Optional.ofNullable(properties.getProperty("Build-Name")).orElse("").trim();
// the revision info
//
@@ -184,7 +177,7 @@ public class Version {
public String getAgentString(boolean includeOsDetails) {
int v = getVersion();
String s = (v == JOSM_UNKNOWN_VERSION) ? "UNKNOWN" : Integer.toString(v);
- if (buildName != null) {
+ if (buildName != null && !buildName.isEmpty()) {
s += ' ' + buildName;
}
if (isLocalBuild() && v != JOSM_UNKNOWN_VERSION) {
diff --git a/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java b/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
index e4b85dd..1314c0d 100644
--- a/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
+++ b/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java
@@ -317,6 +317,7 @@ public abstract class JCSCachedTileLoaderJob<K, V extends CacheEntry> implements
return true;
}
+ LOG.log(Level.FINE, "JCS - starting HttpClient GET request for URL: {0}", getUrl());
final HttpClient request = getRequest("GET", true);
if (isObjectLoadable() &&
@@ -423,10 +424,7 @@ public abstract class JCSCachedTileLoaderJob<K, V extends CacheEntry> implements
* @return true if object should be cached and returned to listener
*/
protected boolean isResponseLoadable(Map<String, List<String>> headerFields, int responseCode, byte[] raw) {
- if (raw == null || raw.length == 0 || responseCode >= 400) {
- return false;
- }
- return true;
+ return raw != null && raw.length != 0 && responseCode < 400;
}
protected abstract V createCacheEntry(byte[] content);
diff --git a/src/org/openstreetmap/josm/data/coor/EastNorth.java b/src/org/openstreetmap/josm/data/coor/EastNorth.java
index 0a6415a..6a1e942 100644
--- a/src/org/openstreetmap/josm/data/coor/EastNorth.java
+++ b/src/org/openstreetmap/josm/data/coor/EastNorth.java
@@ -1,6 +1,9 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.coor;
+import org.openstreetmap.gui.jmapviewer.Projected;
+import org.openstreetmap.gui.jmapviewer.interfaces.IProjected;
+
/**
* Northing, Easting of the projected coordinates.
*
@@ -22,6 +25,14 @@ public class EastNorth extends Coordinate {
}
/**
+ * Constructs a new {@code EastNorth} from {@link IProjected}.
+ * @param p projected coordinates
+ */
+ public EastNorth(IProjected p) {
+ super(p.getEast(), p.getNorth());
+ }
+
+ /**
* Returns easting.
* @return easting
*/
@@ -170,6 +181,10 @@ public class EastNorth extends Coordinate {
return new EastNorth(nx, ny);
}
+ public IProjected toProjected() {
+ return new Projected(east(), north());
+ }
+
@Override
public String toString() {
return "EastNorth[e="+x+", n="+y+']';
diff --git a/src/org/openstreetmap/josm/data/gpx/WayPoint.java b/src/org/openstreetmap/josm/data/gpx/WayPoint.java
index f667e6b..54f1abf 100644
--- a/src/org/openstreetmap/josm/data/gpx/WayPoint.java
+++ b/src/org/openstreetmap/josm/data/gpx/WayPoint.java
@@ -25,6 +25,10 @@ public class WayPoint extends WithAttributes implements Comparable<WayPoint>, Te
public boolean drawLine;
public int dir;
+ /**
+ * Constructs a new {@code WayPoint} from an existing one.
+ * @param p existing waypoint
+ */
public WayPoint(WayPoint p) {
attr.putAll(p.attr);
lat = p.lat;
@@ -37,6 +41,10 @@ public class WayPoint extends WithAttributes implements Comparable<WayPoint>, Te
dir = p.dir;
}
+ /**
+ * Constructs a new {@code WayPoint} from lat/lon coordinates.
+ * @param ll lat/lon coordinates
+ */
public WayPoint(LatLon ll) {
lat = ll.lat();
lon = ll.lon();
@@ -63,6 +71,10 @@ public class WayPoint extends WithAttributes implements Comparable<WayPoint>, Te
this.north = Double.NaN;
}
+ /**
+ * Returns the waypoint coordinates.
+ * @return the waypoint coordinates
+ */
public final LatLon getCoor() {
return new LatLon(lat, lon);
}
@@ -137,6 +149,10 @@ public class WayPoint extends WithAttributes implements Comparable<WayPoint>, Te
return Double.compare(time, w.time);
}
+ /**
+ * Returns the waypoint time.
+ * @return the waypoint time
+ */
public Date getTime() {
return new Date((long) (time * 1000));
}
@@ -176,17 +192,11 @@ public class WayPoint extends WithAttributes implements Comparable<WayPoint>, Te
public boolean equals(Object obj) {
if (this == obj)
return true;
- if (!super.equals(obj))
- return false;
- if (getClass() != obj.getClass())
+ if (obj == null || !super.equals(obj) || getClass() != obj.getClass())
return false;
WayPoint other = (WayPoint) obj;
- if (Double.doubleToLongBits(lat) != Double.doubleToLongBits(other.lat))
- return false;
- if (Double.doubleToLongBits(lon) != Double.doubleToLongBits(other.lon))
- return false;
- if (Double.doubleToLongBits(time) != Double.doubleToLongBits(other.time))
- return false;
- return true;
+ return Double.doubleToLongBits(lat) == Double.doubleToLongBits(other.lat)
+ && Double.doubleToLongBits(lon) == Double.doubleToLongBits(other.lon)
+ && Double.doubleToLongBits(time) == Double.doubleToLongBits(other.time);
}
}
diff --git a/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java b/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java
index cbc5723..df2162f 100644
--- a/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java
+++ b/src/org/openstreetmap/josm/data/imagery/AbstractWMSTileSource.java
@@ -3,12 +3,13 @@ package org.openstreetmap.josm.data.imagery;
import java.awt.Point;
+import org.openstreetmap.gui.jmapviewer.Projected;
import org.openstreetmap.gui.jmapviewer.Tile;
import org.openstreetmap.gui.jmapviewer.TileXY;
import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
+import org.openstreetmap.gui.jmapviewer.interfaces.IProjected;
import org.openstreetmap.gui.jmapviewer.tilesources.TMSTileSource;
import org.openstreetmap.gui.jmapviewer.tilesources.TileSourceInfo;
-import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.ProjectionBounds;
import org.openstreetmap.josm.data.coor.EastNorth;
@@ -29,13 +30,16 @@ public abstract class AbstractWMSTileSource extends TMSTileSource {
private int[] tileYMax;
private double[] degreesPerTile;
private static final float SCALE_DENOMINATOR_ZOOM_LEVEL_1 = 559082264.0287178f;
+ private Projection tileProjection;
/**
* Constructs a new {@code AbstractWMSTileSource}.
* @param info tile source info
+ * @param tileProjection the tile projection
*/
- public AbstractWMSTileSource(TileSourceInfo info) {
+ public AbstractWMSTileSource(TileSourceInfo info, Projection tileProjection) {
super(info);
+ this.tileProjection = tileProjection;
}
private void initAnchorPosition(Projection proj) {
@@ -45,11 +49,20 @@ public abstract class AbstractWMSTileSource extends TMSTileSource {
this.anchorPosition = new EastNorth(min.east(), max.north());
}
+ public void setTileProjection(Projection tileProjection) {
+ this.tileProjection = tileProjection;
+ initProjection();
+ }
+
+ public Projection getTileProjection() {
+ return this.tileProjection;
+ }
+
/**
* Initializes class with current projection in JOSM. This call is needed every time projection changes.
*/
public void initProjection() {
- initProjection(Main.getProjection());
+ initProjection(this.tileProjection);
}
/**
@@ -96,7 +109,7 @@ public abstract class AbstractWMSTileSource extends TMSTileSource {
@Override
public ICoordinate tileXYToLatLon(int x, int y, int zoom) {
- return Main.getProjection().eastNorth2latlon(getTileEastNorth(x, y, zoom)).toCoordinate();
+ return tileProjection.eastNorth2latlon(getTileEastNorth(x, y, zoom)).toCoordinate();
}
private TileXY eastNorthToTileXY(EastNorth enPoint, int zoom) {
@@ -109,7 +122,7 @@ public abstract class AbstractWMSTileSource extends TMSTileSource {
@Override
public TileXY latLonToTileXY(double lat, double lon, int zoom) {
- EastNorth enPoint = Main.getProjection().latlon2eastNorth(new LatLon(lat, lon));
+ EastNorth enPoint = tileProjection.latlon2eastNorth(new LatLon(lat, lon));
return eastNorthToTileXY(enPoint, zoom);
}
@@ -141,7 +154,7 @@ public abstract class AbstractWMSTileSource extends TMSTileSource {
@Override
public Point latLonToXY(double lat, double lon, int zoom) {
double scale = getDegreesPerTile(zoom) / getTileSize();
- EastNorth point = Main.getProjection().latlon2eastNorth(new LatLon(lat, lon));
+ EastNorth point = tileProjection.latlon2eastNorth(new LatLon(lat, lon));
return new Point(
(int) Math.round((point.east() - anchorPosition.east()) / scale),
(int) Math.round((anchorPosition.north() - point.north()) / scale)
@@ -161,12 +174,11 @@ public abstract class AbstractWMSTileSource extends TMSTileSource {
@Override
public ICoordinate xyToLatLon(int x, int y, int zoom) {
double scale = getDegreesPerTile(zoom) / getTileSize();
- Projection proj = Main.getProjection();
EastNorth ret = new EastNorth(
anchorPosition.east() + x * scale,
anchorPosition.north() - y * scale
);
- return proj.eastNorth2latlon(ret).toCoordinate();
+ return tileProjection.eastNorth2latlon(ret).toCoordinate();
}
protected EastNorth getTileEastNorth(int x, int y, int z) {
@@ -181,4 +193,19 @@ public abstract class AbstractWMSTileSource extends TMSTileSource {
return degreesPerTile[zoom];
}
+ @Override
+ public IProjected tileXYtoProjected(int x, int y, int zoom) {
+ EastNorth en = getTileEastNorth(x, y, zoom);
+ return new Projected(en.east(), en.north());
+ }
+
+ @Override
+ public TileXY projectedToTileXY(IProjected p, int zoom) {
+ return eastNorthToTileXY(new EastNorth(p.getEast(), p.getNorth()), zoom);
+ }
+
+ @Override
+ public String getServerCRS() {
+ return this.tileProjection.toCode();
+ }
}
diff --git a/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java b/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java
index 9c6141e..5efdfcd 100644
--- a/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java
+++ b/src/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelper.java
@@ -14,7 +14,7 @@ import org.openstreetmap.josm.tools.Utils;
/**
* Helper class for handling OGC GetCapabilities documents
- *
+ * @since 10993
*/
public final class GetCapabilitiesParseHelper {
enum TransferMode {
diff --git a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
index f7b69b0..0d009cf 100644
--- a/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
+++ b/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java
@@ -34,6 +34,7 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.LanguageInfo;
import org.openstreetmap.josm.tools.MultiMap;
+import org.openstreetmap.josm.tools.Utils;
/**
* Class that stores info about an image background layer.
@@ -173,7 +174,9 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
private String langDescription;
/** Text of a text attribution displayed when using the imagery */
private String attributionText;
- /** Link behing the text attribution displayed when using the imagery */
+ /** Link to a reference stating the permission for OSM usage */
+ private String permissionReferenceURL;
+ /** Link behind the text attribution displayed when using the imagery */
private String attributionLinkURL;
/** Image of a graphical attribution displayed when using the imagery */
private String attributionImage;
@@ -202,8 +205,6 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
private String icon;
/** is the geo reference correct - don't offer offset handling */
private boolean isGeoreferenceValid;
- /** does the EPSG:4326 to mercator woraround work as expected */
- private boolean isEpsg4326To3857Supported;
/** which layers should be activated by default on layer addition. **/
private Collection<DefaultLayer> defaultLayers = Collections.emptyList();
// when adding a field, also adapt the ImageryInfo(ImageryInfo)
@@ -222,6 +223,7 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
@pref String eula;
@pref String attribution_text;
@pref String attribution_url;
+ @pref String permission_reference_url;
@pref String logo_image;
@pref String logo_url;
@pref String terms_of_use_text;
@@ -242,7 +244,6 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
@pref Map<String, String> metadataHeaders;
@pref boolean valid_georeference;
@pref boolean bestMarked;
- @pref boolean supports_epsg_4326_to_3857_conversion;
// TODO: disabled until change of layers is implemented
// @pref String default_layers;
@@ -266,6 +267,7 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
eula = i.eulaAcceptanceRequired;
attribution_text = i.attributionText;
attribution_url = i.attributionLinkURL;
+ permission_reference_url = i.permissionReferenceURL;
date = i.date;
bestMarked = i.bestMarked;
logo_image = i.attributionImage;
@@ -307,7 +309,6 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
tileSize = i.getTileSize();
valid_georeference = i.isGeoreferenceValid();
- supports_epsg_4326_to_3857_conversion = i.isEpsg4326To3857Supported();
// TODO disabled until change of layers is implemented
// default_layers = i.defaultLayers.stream().collect(Collectors.joining(","));
}
@@ -377,11 +378,21 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
this.eulaAcceptanceRequired = eulaAcceptanceRequired;
if (t != null) {
this.imageryType = t;
- } else if (type != null && !type.trim().isEmpty()) {
+ } else if (type != null && !type.isEmpty()) {
throw new IllegalArgumentException("unknown type: "+type);
}
}
+ /**
+ * Constructs a new {@code ImageryInfo} with given name, url, id, extended and EULA URLs.
+ * @param name The entry name
+ * @param url The entry URL
+ * @param type The entry imagery type. If null, WMS will be used as default
+ * @param eulaAcceptanceRequired The EULA URL
+ * @param cookies The data part of HTTP cookies header in case the service requires cookies to work
+ * @param id tile id
+ * @throws IllegalArgumentException if type refers to an unknown imagery type
+ */
public ImageryInfo(String name, String url, String type, String eulaAcceptanceRequired, String cookies, String id) {
this(name, url, type, eulaAcceptanceRequired, cookies);
setId(id);
@@ -421,6 +432,7 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
}
attributionText = e.attribution_text;
attributionLinkURL = e.attribution_url;
+ permissionReferenceURL = e.permission_reference_url;
attributionImage = e.logo_image;
attributionImageURL = e.logo_url;
date = e.date;
@@ -437,7 +449,6 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
}
setTileSize(e.tileSize);
metadataHeaders = e.metadataHeaders;
- isEpsg4326To3857Supported = e.supports_epsg_4326_to_3857_conversion;
isGeoreferenceValid = e.valid_georeference;
// TODO disabled until change of layers is implemented
// defaultLayers = Arrays.asList(e.default_layers.split(","));
@@ -463,6 +474,7 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
this.serverProjections = i.serverProjections;
this.attributionText = i.attributionText;
this.attributionLinkURL = i.attributionLinkURL;
+ this.permissionReferenceURL = i.permissionReferenceURL;
this.attributionImage = i.attributionImage;
this.attributionImageURL = i.attributionImageURL;
this.termsOfUseText = i.termsOfUseText;
@@ -474,7 +486,6 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
this.noTileHeaders = i.noTileHeaders;
this.noTileChecksums = i.noTileChecksums;
this.metadataHeaders = i.metadataHeaders;
- this.isEpsg4326To3857Supported = i.isEpsg4326To3857Supported;
this.isGeoreferenceValid = i.isGeoreferenceValid;
this.defaultLayers = i.defaultLayers;
}
@@ -504,7 +515,6 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
Objects.equals(this.id, other.id) &&
Objects.equals(this.url, other.url) &&
Objects.equals(this.bestMarked, other.bestMarked) &&
- Objects.equals(this.isEpsg4326To3857Supported, other.isEpsg4326To3857Supported) &&
Objects.equals(this.isGeoreferenceValid, other.isGeoreferenceValid) &&
Objects.equals(this.cookies, other.cookies) &&
Objects.equals(this.eulaAcceptanceRequired, other.eulaAcceptanceRequired) &&
@@ -515,6 +525,7 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
Objects.equals(this.serverProjections, other.serverProjections) &&
Objects.equals(this.attributionText, other.attributionText) &&
Objects.equals(this.attributionLinkURL, other.attributionLinkURL) &&
+ Objects.equals(this.permissionReferenceURL, other.permissionReferenceURL) &&
Objects.equals(this.attributionImageURL, other.attributionImageURL) &&
Objects.equals(this.attributionImage, other.attributionImage) &&
Objects.equals(this.termsOfUseText, other.termsOfUseText) &&
@@ -563,6 +574,11 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
return i;
}
+ /**
+ * Determines if URL is equal to given imagery info.
+ * @param in imagery info
+ * @return {@code true} if URL is equal to given imagery info
+ */
public boolean equalsBaseValues(ImageryInfo in) {
return url.equals(in.url);
}
@@ -623,6 +639,16 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
return attributionLinkURL;
}
+ /**
+ * Return the permission reference URL.
+ * @return The url
+ * @see #setPermissionReferenceURL
+ * @since 11975
+ */
+ public String getPermissionReferenceURL() {
+ return permissionReferenceURL;
+ }
+
@Override
public Image getAttributionImage() {
ImageIcon i = ImageProvider.getIfAvailable(attributionImage);
@@ -684,6 +710,16 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
}
/**
+ * Sets the permission reference URL.
+ * @param url The url.
+ * @see #getPermissionReferenceURL()
+ * @since 11975
+ */
+ public void setPermissionReferenceURL(String url) {
+ permissionReferenceURL = url;
+ }
+
+ /**
* Sets the text to display to the user as terms of use.
* @param text The text
* @see #getTermsOfUseText()
@@ -871,7 +907,7 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
}
String desc = getDescription();
if (desc != null && !desc.isEmpty()) {
- res.append("<br>").append(desc);
+ res.append("<br>").append(Utils.escapeReservedCharactersHTML(desc));
html = true;
}
if (html) {
@@ -1142,22 +1178,6 @@ public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInf
}
/**
- * Gets the flag if epsg 4326 to 3857 is supported
- * @return The flag.
- */
- public boolean isEpsg4326To3857Supported() {
- return isEpsg4326To3857Supported;
- }
-
- /**
- * Sets the flag that epsg 4326 to 3857 is supported
- * @param isEpsg4326To3857Supported The flag.
- */
- public void setEpsg4326To3857Supported(boolean isEpsg4326To3857Supported) {
- this.isEpsg4326To3857Supported = isEpsg4326To3857Supported;
- }
-
- /**
* Gets the flag if the georeference is valid.
* @return <code>true</code> if it is valid.
*/
diff --git a/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java b/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java
index fa78c6f..bfd35c4 100644
--- a/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java
+++ b/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java
@@ -45,7 +45,7 @@ public class TMSCachedTileLoaderJob extends JCSCachedTileLoaderJob<String, Buffe
private static final Logger LOG = FeatureAdapter.getLogger(TMSCachedTileLoaderJob.class.getCanonicalName());
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;
+ protected final Tile tile;
private volatile URL url;
// we need another deduplication of Tile Loader listeners, as for each submit, new TMSCachedTileLoaderJob was created
@@ -82,11 +82,6 @@ public class TMSCachedTileLoaderJob extends JCSCachedTileLoaderJob<String, Buffe
}
@Override
- public Tile getTile() {
- return getCachedTile();
- }
-
- @Override
public String getCacheKey() {
if (tile != null) {
TileSource tileSource = tile.getTileSource();
@@ -261,53 +256,6 @@ public class TMSCachedTileLoaderJob extends JCSCachedTileLoaderJob<String, Buffe
return ret;
}
- /**
- * Method for getting the tile from cache only, without trying to reach remote resource
- * @return tile or null, if nothing (useful) was found in cache
- */
- public Tile getCachedTile() {
- BufferedImageCacheEntry data = get();
- if (isObjectLoadable() && isCacheElementValid()) {
- try {
- // set tile metadata
- if (this.attributes != null) {
- for (Entry<String, String> e: this.attributes.getMetadata().entrySet()) {
- tile.putValue(e.getKey(), e.getValue());
- }
- }
-
- if (data != null) {
- if (data.getImage() != null) {
- tile.setImage(data.getImage());
- tile.finishLoading();
- } else {
- // we had some data, but we didn't get any image. Malformed image?
- tile.setError(tr("Could not load image from tile server"));
- }
- }
- if (isNoTileAtZoom()) {
- handleNoTileAtZoom();
- tile.finishLoading();
- }
- if (attributes != null && attributes.getResponseCode() >= 400) {
- if (attributes.getErrorMessage() == null) {
- tile.setError(tr("HTTP error {0} when loading tiles", attributes.getResponseCode()));
- } else {
- tile.setError(tr("Error downloading tiles: {0}", attributes.getErrorMessage()));
- }
- }
- return tile;
- } catch (IOException e) {
- LOG.log(Level.WARNING, "JCS TMS - error loading object for tile {0}: {1}", new Object[] {tile.getKey(), e.getMessage()});
- Main.warn(e);
- return null;
- }
-
- } else {
- return tile;
- }
- }
-
private boolean handleNoTileAtZoom() {
if (isNoTileAtZoom()) {
LOG.log(Level.FINE, "JCS TMS - Tile valid, but no file, as no tiles at this level {0}", tile);
diff --git a/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java b/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java
index e227371..c3e43a7 100644
--- a/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java
+++ b/src/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSource.java
@@ -17,7 +17,7 @@ import java.util.regex.Pattern;
import org.openstreetmap.gui.jmapviewer.interfaces.TemplatedTileSource;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.Projection;
import org.openstreetmap.josm.gui.layer.WMSLayer;
import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -53,9 +53,10 @@ public class TemplatedWMSTileSource extends AbstractWMSTileSource implements Tem
/**
* Creates a tile source based on imagery info
* @param info imagery info
+ * @param tileProjection the tile projection
*/
- public TemplatedWMSTileSource(ImageryInfo info) {
- super(info);
+ public TemplatedWMSTileSource(ImageryInfo info, Projection tileProjection) {
+ super(info, tileProjection);
this.serverProjections = new TreeSet<>(info.getServerProjections());
handleTemplate();
initProjection();
@@ -68,7 +69,7 @@ public class TemplatedWMSTileSource extends AbstractWMSTileSource implements Tem
@Override
public String getTileUrl(int zoom, int tilex, int tiley) {
- String myProjCode = Main.getProjection().toCode();
+ String myProjCode = getServerCRS();
EastNorth nw = getTileEastNorth(tilex, tiley, zoom);
EastNorth se = getTileEastNorth(tilex + 1, tiley + 1, zoom);
@@ -79,16 +80,6 @@ public class TemplatedWMSTileSource extends AbstractWMSTileSource implements Tem
double s = se.getY();
double e = se.getX();
- if (!serverProjections.contains(myProjCode) && serverProjections.contains("EPSG:4326") && "EPSG:3857".equals(myProjCode)) {
- LatLon swll = Main.getProjection().eastNorth2latlon(new EastNorth(w, s));
- LatLon nell = Main.getProjection().eastNorth2latlon(new EastNorth(e, n));
- myProjCode = "EPSG:4326";
- s = swll.lat();
- w = swll.lon();
- n = nell.lat();
- e = nell.lon();
- }
-
if ("EPSG:4326".equals(myProjCode) && !serverProjections.contains(myProjCode) && serverProjections.contains("CRS:84")) {
myProjCode = "CRS:84";
}
diff --git a/src/org/openstreetmap/josm/data/imagery/WMSCachedTileLoaderJob.java b/src/org/openstreetmap/josm/data/imagery/WMSCachedTileLoaderJob.java
index 76fb7e1..b8920cb 100644
--- a/src/org/openstreetmap/josm/data/imagery/WMSCachedTileLoaderJob.java
+++ b/src/org/openstreetmap/josm/data/imagery/WMSCachedTileLoaderJob.java
@@ -7,7 +7,6 @@ import java.util.concurrent.ThreadPoolExecutor;
import org.apache.commons.jcs.access.behavior.ICacheAccess;
import org.openstreetmap.gui.jmapviewer.Tile;
import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
-import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
/**
@@ -39,7 +38,7 @@ public class WMSCachedTileLoaderJob extends TMSCachedTileLoaderJob {
// include projection in cache key, as with different projections different response will be returned from server
String key = super.getCacheKey();
if (key != null) {
- return key + Main.getProjection().toCode();
+ return key + tile.getSource().getServerCRS();
}
return null;
}
diff --git a/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java b/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
index 8db8d27..39739d5 100644
--- a/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
+++ b/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java
@@ -13,13 +13,12 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Optional;
-import java.util.Set;
import java.util.SortedSet;
import java.util.Stack;
import java.util.TreeSet;
@@ -39,12 +38,16 @@ import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import org.openstreetmap.gui.jmapviewer.Coordinate;
+import org.openstreetmap.gui.jmapviewer.Projected;
import org.openstreetmap.gui.jmapviewer.Tile;
+import org.openstreetmap.gui.jmapviewer.TileRange;
import org.openstreetmap.gui.jmapviewer.TileXY;
import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
+import org.openstreetmap.gui.jmapviewer.interfaces.IProjected;
import org.openstreetmap.gui.jmapviewer.interfaces.TemplatedTileSource;
import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTMSTileSource;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.ProjectionBounds;
import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.projection.Projection;
@@ -57,7 +60,7 @@ import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.Utils;
/**
- * Tile Source handling WMS providers
+ * Tile Source handling WMTS providers
*
* @author Wiktor Niesiobędzki
* @since 8526
@@ -264,6 +267,8 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
private final WMTSDefaultLayer defaultLayer;
+ private Projection tileProjection;
+
/**
* Creates a tile source based on imagery info
* @param info imagery info
@@ -276,7 +281,22 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
this.baseUrl = GetCapabilitiesParseHelper.normalizeCapabilitiesUrl(handleTemplate(info.getUrl()));
this.layers = getCapabilities();
- this.defaultLayer = info.getDefaultLayers().isEmpty() ? null : (WMTSDefaultLayer) info.getDefaultLayers().iterator().next();
+ if (info.getDefaultLayers().isEmpty()) {
+ Main.warn(tr("No default layer selected, choosing first layer."));
+ if (!layers.isEmpty()) {
+ Layer first = layers.iterator().next();
+ this.defaultLayer = new WMTSDefaultLayer(first.identifier, first.tileMatrixSet.identifier);
+ } else {
+ this.defaultLayer = null;
+ }
+ } else {
+ DefaultLayer defLayer = info.getDefaultLayers().iterator().next();
+ if (defLayer instanceof WMTSDefaultLayer) {
+ this.defaultLayer = (WMTSDefaultLayer) defLayer;
+ } else {
+ this.defaultLayer = null;
+ }
+ }
if (this.layers.isEmpty())
throw new IllegalArgumentException(tr("No layers defined by getCapabilities document: {0}", info.getUrl()));
}
@@ -593,36 +613,45 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
* @param proj projection to be used by this TileSource
*/
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 ? new WMTSDefaultLayer(currentLayer.identifier, currentLayer.tileMatrixSet.identifier) : defaultLayer,
- proj.toCode());
-
- if (candidates.size() > 1 && defaultLayer != null) {
- candidates = candidates.stream()
- .filter(t -> t.tileMatrixSet.identifier.equals(defaultLayer.getTileMatrixSet()))
- .collect(Collectors.toList());
- }
- if (candidates.size() == 1) {
- Layer newLayer = candidates.iterator().next();
- if (newLayer != null) {
- this.currentTileMatrixSet = newLayer.tileMatrixSet;
- this.currentLayer = newLayer;
- Collection<Double> scales = new ArrayList<>(currentTileMatrixSet.tileMatrix.size());
- for (TileMatrix tileMatrix : currentTileMatrixSet.tileMatrix) {
- scales.add(tileMatrix.scaleDenominator * 0.28e-03);
+ if (proj.equals(tileProjection))
+ return;
+ List<Layer> matchingLayers = layers.stream().filter(
+ l -> l.identifier.equals(defaultLayer.layerName) && l.tileMatrixSet.crs.equals(proj.toCode()))
+ .collect(Collectors.toList());
+ if (matchingLayers.size() > 1) {
+ this.currentLayer = matchingLayers.stream().filter(
+ l -> l.tileMatrixSet.identifier.equals(defaultLayer.getTileMatrixSet()))
+ .findFirst().orElse(null);
+ this.tileProjection = proj;
+ } else if (matchingLayers.size() == 1) {
+ this.currentLayer = matchingLayers.get(0);
+ this.tileProjection = proj;
+ } else {
+ // no tile matrix sets with current projection
+ if (this.currentLayer == null) {
+ this.tileProjection = null;
+ for (Layer layer : layers) {
+ if (!layer.identifier.equals(defaultLayer.layerName)) {
+ continue;
+ }
+ Projection pr = Projections.getProjectionByCode(layer.tileMatrixSet.crs);
+ if (pr != null) {
+ this.currentLayer = layer;
+ this.tileProjection = pr;
+ break;
+ }
}
- this.nativeScaleList = new ScaleList(scales);
- }
- } else if (candidates.size() > 1) {
- Main.warn("More than one layer WMTS available: {0} for projection {1} and name {2}. Do not know which to process",
- candidates.stream().map(x -> x.getUserTitle() + ": " + x.tileMatrixSet.identifier).collect(Collectors.joining(", ")),
- proj.toCode(),
- currentLayer != null ? currentLayer.getUserTitle() : defaultLayer
- );
+ if (this.currentLayer == null)
+ return;
+ } // else: keep currentLayer and tileProjection as is
+ }
+ this.currentTileMatrixSet = this.currentLayer.tileMatrixSet;
+ Collection<Double> scales = new ArrayList<>(currentTileMatrixSet.tileMatrix.size());
+ for (TileMatrix tileMatrix : currentTileMatrixSet.tileMatrix) {
+ scales.add(tileMatrix.scaleDenominator * 0.28e-03);
}
- this.crsScale = getTileSize() * 0.28e-03 / proj.getMetersPerUnit();
+ this.nativeScaleList = new ScaleList(scales);
+ this.crsScale = getTileSize() * 0.28e-03 / this.tileProjection.getMetersPerUnit();
}
/**
@@ -650,7 +679,7 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
public int getTileSize() {
// no support for non-square tiles (tileHeight != tileWidth)
// and for different tile sizes at different zoom levels
- Collection<Layer> projLayers = getLayers(null, Main.getProjection().toCode());
+ Collection<Layer> projLayers = getLayers(null, tileProjection.toCode());
if (!projLayers.isEmpty()) {
return projLayers.iterator().next().tileMatrixSet.tileMatrix.get(0).tileHeight;
}
@@ -731,11 +760,11 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
public ICoordinate tileXYToLatLon(int x, int y, int zoom) {
TileMatrix matrix = getTileMatrix(zoom);
if (matrix == null) {
- return Main.getProjection().getWorldBoundsLatLon().getCenter().toCoordinate();
+ return tileProjection.getWorldBoundsLatLon().getCenter().toCoordinate();
}
double scale = matrix.scaleDenominator * this.crsScale;
EastNorth ret = new EastNorth(matrix.topLeftCorner.east() + x * scale, matrix.topLeftCorner.north() - y * scale);
- return Main.getProjection().eastNorth2latlon(ret).toCoordinate();
+ return tileProjection.eastNorth2latlon(ret).toCoordinate();
}
@Override
@@ -745,8 +774,7 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
return new TileXY(0, 0);
}
- Projection proj = Main.getProjection();
- EastNorth enPoint = proj.latlon2eastNorth(new LatLon(lat, lon));
+ EastNorth enPoint = tileProjection.latlon2eastNorth(new LatLon(lat, lon));
double scale = matrix.scaleDenominator * this.crsScale;
return new TileXY(
(enPoint.east() - matrix.topLeftCorner.east()) / scale,
@@ -761,12 +789,12 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
@Override
public int getTileXMax(int zoom) {
- return getTileXMax(zoom, Main.getProjection());
+ return getTileXMax(zoom, tileProjection);
}
@Override
public int getTileYMax(int zoom) {
- return getTileYMax(zoom, Main.getProjection());
+ return getTileYMax(zoom, tileProjection);
}
@Override
@@ -776,7 +804,7 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
return new Point(0, 0);
}
double scale = matrix.scaleDenominator * this.crsScale;
- EastNorth point = Main.getProjection().latlon2eastNorth(new LatLon(lat, lon));
+ EastNorth point = tileProjection.latlon2eastNorth(new LatLon(lat, lon));
return new Point(
(int) Math.round((point.east() - matrix.topLeftCorner.east()) / scale),
(int) Math.round((matrix.topLeftCorner.north() - point.north()) / scale)
@@ -800,12 +828,11 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
return new Coordinate(0, 0);
}
double scale = matrix.scaleDenominator * this.crsScale;
- Projection proj = Main.getProjection();
EastNorth ret = new EastNorth(
matrix.topLeftCorner.east() + x * scale,
matrix.topLeftCorner.north() - y * scale
);
- LatLon ll = proj.eastNorth2latlon(ret);
+ LatLon ll = tileProjection.eastNorth2latlon(ret);
return new Coordinate(ll.lat(), ll.lon());
}
@@ -852,8 +879,8 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
/**
* @return set of projection codes that this TileSource supports
*/
- public Set<String> getSupportedProjections() {
- Set<String> ret = new HashSet<>();
+ public Collection<String> getSupportedProjections() {
+ Collection<String> ret = new LinkedHashSet<>();
if (currentLayer == null) {
for (Layer layer: this.layers) {
ret.add(layer.tileMatrixSet.crs);
@@ -907,4 +934,76 @@ public class WMTSTileSource extends AbstractTMSTileSource implements TemplatedTi
return nativeScaleList;
}
+ public Projection getTileProjection() {
+ return tileProjection;
+ }
+
+ @Override
+ public IProjected tileXYtoProjected(int x, int y, int zoom) {
+ TileMatrix matrix = getTileMatrix(zoom);
+ if (matrix == null) {
+ return new Projected(0, 0);
+ }
+ double scale = matrix.scaleDenominator * this.crsScale;
+ return new Projected(
+ matrix.topLeftCorner.east() + x * scale,
+ matrix.topLeftCorner.north() - y * scale);
+ }
+
+ @Override
+ public TileXY projectedToTileXY(IProjected projected, int zoom) {
+ TileMatrix matrix = getTileMatrix(zoom);
+ if (matrix == null) {
+ return new TileXY(0, 0);
+ }
+ double scale = matrix.scaleDenominator * this.crsScale;
+ return new TileXY(
+ (projected.getEast() - matrix.topLeftCorner.east()) / scale,
+ -(projected.getNorth() - matrix.topLeftCorner.north()) / scale);
+ }
+
+ private ProjectionBounds getTileProjectionBounds(Tile tile) {
+ ProjectionBounds pb = new ProjectionBounds(new EastNorth(
+ this.tileXYtoProjected(tile.getXtile(), tile.getYtile(), tile.getZoom())));
+ pb.extend(new EastNorth(this.tileXYtoProjected(tile.getXtile() + 1, tile.getYtile() + 1, tile.getZoom())));
+ return pb;
+ }
+
+ @Override
+ public boolean isInside(Tile inner, Tile outer) {
+ ProjectionBounds pbInner = getTileProjectionBounds(inner);
+ ProjectionBounds pbOuter = getTileProjectionBounds(outer);
+ // a little tolerance, for when inner tile touches the border of the
+ // outer tile
+ double epsilon = 1e-7 * (pbOuter.maxEast - pbOuter.minEast);
+ return pbOuter.minEast <= pbInner.minEast + epsilon &&
+ pbOuter.minNorth <= pbInner.minNorth + epsilon &&
+ pbOuter.maxEast >= pbInner.maxEast - epsilon &&
+ pbOuter.maxNorth >= pbInner.maxNorth - epsilon;
+ }
+
+ @Override
+ public TileRange getCoveringTileRange(Tile tile, int newZoom) {
+ TileMatrix matrixNew = getTileMatrix(newZoom);
+ if (matrixNew == null) {
+ return new TileRange(new TileXY(0, 0), new TileXY(0, 0), newZoom);
+ }
+ IProjected p0 = tileXYtoProjected(tile.getXtile(), tile.getYtile(), tile.getZoom());
+ IProjected p1 = tileXYtoProjected(tile.getXtile() + 1, tile.getYtile() + 1, tile.getZoom());
+ TileXY tMin = projectedToTileXY(p0, newZoom);
+ TileXY tMax = projectedToTileXY(p1, newZoom);
+ // shrink the target tile a little, so we don't get neighboring tiles, that
+ // share an edge, but don't actually cover the target tile
+ double epsilon = 1e-7 * (tMax.getX() - tMin.getX());
+ int minX = (int) Math.floor(tMin.getX() + epsilon);
+ int minY = (int) Math.floor(tMin.getY() + epsilon);
+ int maxX = (int) Math.ceil(tMax.getX() - epsilon) - 1;
+ int maxY = (int) Math.ceil(tMax.getY() - epsilon) - 1;
+ return new TileRange(new TileXY(minX, minY), new TileXY(maxX, maxY), newZoom);
+ }
+
+ @Override
+ public String getServerCRS() {
+ return tileProjection.toCode();
+ }
}
diff --git a/src/org/openstreetmap/josm/data/notes/Note.java b/src/org/openstreetmap/josm/data/notes/Note.java
index 176c7dd..2f569fb 100644
--- a/src/org/openstreetmap/josm/data/notes/Note.java
+++ b/src/org/openstreetmap/josm/data/notes/Note.java
@@ -10,6 +10,7 @@ import java.util.List;
import java.util.Objects;
import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.tools.date.DateUtils;
/**
* A map note. It always has at least one comment since a comment is required to create a note on osm.org.
@@ -97,7 +98,7 @@ public class Note {
/** @return Date that this note was submitted */
public Date getCreatedAt() {
- return cloneDate(createdAt);
+ return DateUtils.cloneDate(createdAt);
}
/**
@@ -105,12 +106,12 @@ public class Note {
* @param createdAt date at which this note has been created
*/
public void setCreatedAt(Date createdAt) {
- this.createdAt = cloneDate(createdAt);
+ this.createdAt = DateUtils.cloneDate(createdAt);
}
/** @return Date that this note was closed. Null if it is still open. */
public Date getClosedAt() {
- return cloneDate(closedAt);
+ return DateUtils.cloneDate(closedAt);
}
/**
@@ -118,7 +119,7 @@ public class Note {
* @param closedAt date at which this note has been closed
*/
public void setClosedAt(Date closedAt) {
- this.closedAt = cloneDate(closedAt);
+ this.closedAt = DateUtils.cloneDate(closedAt);
}
/** @return The open or closed state of this note */
@@ -171,7 +172,7 @@ public class Note {
*/
public void updateWith(Note note) {
this.comments = note.comments;
- this.createdAt = cloneDate(note.createdAt);
+ this.createdAt = DateUtils.cloneDate(note.createdAt);
this.id = note.id;
this.state = note.state;
this.latLon = note.latLon;
@@ -196,13 +197,4 @@ public class Note {
public String toString() {
return tr("Note") + ' ' + id + ": " + getFirstComment();
}
-
- /**
- * Null-safe date cloning method.
- * @param d date to clone, or null
- * @return cloned date, or null
- */
- static Date cloneDate(Date d) {
- return d != null ? (Date) d.clone() : null;
- }
}
diff --git a/src/org/openstreetmap/josm/data/notes/NoteComment.java b/src/org/openstreetmap/josm/data/notes/NoteComment.java
index 93fee41..f08017b 100644
--- a/src/org/openstreetmap/josm/data/notes/NoteComment.java
+++ b/src/org/openstreetmap/josm/data/notes/NoteComment.java
@@ -5,6 +5,7 @@ import java.util.Comparator;
import java.util.Date;
import org.openstreetmap.josm.data.osm.User;
+import org.openstreetmap.josm.tools.date.DateUtils;
/**
* Represents a comment made on a note. All notes have at least on comment
@@ -51,7 +52,7 @@ public class NoteComment {
public NoteComment(Date createDate, User user, String commentText, Action action, boolean isNew) {
this.text = commentText;
this.user = user;
- this.commentTimestamp = Note.cloneDate(createDate);
+ this.commentTimestamp = DateUtils.cloneDate(createDate);
this.action = action;
this.isNew = isNew;
}
@@ -68,7 +69,7 @@ public class NoteComment {
/** @return The time at which this comment was created */
public Date getCommentTimestamp() {
- return Note.cloneDate(commentTimestamp);
+ return DateUtils.cloneDate(commentTimestamp);
}
/** @return the action associated with this note */
diff --git a/src/org/openstreetmap/josm/data/oauth/SignpostAdapters.java b/src/org/openstreetmap/josm/data/oauth/SignpostAdapters.java
index 9a34aa6..a5e05da 100644
--- a/src/org/openstreetmap/josm/data/oauth/SignpostAdapters.java
+++ b/src/org/openstreetmap/josm/data/oauth/SignpostAdapters.java
@@ -17,6 +17,7 @@ import oauth.signpost.AbstractOAuthProvider;
public final class SignpostAdapters {
private SignpostAdapters() {
+ // Hide constructor for utility classes
}
/**
diff --git a/src/org/openstreetmap/josm/data/osm/Changeset.java b/src/org/openstreetmap/josm/data/osm/Changeset.java
index 1d21e03..7df9efa 100644
--- a/src/org/openstreetmap/josm/data/osm/Changeset.java
+++ b/src/org/openstreetmap/josm/data/osm/Changeset.java
@@ -14,6 +14,7 @@ import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.visitor.Visitor;
import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.date.DateUtils;
/**
* Represents a single changeset in JOSM. For now its only used during
@@ -176,7 +177,7 @@ public final class Changeset implements Tagged {
* @return the changeset creation date
*/
public Date getCreatedAt() {
- return createdAt;
+ return DateUtils.cloneDate(createdAt);
}
/**
@@ -184,7 +185,7 @@ public final class Changeset implements Tagged {
* @param createdAt changeset creation date
*/
public void setCreatedAt(Date createdAt) {
- this.createdAt = createdAt;
+ this.createdAt = DateUtils.cloneDate(createdAt);
}
/**
@@ -192,7 +193,7 @@ public final class Changeset implements Tagged {
* @return the changeset closure date
*/
public Date getClosedAt() {
- return closedAt;
+ return DateUtils.cloneDate(closedAt);
}
/**
@@ -200,7 +201,7 @@ public final class Changeset implements Tagged {
* @param closedAt changeset closure date
*/
public void setClosedAt(Date closedAt) {
- this.closedAt = closedAt;
+ this.closedAt = DateUtils.cloneDate(closedAt);
}
/**
@@ -368,20 +369,14 @@ public final class Changeset implements Tagged {
return false;
if (open != other.open)
return false;
- if (tags == null) {
- if (other.tags != null)
- return false;
- } else if (!tags.equals(other.tags))
+ if (!tags.equals(other.tags))
return false;
if (user == null) {
if (other.user != null)
return false;
} else if (!user.equals(other.user))
return false;
- if (commentsCount != other.commentsCount) {
- return false;
- }
- return true;
+ return commentsCount == other.commentsCount;
}
@Override
@@ -425,8 +420,8 @@ public final class Changeset implements Tagged {
if (id != other.id)
return;
this.user = other.user;
- this.createdAt = other.createdAt;
- this.closedAt = other.closedAt;
+ this.createdAt = DateUtils.cloneDate(other.createdAt);
+ this.closedAt = DateUtils.cloneDate(other.closedAt);
this.open = other.open;
this.min = other.min;
this.max = other.max;
diff --git a/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java b/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java
index e0fc24b..114e504 100644
--- a/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java
+++ b/src/org/openstreetmap/josm/data/osm/ChangesetDataSet.java
@@ -16,15 +16,33 @@ import org.openstreetmap.josm.tools.CheckParameterUtil;
*/
public class ChangesetDataSet {
+ /**
+ * Type of primitive modification.
+ */
public enum ChangesetModificationType {
+ /** The primitive has been created */
CREATED,
+ /** The primitive has been updated */
UPDATED,
+ /** The primitive has been deleted */
DELETED
}
+ /**
+ * An entry in the changeset dataset.
+ */
public interface ChangesetDataSetEntry {
+
+ /**
+ * Returns the type of modification.
+ * @return the type of modification
+ */
ChangesetModificationType getModificationType();
+ /**
+ * Returns the affected history primitive.
+ * @return the affected history primitive
+ */
HistoryOsmPrimitive getPrimitive();
}
@@ -132,18 +150,21 @@ public class ChangesetDataSet {
}
/**
- * Replies the {@link HistoryOsmPrimitive} with id <code>id</code> from this
- * dataset. null, if there is no such primitive in the data set.
+ * Replies the {@link HistoryOsmPrimitive} with id <code>id</code> from this dataset.
+ * null, if there is no such primitive in the data set.
*
* @param id the id
- * @return the {@link HistoryOsmPrimitive} with id <code>id</code> from this
- * dataset
+ * @return the {@link HistoryOsmPrimitive} with id <code>id</code> from this dataset
*/
public HistoryOsmPrimitive getPrimitive(PrimitiveId id) {
if (id == null) return null;
return primitives.get(id);
}
+ /**
+ * Returns an iterator over dataset entries.
+ * @return an iterator over dataset entries
+ */
public Iterator<ChangesetDataSetEntry> iterator() {
return new DefaultIterator();
}
@@ -183,9 +204,7 @@ public class ChangesetDataSet {
@Override
public ChangesetDataSetEntry next() {
Entry<PrimitiveId, ChangesetModificationType> next = typeIterator.next();
- ChangesetModificationType type = next.getValue();
- HistoryOsmPrimitive primitive = primitives.get(next.getKey());
- return new DefaultChangesetDataSetEntry(type, primitive);
+ return new DefaultChangesetDataSetEntry(next.getValue(), primitives.get(next.getKey()));
}
@Override
diff --git a/src/org/openstreetmap/josm/data/osm/ChangesetDiscussionComment.java b/src/org/openstreetmap/josm/data/osm/ChangesetDiscussionComment.java
index c58e96b..46d536f 100644
--- a/src/org/openstreetmap/josm/data/osm/ChangesetDiscussionComment.java
+++ b/src/org/openstreetmap/josm/data/osm/ChangesetDiscussionComment.java
@@ -3,6 +3,8 @@ package org.openstreetmap.josm.data.osm;
import java.util.Date;
+import org.openstreetmap.josm.tools.date.DateUtils;
+
/**
* A comment in a public changeset discussion.
* @since 7704
@@ -22,7 +24,7 @@ public class ChangesetDiscussionComment {
* @param user the user who posted the comment
*/
public ChangesetDiscussionComment(Date date, User user) {
- this.date = date;
+ this.date = DateUtils.cloneDate(date);
this.user = user;
}
@@ -47,7 +49,7 @@ public class ChangesetDiscussionComment {
* @return date this comment was posted at
*/
public final Date getDate() {
- return date;
+ return DateUtils.cloneDate(date);
}
/**
diff --git a/src/org/openstreetmap/josm/data/osm/DataIntegrityProblemException.java b/src/org/openstreetmap/josm/data/osm/DataIntegrityProblemException.java
index 679d668..28df314 100644
--- a/src/org/openstreetmap/josm/data/osm/DataIntegrityProblemException.java
+++ b/src/org/openstreetmap/josm/data/osm/DataIntegrityProblemException.java
@@ -1,19 +1,36 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
+/**
+ * Exception thrown when a primitive or data set does not pass its integrity checks.
+ * @since 2399
+ */
public class DataIntegrityProblemException extends RuntimeException {
private final String htmlMessage;
+ /**
+ * Constructs a new {@code DataIntegrityProblemException}.
+ * @param message the detail message
+ */
public DataIntegrityProblemException(String message) {
this(message, null);
}
+ /**
+ * Constructs a new {@code DataIntegrityProblemException}.
+ * @param message the detail message
+ * @param htmlMessage HTML-formatted error message. Can be null
+ */
public DataIntegrityProblemException(String message, String htmlMessage) {
super(message);
this.htmlMessage = htmlMessage;
}
+ /**
+ * Returns the HTML-formatted error message.
+ * @return the HTML-formatted error message, or null
+ */
public String getHtmlMessage() {
return htmlMessage;
}
diff --git a/src/org/openstreetmap/josm/data/osm/DataSet.java b/src/org/openstreetmap/josm/data/osm/DataSet.java
index c610d13..30968ac 100644
--- a/src/org/openstreetmap/josm/data/osm/DataSet.java
+++ b/src/org/openstreetmap/josm/data/osm/DataSet.java
@@ -49,6 +49,7 @@ 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.ListenerList;
import org.openstreetmap.josm.tools.SubclassFilteredCollection;
import org.openstreetmap.josm.tools.Utils;
@@ -155,14 +156,13 @@ public final class DataSet implements Data, ProjectionChangeListener {
// provide means to highlight map elements that are not osm primitives
private Collection<WaySegment> highlightedVirtualNodes = new LinkedList<>();
private Collection<WaySegment> highlightedWaySegments = new LinkedList<>();
+ private final ListenerList<HighlightUpdateListener> highlightUpdateListeners = ListenerList.create();
// Number of open calls to beginUpdate
private int updateCount;
// Events that occurred while dataset was locked but should be fired after write lock is released
private final List<AbstractDatasetChangedEvent> cachedEvents = new ArrayList<>();
- private int highlightUpdateCount;
-
private UploadPolicy uploadPolicy;
private final ReadWriteLock lock = new ReentrantReadWriteLock();
@@ -269,15 +269,6 @@ public final class DataSet implements Data, ProjectionChangeListener {
}
/**
- * This method can be used to detect changes in highlight state of primitives. If highlighting was changed
- * then the method will return different number.
- * @return the current highlight counter
- */
- public int getHighlightUpdateCount() {
- return highlightUpdateCount;
- }
-
- /**
* History of selections - shared by plugins and SelectionListDialog
*/
private final LinkedList<Collection<? extends OsmPrimitive>> selectionHistory = new LinkedList<>();
@@ -728,6 +719,24 @@ public final class DataSet implements Data, ProjectionChangeListener {
}
/**
+ * Adds a listener that gets notified whenever way segment / virtual nodes highlights change.
+ * @param listener The Listener
+ * @since 12014
+ */
+ public void addHighlightUpdateListener(HighlightUpdateListener listener) {
+ highlightUpdateListeners.addListener(listener);
+ }
+
+ /**
+ * Removes a listener that was added with {@link #addHighlightUpdateListener(HighlightUpdateListener)}
+ * @param listener The Listener
+ * @since 12014
+ */
+ public void removeHighlightUpdateListener(HighlightUpdateListener listener) {
+ highlightUpdateListeners.removeListener(listener);
+ }
+
+ /**
* Replies an unmodifiable collection of primitives currently selected
* in this dataset, except deleted ones. May be empty, but not null.
*
@@ -1334,7 +1343,8 @@ public final class DataSet implements Data, ProjectionChangeListener {
}
void fireHighlightingChanged() {
- highlightUpdateCount++;
+ HighlightUpdateListener.HighlightUpdateEvent e = new HighlightUpdateListener.HighlightUpdateEvent(this);
+ highlightUpdateListeners.fireEvent(l -> l.highlightUpdated(e));
}
/**
diff --git a/src/org/openstreetmap/josm/data/osm/Filter.java b/src/org/openstreetmap/josm/data/osm/Filter.java
index a1c9751..278942f 100644
--- a/src/org/openstreetmap/josm/data/osm/Filter.java
+++ b/src/org/openstreetmap/josm/data/osm/Filter.java
@@ -1,6 +1,8 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.osm;
+import java.util.Objects;
+
import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
import org.openstreetmap.josm.data.Preferences.pref;
@@ -113,6 +115,29 @@ public class Filter extends SearchSetting {
*/
@writeExplicitly
@pref public boolean inverted;
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(case_sensitive, enable, hiding, inverted, mapCSS_search, mode, regex_search, text, version);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj)
+ return true;
+ if (obj == null || getClass() != obj.getClass())
+ return false;
+ FilterPreferenceEntry other = (FilterPreferenceEntry) obj;
+ return case_sensitive == other.case_sensitive
+ && enable == other.enable
+ && hiding == other.hiding
+ && inverted == other.inverted
+ && mapCSS_search == other.mapCSS_search
+ && regex_search == other.regex_search
+ && Objects.equals(mode, other.mode)
+ && Objects.equals(text, other.text)
+ && Objects.equals(version, other.version);
+ }
}
/**
diff --git a/src/org/openstreetmap/josm/data/osm/FilterMatcher.java b/src/org/openstreetmap/josm/data/osm/FilterMatcher.java
index 29dcb42..4e94bc1 100644
--- a/src/org/openstreetmap/josm/data/osm/FilterMatcher.java
+++ b/src/org/openstreetmap/josm/data/osm/FilterMatcher.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
import org.openstreetmap.josm.actions.search.SearchCompiler;
import org.openstreetmap.josm.actions.search.SearchCompiler.Match;
@@ -223,7 +224,7 @@ public class FilterMatcher {
private static FilterType test(List<FilterInfo> filters, OsmPrimitive primitive, boolean hidden) {
- if (primitive.isIncomplete())
+ if (primitive.isIncomplete() || (Main.map != null && Main.map.mapMode.getPreservedPrimitives().contains(primitive)))
return FilterType.NOT_FILTERED;
boolean filtered = false;
diff --git a/src/org/openstreetmap/josm/data/osm/HighlightUpdateListener.java b/src/org/openstreetmap/josm/data/osm/HighlightUpdateListener.java
new file mode 100644
index 0000000..e03d36f
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/osm/HighlightUpdateListener.java
@@ -0,0 +1,42 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+/**
+ * This is a listener that listens to highlight segment changes.
+ * @author Michael Zangl
+ * @since 12014
+ */
+ at FunctionalInterface
+public interface HighlightUpdateListener {
+
+ /**
+ * An event that is fired whenever highlighting on the OSM {@link DataSet} changed.
+ * @author Michael Zangl
+ * @since 12014
+ */
+ class HighlightUpdateEvent {
+ private final DataSet dataSet;
+
+ /**
+ * Create a new highlight update event.
+ * @param dataSet The dataset that was changed.
+ */
+ public HighlightUpdateEvent(DataSet dataSet) {
+ this.dataSet = dataSet;
+ }
+
+ /**
+ * Get the modified data set.
+ * @return The data set.
+ */
+ public DataSet getDataSet() {
+ return dataSet;
+ }
+ }
+
+ /**
+ * Called whenever the highlighting of way segments in the dataset changed.
+ * @param e The dataset highlight event.
+ */
+ void highlightUpdated(HighlightUpdateEvent e);
+}
diff --git a/src/org/openstreetmap/josm/data/osm/Node.java b/src/org/openstreetmap/josm/data/osm/Node.java
index a5a62e5..027fb53 100644
--- a/src/org/openstreetmap/josm/data/osm/Node.java
+++ b/src/org/openstreetmap/josm/data/osm/Node.java
@@ -3,6 +3,7 @@ package org.openstreetmap.josm.data.osm;
import java.awt.geom.Area;
import java.util.Collection;
+import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.TreeSet;
@@ -428,4 +429,13 @@ public final class Node extends OsmPrimitive implements INode {
LatLon coor = getCoor();
return coor != null && !coor.isIn(area);
}
+
+ /**
+ * Replies the set of referring ways.
+ * @return the set of referring ways
+ * @since 12031
+ */
+ public List<Way> getParentWays() {
+ return getFilteredList(getReferrers(), Way.class);
+ }
}
diff --git a/src/org/openstreetmap/josm/data/osm/NodeData.java b/src/org/openstreetmap/josm/data/osm/NodeData.java
index 650ab19..df54c9e 100644
--- a/src/org/openstreetmap/josm/data/osm/NodeData.java
+++ b/src/org/openstreetmap/josm/data/osm/NodeData.java
@@ -23,6 +23,15 @@ public class NodeData extends PrimitiveData implements INode {
}
/**
+ * Constructs a new {@code NodeData} with given id.
+ * @param id id
+ * @since 12017
+ */
+ public NodeData(long id) {
+ super(id);
+ }
+
+ /**
* Constructs a new {@code NodeData}.
* @param data node data to copy
*/
diff --git a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
index b1edf09..8a5124a 100644
--- a/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
+++ b/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
@@ -1151,9 +1151,7 @@ public abstract class OsmPrimitive extends AbstractPrimitive implements Comparab
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 true;
+ return !(isIncomplete() ^ other.isIncomplete()); // exclusive or operator for performance (see #7159)
}
boolean hasEqualSemanticAttributes(final OsmPrimitive other, final boolean testInterestingTagsOnly) {
diff --git a/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java b/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java
index bb6687d..e4c3351 100644
--- a/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java
+++ b/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java
@@ -38,18 +38,37 @@ public enum OsmPrimitiveType {
this.dataClass = dataClass;
}
+ /**
+ * Returns the API type name / JOSM display name.
+ * @return the API type name / JOSM display name
+ */
public String getAPIName() {
return apiTypeName;
}
+ /**
+ * Returns the OSM class for data values, or null.
+ * @return the OSM class for data values, or null
+ */
public Class<? extends OsmPrimitive> getOsmClass() {
return osmClass;
}
+ /**
+ * Returns the data class.
+ * @return the data class
+ */
public Class<? extends PrimitiveData> getDataClass() {
return dataClass;
}
+ /**
+ * Returns enum value from API type name / JOSM display name, case sensitive.
+ * @param typeName API type name / JOSM display name, case sensitive
+ * @return matching enum value
+ * @throws IllegalArgumentException if the type name does not match any valid type
+ * @see #from(String)
+ */
public static OsmPrimitiveType fromApiTypeName(String typeName) {
for (OsmPrimitiveType type : OsmPrimitiveType.values()) {
if (type.getAPIName().equals(typeName)) return type;
@@ -71,8 +90,13 @@ public enum OsmPrimitiveType {
throw new IllegalArgumentException("Unknown type: "+obj);
}
+ /**
+ * Returns enum value from API type name / JOSM display name, case insensitive.
+ * @param value API type name / JOSM display name, case insensitive
+ * @return matching enum value or null
+ * @see #fromApiTypeName
+ */
public static OsmPrimitiveType from(String value) {
- if (value == null) return null;
for (OsmPrimitiveType type: values()) {
if (type.getAPIName().equalsIgnoreCase(value))
return type;
@@ -80,10 +104,21 @@ public enum OsmPrimitiveType {
return null;
}
+ /**
+ * Returns the values matching real OSM API data types (node, way, relation).
+ * @return the values matching real OSM API data types (node, way, relation)
+ */
public static Collection<OsmPrimitiveType> dataValues() {
return DATA_VALUES;
}
+ /**
+ * Constructs a new primitive instance (node, way or relation) without version.
+ * @param uniqueId the unique id
+ * @param allowNegative {@code true} to allow negative id
+ * @return a new primitive instance (node, way or relation)
+ * @throws IllegalArgumentException if uniqueId < 0 and allowNegative is false
+ */
public OsmPrimitive newInstance(long uniqueId, boolean allowNegative) {
switch (this) {
case NODE:
@@ -97,6 +132,27 @@ public enum OsmPrimitiveType {
}
}
+ /**
+ * Constructs a new primitive instance (node, way or relation) with given version.
+ * @param id The id. Must be >= 0
+ * @param version The version
+ * @return a new primitive instance (node, way or relation) with given version
+ * @throws IllegalArgumentException if id < 0
+ * @since 12018
+ */
+ public OsmPrimitive newVersionedInstance(long id, int version) {
+ switch (this) {
+ case NODE:
+ return new Node(id, version);
+ case WAY:
+ return new Way(id, version);
+ case RELATION:
+ return new Relation(id, version);
+ default:
+ throw new AssertionError();
+ }
+ }
+
@Override
public String toString() {
return tr(getAPIName());
diff --git a/src/org/openstreetmap/josm/data/osm/PrimitiveData.java b/src/org/openstreetmap/josm/data/osm/PrimitiveData.java
index 6345281..5d16733 100644
--- a/src/org/openstreetmap/josm/data/osm/PrimitiveData.java
+++ b/src/org/openstreetmap/josm/data/osm/PrimitiveData.java
@@ -26,7 +26,16 @@ public abstract class PrimitiveData extends AbstractPrimitive implements Seriali
* Constructs a new {@code PrimitiveData}.
*/
public PrimitiveData() {
- id = OsmPrimitive.generateUniqueId();
+ this(OsmPrimitive.generateUniqueId());
+ }
+
+ /**
+ * Constructs a new {@code PrimitiveData} with given id.
+ * @param id id
+ * @since 12017
+ */
+ public PrimitiveData(long id) {
+ this.id = id;
}
/**
@@ -74,6 +83,13 @@ public abstract class PrimitiveData extends AbstractPrimitive implements Seriali
return builder.toString();
}
+ /**
+ * Returns a filtered list for a given primitive type.
+ * @param <T> primitive type
+ * @param list list to filter
+ * @param type primitive type
+ * @return a filtered list for given primitive type
+ */
@SuppressWarnings("unchecked")
public static <T extends PrimitiveData> List<T> getFilteredList(Collection<T> list, OsmPrimitiveType type) {
List<T> ret = new ArrayList<>();
diff --git a/src/org/openstreetmap/josm/data/osm/RelationData.java b/src/org/openstreetmap/josm/data/osm/RelationData.java
index b022fb5..b8268a1 100644
--- a/src/org/openstreetmap/josm/data/osm/RelationData.java
+++ b/src/org/openstreetmap/josm/data/osm/RelationData.java
@@ -6,6 +6,10 @@ import java.util.List;
import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
+/**
+ * Relation data.
+ * @since 2284
+ */
public class RelationData extends PrimitiveData implements IRelation {
private static final long serialVersionUID = 1163664954890478565L;
@@ -19,6 +23,15 @@ public class RelationData extends PrimitiveData implements IRelation {
}
/**
+ * Constructs a new {@code RelationData} with given id.
+ * @param id id
+ * @since 12017
+ */
+ public RelationData(long id) {
+ super(id);
+ }
+
+ /**
* Constructs a new {@code RelationData}.
* @param data relation data to copy
*/
@@ -27,10 +40,18 @@ public class RelationData extends PrimitiveData implements IRelation {
members.addAll(data.members);
}
+ /**
+ * Returns relation members.
+ * @return relation members
+ */
public List<RelationMemberData> getMembers() {
return members;
}
+ /**
+ * Sets relation members.
+ * @param memberData relation members
+ */
public void setMembers(List<RelationMemberData> memberData) {
members = new ArrayList<>(memberData);
}
diff --git a/src/org/openstreetmap/josm/data/osm/User.java b/src/org/openstreetmap/josm/data/osm/User.java
index ec6c5f0..05dd25a 100644
--- a/src/org/openstreetmap/josm/data/osm/User.java
+++ b/src/org/openstreetmap/josm/data/osm/User.java
@@ -69,6 +69,7 @@ public final class User {
public static synchronized User createOsmUser(long uid, String name) {
if (lastUser != null && lastUser.getId() == uid) {
+ lastUser.setPreferredName(name);
return lastUser;
}
@@ -90,6 +91,7 @@ public final class User {
*/
public static synchronized void clearUserMap() {
userMap.clear();
+ lastUser = null;
}
/**
diff --git a/src/org/openstreetmap/josm/data/osm/UserInfo.java b/src/org/openstreetmap/josm/data/osm/UserInfo.java
index 6e9ee64..70bbfc0 100644
--- a/src/org/openstreetmap/josm/data/osm/UserInfo.java
+++ b/src/org/openstreetmap/josm/data/osm/UserInfo.java
@@ -5,6 +5,7 @@ import java.util.Date;
import java.util.List;
import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.tools.date.DateUtils;
/**
* Public user information.
@@ -72,7 +73,7 @@ public class UserInfo {
* @return the user account creation date
*/
public Date getAccountCreated() {
- return accountCreated;
+ return DateUtils.cloneDate(accountCreated);
}
/**
@@ -80,7 +81,7 @@ public class UserInfo {
* @param accountCreated user account creation date
*/
public void setAccountCreated(Date accountCreated) {
- this.accountCreated = accountCreated;
+ this.accountCreated = DateUtils.cloneDate(accountCreated);
}
/**
diff --git a/src/org/openstreetmap/josm/data/osm/WayData.java b/src/org/openstreetmap/josm/data/osm/WayData.java
index fde1f17..6d12ed6 100644
--- a/src/org/openstreetmap/josm/data/osm/WayData.java
+++ b/src/org/openstreetmap/josm/data/osm/WayData.java
@@ -19,6 +19,15 @@ public class WayData extends PrimitiveData implements IWay {
}
/**
+ * Constructs a new {@code WayData} with given id.
+ * @param id id
+ * @since 12017
+ */
+ public WayData(long id) {
+ super(id);
+ }
+
+ /**
* Constructs a new {@code WayData}.
* @param data way data to copy
*/
diff --git a/src/org/openstreetmap/josm/data/osm/WaySegment.java b/src/org/openstreetmap/josm/data/osm/WaySegment.java
index ae00be0..6a52eff 100644
--- a/src/org/openstreetmap/josm/data/osm/WaySegment.java
+++ b/src/org/openstreetmap/josm/data/osm/WaySegment.java
@@ -120,11 +120,8 @@ public final class WaySegment implements Comparable<WaySegment> {
* @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;
+ return (getFirstNode().equals(s2.getFirstNode()) && getSecondNode().equals(s2.getSecondNode()))
+ || (getFirstNode().equals(s2.getSecondNode()) && getSecondNode().equals(s2.getFirstNode()));
}
@Override
diff --git a/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java b/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java
index 1867d19..bc50e8b 100644
--- a/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/AbstractDatasetChangedEvent.java
@@ -6,8 +6,15 @@ import java.util.Collection;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
+/**
+ * Base class of all dataset change events.
+ * @since 2622
+ */
public abstract class AbstractDatasetChangedEvent {
+ /**
+ * Type of dataset changed event, returned by {@link AbstractDatasetChangedEvent#getType}.
+ */
public enum DatasetEventType {
DATA_CHANGED,
NODE_MOVED,
@@ -20,12 +27,23 @@ public abstract class AbstractDatasetChangedEvent {
PRIMITIVE_FLAGS_CHANGED,
}
+ /**
+ * The dataset from which the event came from.
+ */
protected final DataSet dataSet;
+ /**
+ * Constructs a new {@code AbstractDatasetChangedEvent}.
+ * @param dataSet the dataset from which the event came from
+ */
protected AbstractDatasetChangedEvent(DataSet dataSet) {
this.dataSet = dataSet;
}
+ /**
+ * Calls the appropriate method of the listener for this event.
+ * @param listener dataset listener to notify about this event
+ */
public abstract void fire(DataSetListener listener);
/**
@@ -39,10 +57,18 @@ public abstract class AbstractDatasetChangedEvent {
*/
public abstract Collection<? extends OsmPrimitive> getPrimitives();
+ /**
+ * Returns the dataset from which the event came from.
+ * @return the dataset from which the event came from
+ */
public DataSet getDataset() {
return dataSet;
}
+ /**
+ * Returns the type of dataset changed event.
+ * @return the type of dataset changed event
+ */
public abstract DatasetEventType getType();
@Override
diff --git a/src/org/openstreetmap/josm/data/osm/event/ChangesetIdChangedEvent.java b/src/org/openstreetmap/josm/data/osm/event/ChangesetIdChangedEvent.java
index 9394a2c..155a53d 100644
--- a/src/org/openstreetmap/josm/data/osm/event/ChangesetIdChangedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/ChangesetIdChangedEvent.java
@@ -12,6 +12,13 @@ public class ChangesetIdChangedEvent extends AbstractDatasetChangedEvent {
private final int oldChangesetId;
private final int newChangesetId;
+ /**
+ * Constructs a new {@code ChangesetIdChangedEvent}.
+ * @param dataSet the dataset from which the event comes from
+ * @param primitives list of affected primitives
+ * @param oldChangesetId old changeset id
+ * @param newChangesetId new changeset id
+ */
public ChangesetIdChangedEvent(DataSet dataSet, List<OsmPrimitive> primitives, int oldChangesetId, int newChangesetId) {
super(dataSet);
this.primitives = primitives;
@@ -34,10 +41,18 @@ public class ChangesetIdChangedEvent extends AbstractDatasetChangedEvent {
return DatasetEventType.CHANGESET_ID_CHANGED;
}
+ /**
+ * Returns the old changeset id.
+ * @return the old changeset id
+ */
public int getOldChangesetId() {
return oldChangesetId;
}
+ /**
+ * Returns the new changeset id.
+ * @return the new changeset id
+ */
public int getNewChangesetId() {
return newChangesetId;
}
diff --git a/src/org/openstreetmap/josm/data/osm/event/DataChangedEvent.java b/src/org/openstreetmap/josm/data/osm/event/DataChangedEvent.java
index 45d0b6f..f52a31b 100644
--- a/src/org/openstreetmap/josm/data/osm/event/DataChangedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/DataChangedEvent.java
@@ -14,7 +14,7 @@ public class DataChangedEvent extends AbstractDatasetChangedEvent {
/**
* Constructs a new {@code DataChangedEvent}
- * @param dataSet data set
+ * @param dataSet the dataset from which the event comes from
* @param events list of change events
*/
public DataChangedEvent(DataSet dataSet, List<AbstractDatasetChangedEvent> events) {
@@ -24,7 +24,7 @@ public class DataChangedEvent extends AbstractDatasetChangedEvent {
/**
* Constructs a new {@code DataChangedEvent}
- * @param dataSet data set
+ * @param dataSet data set. Can be null
*/
public DataChangedEvent(DataSet dataSet) {
this(dataSet, null);
diff --git a/src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java b/src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java
index 63ca0b8..1284112 100644
--- a/src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java
+++ b/src/org/openstreetmap/josm/data/osm/event/DataSetListenerAdapter.java
@@ -3,19 +3,30 @@ package org.openstreetmap.josm.data.osm.event;
/**
* Classes that do not wish to implement all methods of DataSetListener
- * may use this class. Implement DatasetListenerAdapter.Listener and
+ * may use this class. Implement {@link DataSetListenerAdapter.Listener} and
* pass this adapter instead of class itself.
- *
+ * @since 2622
*/
public class DataSetListenerAdapter implements DataSetListener {
+ /**
+ * Single method dataset change event listener.
+ */
@FunctionalInterface
public interface Listener {
+ /**
+ * Called when notified about any type of dataset change event.
+ * @param event dataset change event
+ */
void processDatasetEvent(AbstractDatasetChangedEvent event);
}
private final Listener listener;
+ /**
+ * Constructs a new {@code DataSetListenerAdapter}.
+ * @param listener listener for which its {@code processDatasetEvent()} method will be called for all events
+ */
public DataSetListenerAdapter(Listener listener) {
this.listener = listener;
}
diff --git a/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java b/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
index e5aad39..c66ea69 100644
--- a/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
+++ b/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
@@ -92,6 +92,9 @@ public class DatasetEventManager implements ActiveLayerChangeListener, Listener
}
}
+ /**
+ * Event firing mode regarding Event Dispatch Thread.
+ */
public enum FireMode {
/**
* Fire in calling thread immediately.
@@ -166,6 +169,10 @@ public class DatasetEventManager implements ActiveLayerChangeListener, Listener
}
}
+ /**
+ * Unregister listener.
+ * @param listener listener to remove
+ */
public void removeDatasetListener(DataSetListener listener) {
ListenerInfo searchListener = new ListenerInfo(listener, false);
inEDTListeners.remove(searchListener);
diff --git a/src/org/openstreetmap/josm/data/osm/event/NodeMovedEvent.java b/src/org/openstreetmap/josm/data/osm/event/NodeMovedEvent.java
index 1e3fe15..9ab7ce2 100644
--- a/src/org/openstreetmap/josm/data/osm/event/NodeMovedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/NodeMovedEvent.java
@@ -12,6 +12,11 @@ public class NodeMovedEvent extends AbstractDatasetChangedEvent {
private final Node node;
+ /**
+ * Constructs a new {@code NodeMovedEvent}.
+ * @param dataSet the dataset from which the event comes from
+ * @param node the node affected by the move
+ */
public NodeMovedEvent(DataSet dataSet, Node node) {
super(dataSet);
this.node = node;
@@ -22,6 +27,10 @@ public class NodeMovedEvent extends AbstractDatasetChangedEvent {
listener.nodeMoved(this);
}
+ /**
+ * Returns the node affected by the move.
+ * @return the node affected by the move
+ */
public Node getNode() {
return node;
}
@@ -35,5 +44,4 @@ public class NodeMovedEvent extends AbstractDatasetChangedEvent {
public DatasetEventType getType() {
return DatasetEventType.NODE_MOVED;
}
-
}
diff --git a/src/org/openstreetmap/josm/data/osm/event/PrimitiveFlagsChangedEvent.java b/src/org/openstreetmap/josm/data/osm/event/PrimitiveFlagsChangedEvent.java
index 15ad3ca..5ca3da6 100644
--- a/src/org/openstreetmap/josm/data/osm/event/PrimitiveFlagsChangedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/PrimitiveFlagsChangedEvent.java
@@ -14,6 +14,11 @@ public class PrimitiveFlagsChangedEvent extends AbstractDatasetChangedEvent {
private final OsmPrimitive primitive;
+ /**
+ * Constructs a new {@code PrimitiveFlagsChangedEvent}.
+ * @param dataSet the dataset from which the event comes from
+ * @param primitive the primitive affected by the change
+ */
public PrimitiveFlagsChangedEvent(DataSet dataSet, OsmPrimitive primitive) {
super(dataSet);
this.primitive = primitive;
diff --git a/src/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEvent.java b/src/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEvent.java
index 807159c..306d96b 100644
--- a/src/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEvent.java
@@ -14,6 +14,12 @@ public class PrimitivesAddedEvent extends AbstractDatasetChangedEvent {
private final List<? extends OsmPrimitive> primitives;
private final boolean wasIncomplete;
+ /**
+ * Constructs a new {@code PrimitivesAddedEvent}.
+ * @param dataSet the dataset from which the event comes from
+ * @param primitives the list of primitives affected by the change
+ * @param wasIncomplete {@code true} if primitive was in dataset before (so it's not really added), but it was incomplete
+ */
public PrimitivesAddedEvent(DataSet dataSet, Collection<? extends OsmPrimitive> primitives, boolean wasIncomplete) {
super(dataSet);
this.primitives = Collections.unmodifiableList(new ArrayList<>(primitives));
@@ -31,8 +37,8 @@ public class PrimitivesAddedEvent extends AbstractDatasetChangedEvent {
}
/**
- *
- * @return True if primitive was in dataset before (so it's not really added), but it was incomplete
+ * Determines if primitive was in dataset before (so it's not really added), but it was incomplete
+ * @return {@code true} if primitive was in dataset before (so it's not really added), but it was incomplete
*/
public boolean wasIncomplete() {
return wasIncomplete;
diff --git a/src/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEvent.java b/src/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEvent.java
index c28cb42..6abb5af 100644
--- a/src/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEvent.java
@@ -14,6 +14,12 @@ public class PrimitivesRemovedEvent extends AbstractDatasetChangedEvent {
private final List<? extends OsmPrimitive> primitives;
private final boolean wasComplete;
+ /**
+ * Constructs a new {@code PrimitivesRemovedEvent}.
+ * @param dataSet the dataset from which the event comes from
+ * @param primitives the list of primitives affected by the change
+ * @param wasComplete {@code true} if primitive wasn't really removed from the dataset, it only become incomplete again
+ */
public PrimitivesRemovedEvent(DataSet dataSet, Collection<? extends OsmPrimitive> primitives, boolean wasComplete) {
super(dataSet);
this.primitives = Collections.unmodifiableList(new ArrayList<>(primitives));
@@ -31,8 +37,8 @@ public class PrimitivesRemovedEvent extends AbstractDatasetChangedEvent {
}
/**
- *
- * @return True if primitive wasn't really removed from the dataset, it only become incomplete again
+ * Determines if primitive wasn't really removed from the dataset, it only become incomplete again.
+ * @return {@code true} if primitive wasn't really removed from the dataset, it only become incomplete again
*/
public boolean wasComplete() {
return wasComplete;
diff --git a/src/org/openstreetmap/josm/data/osm/event/RelationMembersChangedEvent.java b/src/org/openstreetmap/josm/data/osm/event/RelationMembersChangedEvent.java
index b667681..161c40a 100644
--- a/src/org/openstreetmap/josm/data/osm/event/RelationMembersChangedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/RelationMembersChangedEvent.java
@@ -12,6 +12,11 @@ public class RelationMembersChangedEvent extends AbstractDatasetChangedEvent {
private final Relation relation;
+ /**
+ * Constructs a new {@code RelationMembersChangedEvent}.
+ * @param dataSet the dataset from which the event comes from
+ * @param relation the relation affected by the change
+ */
public RelationMembersChangedEvent(DataSet dataSet, Relation relation) {
super(dataSet);
this.relation = relation;
@@ -22,6 +27,10 @@ public class RelationMembersChangedEvent extends AbstractDatasetChangedEvent {
listener.relationMembersChanged(this);
}
+ /**
+ * Returns the relation affected by the change.
+ * @return the relation affected by the change
+ */
public Relation getRelation() {
return relation;
}
diff --git a/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java b/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
index 25ec322..f9f0bb6 100644
--- a/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
+++ b/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java
@@ -16,12 +16,16 @@ import org.openstreetmap.josm.data.osm.event.DatasetEventManager.FireMode;
/**
* Similar like {@link DatasetEventManager}, just for selection events. Because currently selection changed
* event are global, only FIRE_IN_EDT and FIRE_EDT_CONSOLIDATED modes are really useful
- *
+ * @since 2912
*/
public class SelectionEventManager implements SelectionChangedListener {
private static final SelectionEventManager instance = new SelectionEventManager();
+ /**
+ * Returns the unique instance.
+ * @return the unique instance
+ */
public static SelectionEventManager getInstance() {
return instance;
}
@@ -58,6 +62,11 @@ public class SelectionEventManager implements SelectionChangedListener {
DataSet.addSelectionListener(this);
}
+ /**
+ * Registers a new {@code SelectionChangedListener}.
+ * @param listener listener to add
+ * @param fireMode EDT firing mode
+ */
public void addSelectionListener(SelectionChangedListener listener, FireMode fireMode) {
if (fireMode == FireMode.IN_EDT)
throw new UnsupportedOperationException("IN_EDT mode not supported, you probably want to use IN_EDT_CONSOLIDATED.");
@@ -68,6 +77,10 @@ public class SelectionEventManager implements SelectionChangedListener {
}
}
+ /**
+ * Unregisters a {@code SelectionChangedListener}.
+ * @param listener listener to remove
+ */
public void removeSelectionListener(SelectionChangedListener listener) {
ListenerInfo searchListener = new ListenerInfo(listener);
inEDTListeners.remove(searchListener);
diff --git a/src/org/openstreetmap/josm/data/osm/event/TagsChangedEvent.java b/src/org/openstreetmap/josm/data/osm/event/TagsChangedEvent.java
index c7c49c6..564a7cf 100644
--- a/src/org/openstreetmap/josm/data/osm/event/TagsChangedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/TagsChangedEvent.java
@@ -13,6 +13,12 @@ public class TagsChangedEvent extends AbstractDatasetChangedEvent {
private final OsmPrimitive primitive;
private final Map<String, String> originalKeys;
+ /**
+ * Constructs a new {@code TagsChangedEvent}.
+ * @param dataSet the dataset from which the event comes from
+ * @param primitive the primitive affected by the change
+ * @param originalKeys the original tags
+ */
public TagsChangedEvent(DataSet dataSet, OsmPrimitive primitive, Map<String, String> originalKeys) {
super(dataSet);
this.primitive = primitive;
@@ -24,6 +30,10 @@ public class TagsChangedEvent extends AbstractDatasetChangedEvent {
listener.tagsChanged(this);
}
+ /**
+ * Returns the primitive affected by the change.
+ * @return the primitive affected by the change
+ */
public OsmPrimitive getPrimitive() {
return primitive;
}
@@ -38,6 +48,10 @@ public class TagsChangedEvent extends AbstractDatasetChangedEvent {
return DatasetEventType.TAGS_CHANGED;
}
+ /**
+ * Returns the original tags.
+ * @return the original tags
+ */
public Map<String, String> getOriginalKeys() {
return originalKeys;
}
diff --git a/src/org/openstreetmap/josm/data/osm/event/WayNodesChangedEvent.java b/src/org/openstreetmap/josm/data/osm/event/WayNodesChangedEvent.java
index 36926e3..1318cdd 100644
--- a/src/org/openstreetmap/josm/data/osm/event/WayNodesChangedEvent.java
+++ b/src/org/openstreetmap/josm/data/osm/event/WayNodesChangedEvent.java
@@ -12,6 +12,11 @@ public class WayNodesChangedEvent extends AbstractDatasetChangedEvent {
private final Way way;
+ /**
+ * Constructs a new {@code WayNodesChangedEvent}.
+ * @param dataSet the dataset from which the event comes from
+ * @param way the way affected by the change
+ */
public WayNodesChangedEvent(DataSet dataSet, Way way) {
super(dataSet);
this.way = way;
@@ -22,6 +27,10 @@ public class WayNodesChangedEvent extends AbstractDatasetChangedEvent {
listener.wayNodesChanged(this);
}
+ /**
+ * Returns the way affected by the change.
+ * @return the way affected by the change
+ */
public Way getChangedWay() {
return way;
}
diff --git a/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java b/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java
index da40a71..fa85c2f 100644
--- a/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java
+++ b/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java
@@ -5,6 +5,7 @@ import java.util.Date;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.NodeData;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.User;
@@ -88,4 +89,16 @@ public class HistoryNode extends HistoryOsmPrimitive {
public String getDisplayName(HistoryNameFormatter formatter) {
return formatter.format(this);
}
+
+ /**
+ * Fills the node attributes with values from this history.
+ * @param data node data to fill
+ * @return filled node data
+ * @since 11878
+ */
+ public NodeData fillPrimitiveData(NodeData data) {
+ super.fillPrimitiveCommonData(data);
+ data.setCoor(coords);
+ return data;
+ }
}
diff --git a/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java b/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
index 514e820..8b42e40 100644
--- a/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
+++ b/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
@@ -12,10 +12,12 @@ import java.util.Locale;
import java.util.Map;
import java.util.Objects;
+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;
+import org.openstreetmap.josm.data.osm.PrimitiveData;
import org.openstreetmap.josm.data.osm.PrimitiveId;
import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
@@ -23,6 +25,7 @@ import org.openstreetmap.josm.data.osm.Tagged;
import org.openstreetmap.josm.data.osm.User;
import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.date.DateUtils;
/**
* Represents an immutable OSM primitive in the context of a historical view on OSM data.
@@ -84,8 +87,8 @@ public abstract class HistoryOsmPrimitive implements Tagged, Comparable<HistoryO
this.visible = visible;
this.user = user;
this.changesetId = changesetId;
- this.timestamp = timestamp;
- tags = new HashMap<>();
+ this.timestamp = DateUtils.cloneDate(timestamp);
+ this.tags = new HashMap<>();
}
/**
@@ -158,7 +161,7 @@ public abstract class HistoryOsmPrimitive implements Tagged, Comparable<HistoryO
* @return the timestamp
*/
public Date getTimestamp() {
- return timestamp;
+ return DateUtils.cloneDate(timestamp);
}
/**
@@ -169,16 +172,33 @@ public abstract class HistoryOsmPrimitive implements Tagged, Comparable<HistoryO
return version;
}
+ /**
+ * Checks that value is positive.
+ * @param value value to check
+ * @param name parameter name for error message
+ * @throws IllegalArgumentException if {@code value <= 0}
+ */
protected final void ensurePositiveLong(long value, String name) {
if (value <= 0) {
throw new IllegalArgumentException(MessageFormat.format("Parameter ''{0}'' > 0 expected. Got ''{1}''.", name, value));
}
}
+ /**
+ * Determines if this history matches given id and version.
+ * @param id Primitive identifier
+ * @param version Primitive version
+ * @return {@code true} if this history matches given id and version
+ */
public boolean matches(long id, long version) {
return this.id == id && this.version == version;
}
+ /**
+ * Determines if this history matches given id.
+ * @param id Primitive identifier
+ * @return {@code true} if this history matches given id
+ */
public boolean matches(long id) {
return this.id == id;
}
@@ -324,6 +344,22 @@ public abstract class HistoryOsmPrimitive implements Tagged, Comparable<HistoryO
return getName();
}
+ /**
+ * Fills the attributes common to all primitives with values from this history.
+ * @param data primitive data to fill
+ */
+ protected void fillPrimitiveCommonData(PrimitiveData data) {
+ data.setUser(user);
+ try {
+ data.setVisible(visible);
+ } catch (IllegalStateException e) {
+ Main.error(e, "Cannot change visibility for "+data+':');
+ }
+ data.setTimestamp(timestamp);
+ data.setKeys(tags);
+ data.setOsmId(id, (int) version);
+ }
+
@Override
public int hashCode() {
return Objects.hash(id, version);
@@ -334,8 +370,7 @@ public abstract class HistoryOsmPrimitive implements Tagged, Comparable<HistoryO
if (this == obj) return true;
if (obj == null || getClass() != obj.getClass()) return false;
HistoryOsmPrimitive that = (HistoryOsmPrimitive) obj;
- return id == that.id &&
- version == that.version;
+ return id == that.id && version == that.version;
}
@Override
diff --git a/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java b/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java
index a940252..b160aeb 100644
--- a/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java
+++ b/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java
@@ -9,6 +9,7 @@ import java.util.List;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationData;
import org.openstreetmap.josm.data.osm.RelationMemberData;
import org.openstreetmap.josm.data.osm.User;
import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -140,4 +141,16 @@ public class HistoryRelation extends HistoryOsmPrimitive {
public String getDisplayName(HistoryNameFormatter formatter) {
return formatter.format(this);
}
+
+ /**
+ * Fills the relation attributes with values from this history.
+ * @param data relation data to fill
+ * @return filled relation data
+ * @since 11878
+ */
+ public RelationData fillPrimitiveData(RelationData data) {
+ super.fillPrimitiveCommonData(data);
+ data.setMembers(members);
+ return data;
+ }
}
diff --git a/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java b/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java
index 4f691bd..c384721 100644
--- a/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java
+++ b/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java
@@ -11,6 +11,7 @@ import java.util.List;
import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
import org.openstreetmap.josm.data.osm.User;
import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.WayData;
import org.openstreetmap.josm.tools.CheckParameterUtil;
/**
@@ -142,4 +143,16 @@ public class HistoryWay extends HistoryOsmPrimitive {
public String getDisplayName(HistoryNameFormatter formatter) {
return formatter.format(this);
}
+
+ /**
+ * Fills the way attributes with values from this history.
+ * @param data way data to fill
+ * @return filled way data
+ * @since 11878
+ */
+ public WayData fillPrimitiveData(WayData data) {
+ super.fillPrimitiveCommonData(data);
+ data.setNodes(nodeIds);
+ return data;
+ }
}
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 83e90bb..a13b9d8 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/AbstractMapRenderer.java
@@ -222,11 +222,12 @@ public abstract class AbstractMapRenderer implements Rendering {
*/
public void visitVirtual(Path2D path, Way w) {
Iterator<Node> it = w.getNodes().iterator();
- if (it.hasNext()) {
- MapViewPoint lastP = mapState.getPointFor(it.next());
- while (it.hasNext()) {
- MapViewPoint p = mapState.getPointFor(it.next());
- if (isSegmentVisible(lastP, p) && isLargeSegment(lastP, p, virtualNodeSpace)) {
+ MapViewPoint lastP = null;
+ while (it.hasNext()) {
+ Node n = it.next();
+ if (n.isLatLonKnown()) {
+ MapViewPoint p = mapState.getPointFor(n);
+ if (lastP != null && isSegmentVisible(lastP, p) && isLargeSegment(lastP, p, virtualNodeSpace)) {
double x = (p.getInViewX()+lastP.getInViewX())/2;
double y = (p.getInViewY()+lastP.getInViewY())/2;
path.moveTo(x-virtualNodeSize, y);
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/ComputeStyleListWorker.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/ComputeStyleListWorker.java
new file mode 100644
index 0000000..0a415e4
--- /dev/null
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/ComputeStyleListWorker.java
@@ -0,0 +1,181 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm.visitor.paint;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.ForkJoinTask;
+import java.util.concurrent.RecursiveTask;
+
+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.Relation;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer.StyleRecord;
+import org.openstreetmap.josm.gui.NavigatableComponent;
+import org.openstreetmap.josm.gui.mappaint.ElemStyles;
+import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
+import org.openstreetmap.josm.gui.mappaint.StyleElementList;
+import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
+import org.openstreetmap.josm.gui.mappaint.styleelement.AreaElement;
+import org.openstreetmap.josm.gui.mappaint.styleelement.AreaIconElement;
+import org.openstreetmap.josm.gui.mappaint.styleelement.NodeElement;
+import org.openstreetmap.josm.gui.mappaint.styleelement.StyleElement;
+import org.openstreetmap.josm.gui.mappaint.styleelement.TextElement;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.bugreport.BugReport;
+
+/**
+ * Helper to compute style list.
+ * @since 11914 (extracted from StyledMapRenderer)
+ */
+public 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;
+ 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(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);
+ }
+
+ @Override
+ protected List<StyleRecord> compute() {
+ if (input.size() <= directExecutionTaskSize) {
+ return computeDirectly();
+ } else {
+ final Collection<ForkJoinTask<List<StyleRecord>>> tasks = new ArrayList<>();
+ for (int fromIndex = 0; fromIndex < input.size(); fromIndex += directExecutionTaskSize) {
+ final int toIndex = Math.min(fromIndex + directExecutionTaskSize, input.size());
+ tasks.add(new ComputeStyleListWorker(circum, nc, input.subList(fromIndex, toIndex),
+ new ArrayList<>(directExecutionTaskSize), directExecutionTaskSize).fork());
+ }
+ for (ForkJoinTask<List<StyleRecord>> task : tasks) {
+ output.addAll(task.join());
+ }
+ return output;
+ }
+ }
+
+ /**
+ * Compute directly (without using fork/join) the style list. Only called for small input.
+ * @return list of computed style records
+ */
+ public List<StyleRecord> computeDirectly() {
+ MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().lock();
+ try {
+ for (final OsmPrimitive osm : input) {
+ acceptDrawable(osm);
+ }
+ return output;
+ } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
+ throw BugReport.intercept(e).put("input-size", input.size()).put("output-size", output.size());
+ } finally {
+ MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().unlock();
+ }
+ }
+
+ private void acceptDrawable(final OsmPrimitive osm) {
+ try {
+ if (osm.isDrawable()) {
+ osm.accept(this);
+ }
+ } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
+ throw BugReport.intercept(e).put("osm", osm);
+ }
+ }
+
+ @Override
+ public void visit(Node n) {
+ add(n, StyledMapRenderer.computeFlags(n, false));
+ }
+
+ @Override
+ public void visit(Way w) {
+ add(w, StyledMapRenderer.computeFlags(w, true));
+ }
+
+ @Override
+ public void visit(Relation r) {
+ add(r, StyledMapRenderer.computeFlags(r, true));
+ }
+
+ @Override
+ public void visit(Changeset cs) {
+ throw new UnsupportedOperationException();
+ }
+
+ /**
+ * Add new style records for the given node.
+ * @param osm node
+ * @param flags flags
+ */
+ public void add(Node osm, int flags) {
+ StyleElementList sl = styles.get(osm, circum, nc);
+ for (StyleElement s : sl) {
+ output.add(new StyleRecord(s, osm, flags));
+ }
+ }
+
+ /**
+ * Add new style records for the given way.
+ * @param osm way
+ * @param flags flags
+ */
+ public void add(Way osm, int flags) {
+ StyleElementList sl = styles.get(osm, circum, nc);
+ for (StyleElement s : sl) {
+ if ((drawArea && (flags & StyledMapRenderer.FLAG_DISABLED) == 0) || !(s instanceof AreaElement)) {
+ output.add(new StyleRecord(s, osm, flags));
+ }
+ }
+ }
+
+ /**
+ * Add new style records for the given relation.
+ * @param osm relation
+ * @param flags flags
+ */
+ public void add(Relation osm, int flags) {
+ StyleElementList sl = styles.get(osm, circum, nc);
+ for (StyleElement s : sl) {
+ if (drawAreaElement(flags, s) ||
+ (drawMultipolygon && drawArea && s instanceof TextElement) ||
+ (drawRestriction && s instanceof NodeElement)) {
+ output.add(new StyleRecord(s, osm, flags));
+ }
+ }
+ }
+
+ private boolean drawAreaElement(int flags, StyleElement s) {
+ return drawMultipolygon && drawArea && (s instanceof AreaElement || s instanceof AreaIconElement)
+ && (flags & StyledMapRenderer.FLAG_DISABLED) == 0;
+ }
+}
diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/OffsetIterator.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/OffsetIterator.java
index 7f1387a..f594292 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/OffsetIterator.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/OffsetIterator.java
@@ -4,6 +4,7 @@ package org.openstreetmap.josm.data.osm.visitor.paint;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
+import java.util.stream.Collectors;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.gui.MapViewState;
@@ -41,7 +42,7 @@ public class OffsetIterator implements Iterator<MapViewPoint> {
*/
public OffsetIterator(MapViewState mapState, List<Node> nodes, double offset) {
this.mapState = mapState;
- this.nodes = nodes;
+ this.nodes = nodes.stream().filter(Node::isLatLonKnown).collect(Collectors.toList());
this.offset = offset;
idx = 0;
}
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 53bf94b..8438744 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
@@ -26,16 +26,14 @@ import java.awt.geom.Rectangle2D;
import java.awt.geom.RoundRectangle2D;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.ForkJoinTask;
-import java.util.concurrent.RecursiveTask;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Supplier;
@@ -47,7 +45,6 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.osm.BBox;
-import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -56,7 +53,6 @@ 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.Visitor;
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.MultipolygonCache;
@@ -68,12 +64,6 @@ import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
import org.openstreetmap.josm.gui.NavigatableComponent;
import org.openstreetmap.josm.gui.draw.MapViewPath;
import org.openstreetmap.josm.gui.draw.MapViewPositionAndRotation;
-import org.openstreetmap.josm.gui.mappaint.ElemStyles;
-import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
-import org.openstreetmap.josm.gui.mappaint.StyleElementList;
-import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
-import org.openstreetmap.josm.gui.mappaint.styleelement.AreaElement;
-import org.openstreetmap.josm.gui.mappaint.styleelement.AreaIconElement;
import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement;
import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement.HorizontalTextAlignment;
import org.openstreetmap.josm.gui.mappaint.styleelement.BoxTextElement.VerticalTextAlignment;
@@ -82,7 +72,6 @@ import org.openstreetmap.josm.gui.mappaint.styleelement.NodeElement;
import org.openstreetmap.josm.gui.mappaint.styleelement.RepeatImageElement.LineImageAlignment;
import org.openstreetmap.josm.gui.mappaint.styleelement.StyleElement;
import org.openstreetmap.josm.gui.mappaint.styleelement.Symbol;
-import org.openstreetmap.josm.gui.mappaint.styleelement.TextElement;
import org.openstreetmap.josm.gui.mappaint.styleelement.TextLabel;
import org.openstreetmap.josm.gui.mappaint.styleelement.placement.PositionForAreaStrategy;
import org.openstreetmap.josm.tools.CompositeList;
@@ -246,23 +235,23 @@ public class StyledMapRenderer extends AbstractMapRenderer {
* <p>
* Not used in any public interfaces.
*/
- private static final int FLAG_NORMAL = 0;
+ static final int FLAG_NORMAL = 0;
/**
* A primitive with {@link OsmPrimitive#isDisabled()}
*/
- private static final int FLAG_DISABLED = 1;
+ static final int FLAG_DISABLED = 1;
/**
* A primitive with {@link OsmPrimitive#isMemberOfSelected()}
*/
- private static final int FLAG_MEMBER_OF_SELECTED = 2;
+ static final int FLAG_MEMBER_OF_SELECTED = 2;
/**
* A primitive with {@link OsmPrimitive#isSelected()}
*/
- private static final int FLAG_SELECTED = 4;
+ static final int FLAG_SELECTED = 4;
/**
* A primitive with {@link OsmPrimitive#isOuterMemberOfSelected()}
*/
- private static final int FLAG_OUTERMEMBER_OF_SELECTED = 8;
+ static final int FLAG_OUTERMEMBER_OF_SELECTED = 8;
private static final double PHI = Math.toRadians(20);
private static final double cosPHI = Math.cos(PHI);
@@ -320,11 +309,8 @@ public class StyledMapRenderer extends AbstractMapRenderer {
*/
public StyledMapRenderer(Graphics2D g, NavigatableComponent nc, boolean isInactiveMode) {
super(g, nc, isInactiveMode);
-
- if (nc != null) {
- Component focusOwner = FocusManager.getCurrentManager().getFocusOwner();
- useWiderHighlight = !(focusOwner instanceof AbstractButton || focusOwner == nc);
- }
+ Component focusOwner = FocusManager.getCurrentManager().getFocusOwner();
+ useWiderHighlight = !(focusOwner instanceof AbstractButton || focusOwner == nc);
}
private void displaySegments(MapViewPath path, Path2D orientationArrows, Path2D onewayArrows, Path2D onewayArrowsCasing,
@@ -1456,14 +1442,15 @@ public class StyledMapRenderer extends AbstractMapRenderer {
Rectangle2D bounds = area.getBounds2D();
if (bounds.isEmpty()) return false;
MapViewPoint p = mapState.getPointFor(new EastNorth(bounds.getX(), bounds.getY()));
- if (p.getInViewX() > mapState.getViewWidth()) return false;
- if (p.getInViewY() < 0) return false;
+ if (p.getInViewY() < 0 || p.getInViewX() > mapState.getViewWidth()) return false;
p = mapState.getPointFor(new EastNorth(bounds.getX() + bounds.getWidth(), bounds.getY() + bounds.getHeight()));
- if (p.getInViewX() < 0) return false;
- if (p.getInViewY() > mapState.getViewHeight()) return false;
- return true;
+ return p.getInViewX() >= 0 && p.getInViewY() <= mapState.getViewHeight();
}
+ /**
+ * Determines if the paint visitor shall render OSM objects such that they look inactive.
+ * @return {@code true} if the paint visitor shall render OSM objects such that they look inactive
+ */
public boolean isInactiveMode() {
return isInactiveMode;
}
@@ -1496,132 +1483,6 @@ public class StyledMapRenderer extends AbstractMapRenderer {
}
}
- 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;
- 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(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);
- }
-
- @Override
- protected List<StyleRecord> compute() {
- if (input.size() <= directExecutionTaskSize) {
- return computeDirectly();
- } else {
- final Collection<ForkJoinTask<List<StyleRecord>>> tasks = new ArrayList<>();
- 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(circum, nc, input.subList(fromIndex, toIndex), output, directExecutionTaskSize).fork());
- }
- for (ForkJoinTask<List<StyleRecord>> task : tasks) {
- output.addAll(task.join());
- }
- return output;
- }
- }
-
- public List<StyleRecord> computeDirectly() {
- MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().lock();
- try {
- for (final OsmPrimitive osm : input) {
- acceptDrawable(osm);
- }
- return output;
- } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
- throw BugReport.intercept(e).put("input-size", input.size()).put("output-size", output.size());
- } finally {
- MapCSSStyleSource.STYLE_SOURCE_LOCK.readLock().unlock();
- }
- }
-
- private void acceptDrawable(final OsmPrimitive osm) {
- try {
- if (osm.isDrawable()) {
- osm.accept(this);
- }
- } catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
- throw BugReport.intercept(e).put("osm", osm);
- }
- }
-
- @Override
- public void visit(Node n) {
- add(n, computeFlags(n, false));
- }
-
- @Override
- public void visit(Way w) {
- add(w, computeFlags(w, true));
- }
-
- @Override
- public void visit(Relation r) {
- add(r, computeFlags(r, true));
- }
-
- @Override
- public void visit(Changeset cs) {
- throw new UnsupportedOperationException();
- }
-
- public void add(Node osm, int flags) {
- StyleElementList sl = styles.get(osm, circum, nc);
- for (StyleElement s : sl) {
- output.add(new StyleRecord(s, osm, flags));
- }
- }
-
- public void add(Relation osm, int flags) {
- StyleElementList sl = styles.get(osm, circum, nc);
- for (StyleElement s : sl) {
- if (drawMultipolygon && drawArea && (s instanceof AreaElement || s instanceof AreaIconElement) && (flags & FLAG_DISABLED) == 0) {
- output.add(new StyleRecord(s, osm, flags));
- } else if (drawMultipolygon && drawArea && s instanceof TextElement) {
- output.add(new StyleRecord(s, osm, flags));
- } else if (drawRestriction && s instanceof NodeElement) {
- output.add(new StyleRecord(s, osm, flags));
- }
- }
- }
-
- public void add(Way osm, int flags) {
- StyleElementList sl = styles.get(osm, circum, nc);
- for (StyleElement s : sl) {
- if ((drawArea && (flags & FLAG_DISABLED) == 0) || !(s instanceof AreaElement)) {
- output.add(new StyleRecord(s, osm, flags));
- }
- }
- }
- }
-
/**
* Sets the factory that creates the benchmark data receivers.
* @param benchmarkFactory The factory.
@@ -1661,13 +1522,15 @@ public class StyledMapRenderer extends AbstractMapRenderer {
return;
}
- Collections.sort(allStyleElems); // TODO: try parallel sort when switching to Java 8
+ // We use parallel sort here. This is only available for arrays.
+ StyleRecord[] sorted = allStyleElems.toArray(new StyleRecord[allStyleElems.size()]);
+ Arrays.parallelSort(sorted, null);
if (!benchmark.renderDraw(allStyleElems)) {
return;
}
- for (StyleRecord record : allStyleElems) {
+ for (StyleRecord record : sorted) {
paintRecord(record);
}
diff --git a/src/org/openstreetmap/josm/data/projection/AbstractProjection.java b/src/org/openstreetmap/josm/data/projection/AbstractProjection.java
index 8129cbc..f650743 100644
--- a/src/org/openstreetmap/josm/data/projection/AbstractProjection.java
+++ b/src/org/openstreetmap/josm/data/projection/AbstractProjection.java
@@ -115,7 +115,7 @@ public abstract class AbstractProjection implements Projection {
@Override
public EastNorth latlon2eastNorth(LatLon ll) {
ll = datum.fromWGS84(ll);
- double[] en = proj.project(Math.toRadians(ll.lat()), Math.toRadians(LatLon.normalizeLon(ll.lon() - lon0 - pm)));
+ double[] en = proj.project(Utils.toRadians(ll.lat()), Utils.toRadians(LatLon.normalizeLon(ll.lon() - lon0 - pm)));
return new EastNorth((ellps.a * k0 * en[0] + x0) / toMeter, (ellps.a * k0 * en[1] + y0) / toMeter);
}
@@ -134,8 +134,8 @@ public abstract class AbstractProjection implements Projection {
private LatLon eastNorth2latlon(EastNorth en, DoubleUnaryOperator normalizeLon) {
double[] latlonRad = proj.invproject((en.east() * toMeter - x0) / ellps.a / k0, (en.north() * toMeter - y0) / ellps.a / k0);
- double lon = Math.toDegrees(latlonRad[1]) + lon0 + pm;
- LatLon ll = new LatLon(Math.toDegrees(latlonRad[0]), normalizeLon.applyAsDouble(lon));
+ double lon = Utils.toDegrees(latlonRad[1]) + lon0 + pm;
+ LatLon ll = new LatLon(Utils.toDegrees(latlonRad[0]), normalizeLon.applyAsDouble(lon));
return datum.toWGS84(ll);
}
diff --git a/src/org/openstreetmap/josm/data/projection/CustomProjection.java b/src/org/openstreetmap/josm/data/projection/CustomProjection.java
index c58a776..a6a4b9c 100644
--- a/src/org/openstreetmap/josm/data/projection/CustomProjection.java
+++ b/src/org/openstreetmap/josm/data/projection/CustomProjection.java
@@ -169,7 +169,7 @@ public class CustomProjection extends AbstractProjection {
}
}
- private enum Polarity {
+ enum Polarity {
NORTH(LatLon.NORTH_POLE),
SOUTH(LatLon.SOUTH_POLE);
@@ -179,7 +179,7 @@ public class CustomProjection extends AbstractProjection {
this.latlon = latlon;
}
- private LatLon getLatLon() {
+ LatLon getLatLon() {
return latlon;
}
}
@@ -343,12 +343,13 @@ public class CustomProjection extends AbstractProjection {
*/
public static Map<String, String> parseParameterList(String pref, boolean ignoreUnknownParameter) throws ProjectionConfigurationException {
Map<String, String> parameters = new HashMap<>();
- if (pref.trim().isEmpty()) {
+ String trimmedPref = pref.trim();
+ if (trimmedPref.isEmpty()) {
return parameters;
}
Pattern keyPattern = Pattern.compile("\\+(?<key>[a-zA-Z0-9_]+)(=(?<value>.*))?");
- String[] parts = Utils.WHITE_SPACES_PATTERN.split(pref.trim());
+ String[] parts = Utils.WHITE_SPACES_PATTERN.split(trimmedPref);
for (String part : parts) {
Matcher m = keyPattern.matcher(part);
if (m.matches()) {
@@ -487,6 +488,13 @@ public class CustomProjection extends AbstractProjection {
return new NullDatum(null, ellps);
}
+ /**
+ * Parse {@code towgs84} parameter.
+ * @param paramList List of parameter arguments (expected: 3 or 7)
+ * @param ellps ellipsoid
+ * @return parsed datum ({@link ThreeParameterDatum} or {@link SevenParameterDatum})
+ * @throws ProjectionConfigurationException if the arguments cannot be parsed
+ */
public Datum parseToWGS84(String paramList, Ellipsoid ellps) throws ProjectionConfigurationException {
String[] numStr = paramList.split(",");
@@ -874,4 +882,19 @@ public class CustomProjection extends AbstractProjection {
}
return result;
}
+
+ @Override
+ public ProjectionBounds getEastNorthBoundsBox(ProjectionBounds box, Projection boxProjection) {
+ final int n = 8;
+ ProjectionBounds result = null;
+ for (int i = 0; i < 4*n; i++) {
+ EastNorth en = latlon2eastNorth(boxProjection.eastNorth2latlon(getPointAlong(i, n, box)));
+ if (result == null) {
+ result = new ProjectionBounds(en);
+ } else {
+ result.extend(en);
+ }
+ }
+ return result;
+ }
}
diff --git a/src/org/openstreetmap/josm/data/projection/Ellipsoid.java b/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
index ab54860..756fe61 100644
--- a/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
+++ b/src/org/openstreetmap/josm/data/projection/Ellipsoid.java
@@ -7,6 +7,7 @@
package org.openstreetmap.josm.data.projection;
import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.tools.Utils;
/**
* Reference ellipsoids.
@@ -338,7 +339,7 @@ public final class Ellipsoid {
delta = Math.abs(l - lt);
lt = l;
}
- return new LatLon(Math.toDegrees(lt), Math.toDegrees(lg));
+ return new LatLon(Utils.toDegrees(lt), Utils.toDegrees(lg));
}
/**
@@ -348,8 +349,8 @@ public final class Ellipsoid {
* @return the corresponding (X, Y Z) cartesian coordinates in meters.
*/
public double[] latLon2Cart(LatLon coord) {
- double phi = Math.toRadians(coord.lat());
- double lambda = Math.toRadians(coord.lon());
+ double phi = Utils.toRadians(coord.lat());
+ double lambda = Utils.toRadians(coord.lon());
double rn = a / Math.sqrt(1 - e2 * Math.pow(Math.sin(phi), 2));
double[] xyz = new double[3];
diff --git a/src/org/openstreetmap/josm/data/projection/Projection.java b/src/org/openstreetmap/josm/data/projection/Projection.java
index e2739d1..f1168ba 100644
--- a/src/org/openstreetmap/josm/data/projection/Projection.java
+++ b/src/org/openstreetmap/josm/data/projection/Projection.java
@@ -86,6 +86,22 @@ public interface Projection extends Projecting {
Bounds getLatLonBoundsBox(ProjectionBounds pb);
/**
+ * Get a box in east/north space of this projection, that fully contains an
+ * east/north box of another projection.
+ *
+ * Reprojecting a rectangular box from one projection to another may distort/rotate
+ * the shape of the box, so in general one needs to walk along the boundary
+ * in small steps to get a reliable result.
+ *
+ * This is an approximate method.
+ *
+ * @param box the east/north box given in projection <code>boxProjection</code>
+ * @param boxProjection the projection of <code>box</code>
+ * @return an east/north box in this projection, containing the given box
+ */
+ ProjectionBounds getEastNorthBoundsBox(ProjectionBounds box, Projection boxProjection);
+
+ /**
* Get the number of meters per unit of this projection. This more
* defines the scale of the map, than real conversion of unit to meters
* as this value is more less correct only along certain lines of true scale.
diff --git a/src/org/openstreetmap/josm/data/projection/Projections.java b/src/org/openstreetmap/josm/data/projection/Projections.java
index 8a17dfc..c33cbed 100644
--- a/src/org/openstreetmap/josm/data/projection/Projections.java
+++ b/src/org/openstreetmap/josm/data/projection/Projections.java
@@ -83,11 +83,11 @@ public final class Projections {
*
* should be compatible to PROJ.4
*/
- static final Map<String, ProjFactory> projs = new HashMap<>();
- static final Map<String, Ellipsoid> ellipsoids = new HashMap<>();
- static final Map<String, Datum> datums = new HashMap<>();
- static final Map<String, NTV2GridShiftFileWrapper> nadgrids = new HashMap<>();
- static final Map<String, ProjectionDefinition> inits;
+ private static final Map<String, ProjFactory> projs = new HashMap<>();
+ private static final Map<String, Ellipsoid> ellipsoids = new HashMap<>();
+ private static final Map<String, Datum> datums = new HashMap<>();
+ private static final Map<String, NTV2GridShiftFileWrapper> nadgrids = new HashMap<>();
+ private static final Map<String, ProjectionDefinition> inits;
static {
registerBaseProjection("aea", AlbersEqualArea.class, "core");
diff --git a/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java b/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java
index 65c28d7..fe20b37 100644
--- a/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java
+++ b/src/org/openstreetmap/josm/data/projection/datum/SevenParameterDatum.java
@@ -3,6 +3,7 @@ package org.openstreetmap.josm.data.projection.datum;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.projection.Ellipsoid;
+import org.openstreetmap.josm.tools.Utils;
/**
* Datum provides general conversion from one ellipsoid to another.
@@ -38,9 +39,9 @@ public class SevenParameterDatum extends AbstractDatum {
this.dx = dx;
this.dy = dy;
this.dz = dz;
- this.rx = Math.toRadians(rx / 3600);
- this.ry = Math.toRadians(ry / 3600);
- this.rz = Math.toRadians(rz / 3600);
+ this.rx = Utils.toRadians(rx / 3600);
+ this.ry = Utils.toRadians(ry / 3600);
+ this.rz = Utils.toRadians(rz / 3600);
this.s = s / 1e6;
}
diff --git a/src/org/openstreetmap/josm/data/projection/proj/AlbersEqualArea.java b/src/org/openstreetmap/josm/data/projection/proj/AlbersEqualArea.java
index d7baa4c..8a7021e 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/AlbersEqualArea.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/AlbersEqualArea.java
@@ -5,6 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.projection.ProjectionConfigurationException;
+import org.openstreetmap.josm.tools.Utils;
/**
* Albers Equal Area Projection (EPSG code 9822). This is a conic projection with parallels being
@@ -88,10 +89,10 @@ public class AlbersEqualArea extends AbstractProj {
if (params.lat1 == null)
throw new ProjectionConfigurationException(tr("Parameter ''{0}'' required.", "lat_1"));
- double lat0 = Math.toRadians(params.lat0);
+ double lat0 = Utils.toRadians(params.lat0);
// Standards parallels in radians.
- double phi1 = Math.toRadians(params.lat1);
- double phi2 = params.lat2 == null ? phi1 : Math.toRadians(params.lat2);
+ double phi1 = Utils.toRadians(params.lat1);
+ double phi2 = params.lat2 == null ? phi1 : Utils.toRadians(params.lat2);
// Compute Constants
if (Math.abs(phi1 + phi2) < EPSILON) {
diff --git a/src/org/openstreetmap/josm/data/projection/proj/CassiniSoldner.java b/src/org/openstreetmap/josm/data/projection/proj/CassiniSoldner.java
index ca018c7..3622ed6 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/CassiniSoldner.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/CassiniSoldner.java
@@ -5,6 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.projection.ProjectionConfigurationException;
+import org.openstreetmap.josm.tools.Utils;
/**
* Cassini-Soldner Projection (EPSG code 9806).
@@ -55,7 +56,7 @@ public class CassiniSoldner extends AbstractProj {
super.initialize(params);
if (params.lat0 == null)
throw new ProjectionConfigurationException(tr("Parameter ''{0}'' required.", "lat_0"));
- double latitudeOfOrigin = Math.toRadians(params.lat0);
+ double latitudeOfOrigin = Utils.toRadians(params.lat0);
ml0 = mlfn(latitudeOfOrigin, Math.sin(latitudeOfOrigin), Math.cos(latitudeOfOrigin));
}
diff --git a/src/org/openstreetmap/josm/data/projection/proj/DoubleStereographic.java b/src/org/openstreetmap/josm/data/projection/proj/DoubleStereographic.java
index 032daff..3d4a0d3 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/DoubleStereographic.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/DoubleStereographic.java
@@ -12,12 +12,12 @@ import static java.lang.Math.pow;
import static java.lang.Math.sin;
import static java.lang.Math.sqrt;
import static java.lang.Math.tan;
-import static java.lang.Math.toRadians;
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.Utils;
/**
* Implementation of the stereographic double projection,
@@ -58,7 +58,7 @@ public class DoubleStereographic extends AbstractProj {
}
private void initialize(double lat0) {
- double phi0 = toRadians(lat0);
+ double phi0 = Utils.toRadians(lat0);
double e2 = ellps.e2;
r = sqrt(1-e2) / (1 - e2*pow(sin(phi0), 2));
n = sqrt(1 + ellps.eb2 * pow(cos(phi0), 4));
diff --git a/src/org/openstreetmap/josm/data/projection/proj/LambertAzimuthalEqualArea.java b/src/org/openstreetmap/josm/data/projection/proj/LambertAzimuthalEqualArea.java
index 0dbb821..3cb598d 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/LambertAzimuthalEqualArea.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/LambertAzimuthalEqualArea.java
@@ -5,6 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.projection.ProjectionConfigurationException;
+import org.openstreetmap.josm.tools.Utils;
/**
* Lambert Azimuthal Equal Area (EPSG code 9820).
@@ -77,7 +78,7 @@ public class LambertAzimuthalEqualArea extends AbstractProj {
if (params.lat0 == null)
throw new ProjectionConfigurationException(tr("Parameter ''{0}'' required.", "lat_0"));
- latitudeOfOrigin = Math.toRadians(params.lat0);
+ latitudeOfOrigin = Utils.toRadians(params.lat0);
/*
* Detects the mode (oblique, etc.).
*/
diff --git a/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java b/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java
index acf1087..025e168 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/LambertConformalConic.java
@@ -11,13 +11,13 @@ import static java.lang.Math.pow;
import static java.lang.Math.sin;
import static java.lang.Math.sqrt;
import static java.lang.Math.tan;
-import static java.lang.Math.toRadians;
import static org.openstreetmap.josm.tools.I18n.tr;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.projection.CustomProjection.Param;
import org.openstreetmap.josm.data.projection.Ellipsoid;
import org.openstreetmap.josm.data.projection.ProjectionConfigurationException;
+import org.openstreetmap.josm.tools.Utils;
/**
* Implementation of the Lambert Conformal Conic projection.
@@ -26,26 +26,53 @@ import org.openstreetmap.josm.data.projection.ProjectionConfigurationException;
*/
public class LambertConformalConic extends AbstractProj {
+ /** ellipsoid */
protected Ellipsoid ellps;
- public abstract static class Parameters {
+ /**
+ * Base class of Lambert Conformal Conic parameters.
+ */
+ public static class Parameters {
+ /** latitude of origin */
public final double latitudeOrigin;
- public Parameters(double latitudeOrigin) {
+ /**
+ * Constructs a new {@code Parameters}.
+ * @param latitudeOrigin latitude of origin
+ */
+ protected Parameters(double latitudeOrigin) {
this.latitudeOrigin = latitudeOrigin;
}
}
+ /**
+ * Parameters with a single standard parallel.
+ */
public static class Parameters1SP extends Parameters {
+ /**
+ * Constructs a new {@code Parameters1SP}.
+ * @param latitudeOrigin latitude of origin
+ */
public Parameters1SP(double latitudeOrigin) {
super(latitudeOrigin);
}
}
+ /**
+ * Parameters with two standard parallels.
+ */
public static class Parameters2SP extends Parameters {
+ /** first standard parallel */
public final double standardParallel1;
+ /** second standard parallel */
public final double standardParallel2;
+ /**
+ * Constructs a new {@code Parameters2SP}.
+ * @param latitudeOrigin latitude of origin
+ * @param standardParallel1 first standard parallel
+ * @param standardParallel2 second standard parallel
+ */
public Parameters2SP(double latitudeOrigin, double standardParallel1, double standardParallel2) {
super(latitudeOrigin);
this.standardParallel1 = standardParallel1;
@@ -97,12 +124,12 @@ public class LambertConformalConic extends AbstractProj {
private void initialize2SP(double lat0, double lat1, double lat2) {
this.params = new Parameters2SP(lat0, lat1, lat2);
- final double m1 = m(toRadians(lat1));
- final double m2 = m(toRadians(lat2));
+ final double m1 = m(Utils.toRadians(lat1));
+ final double m2 = m(Utils.toRadians(lat2));
- final double t1 = t(toRadians(lat1));
- final double t2 = t(toRadians(lat2));
- final double tf = t(toRadians(lat0));
+ final double t1 = t(Utils.toRadians(lat1));
+ final double t2 = t(Utils.toRadians(lat2));
+ final double tf = t(Utils.toRadians(lat0));
n = (log(m1) - log(m2)) / (log(t1) - log(t2));
f = m1 / (n * pow(t1, n));
@@ -116,7 +143,7 @@ public class LambertConformalConic extends AbstractProj {
*/
private void initialize1SP(double lat0) {
this.params = new Parameters1SP(lat0);
- final double lat0rad = toRadians(lat0);
+ final double lat0rad = Utils.toRadians(lat0);
final double m0 = m(lat0rad);
final double t0 = t(lat0rad);
@@ -176,6 +203,10 @@ public class LambertConformalConic extends AbstractProj {
return new double[] {phi, lambda};
}
+ /**
+ * Returns projection parameters.
+ * @return projection parameters
+ */
public final Parameters getParameters() {
return params;
}
diff --git a/src/org/openstreetmap/josm/data/projection/proj/LonLat.java b/src/org/openstreetmap/josm/data/projection/proj/LonLat.java
index 652aa83..9bee415 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/LonLat.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/LonLat.java
@@ -6,6 +6,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.projection.ProjectionConfigurationException;
import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
/**
* Simple Lat/Lon (pseudo-)projection.
@@ -33,12 +34,12 @@ public class LonLat implements Proj {
@Override
public double[] project(double latRad, double lonRad) {
- return new double[] {Math.toDegrees(lonRad) / a, Math.toDegrees(latRad) / a};
+ return new double[] {Utils.toDegrees(lonRad) / a, Utils.toDegrees(latRad) / a};
}
@Override
public double[] invproject(double east, double north) {
- return new double[] {Math.toRadians(north * a), Math.toRadians(east * a)};
+ return new double[] {Utils.toRadians(north * a), Utils.toRadians(east * a)};
}
@Override
diff --git a/src/org/openstreetmap/josm/data/projection/proj/Mercator.java b/src/org/openstreetmap/josm/data/projection/proj/Mercator.java
index 592d9ef..afc3155 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/Mercator.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/Mercator.java
@@ -5,6 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.projection.ProjectionConfigurationException;
+import org.openstreetmap.josm.tools.Utils;
/**
* Mercator Cylindrical Projection. The parallels and the meridians are straight lines and
@@ -68,7 +69,7 @@ public class Mercator extends AbstractProj implements IScaleFactorProvider {
* scaleFactor is not a parameter in the 2 SP case and is computed from
* the standard parallel.
*/
- double standardParallel = Math.toRadians(params.lat_ts);
+ double standardParallel = Utils.toRadians(params.lat_ts);
if (spherical) {
scaleFactor *= Math.cos(standardParallel);
} else {
@@ -80,7 +81,7 @@ public class Mercator extends AbstractProj implements IScaleFactorProvider {
* correspondent to the equator. See Snyder and al. for reference, page 47.
*/
if (params.lat0 != null) {
- final double lat0 = Math.toRadians(params.lat0);
+ final double lat0 = Utils.toRadians(params.lat0);
final double sinPhi = Math.sin(lat0);
scaleFactor *= (Math.cos(lat0) / (Math.sqrt(1 - e2 * sinPhi * sinPhi)));
}
diff --git a/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java b/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
index 3f0877e..952a338 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/ObliqueMercator.java
@@ -6,6 +6,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.projection.ProjectionConfigurationException;
+import org.openstreetmap.josm.tools.Utils;
/**
* Oblique Mercator Projection. A conformal, oblique, cylindrical projection with the cylinder
@@ -227,7 +228,7 @@ public class ObliqueMercator extends AbstractProj implements ICentralMeridianPro
double latCenter = 0;
if (params.lat0 != null) {
- latCenter = Math.toRadians(params.lat0);
+ latCenter = Utils.toRadians(params.lat0);
}
final double com = Math.sqrt(1.0 - e2);
@@ -268,10 +269,10 @@ public class ObliqueMercator extends AbstractProj implements ICentralMeridianPro
if (params.lat2 == null)
throw new ProjectionConfigurationException(tr("Parameter ''{0}'' required.", "lat_2"));
referencePoint = new LatLon(params.lat1, params.lat2);
- double lon1 = Math.toRadians(params.lon1);
- double lat1 = Math.toRadians(params.lat1);
- double lon2 = Math.toRadians(params.lon2);
- double lat2 = Math.toRadians(params.lat2);
+ double lon1 = Utils.toRadians(params.lon1);
+ double lat1 = Utils.toRadians(params.lat1);
+ double lon2 = Utils.toRadians(params.lon2);
+ double lat2 = Utils.toRadians(params.lat2);
if (Math.abs(lat1 - lat2) <= EPSILON ||
Math.abs(lat1) <= EPSILON ||
@@ -311,8 +312,8 @@ public class ObliqueMercator extends AbstractProj implements ICentralMeridianPro
throw new ProjectionConfigurationException(tr("Parameter ''{0}'' required.", "alpha"));
referencePoint = new LatLon(params.lat0, params.lonc);
- lonCenter = Math.toRadians(params.lonc);
- azimuth = Math.toRadians(params.alpha);
+ lonCenter = Utils.toRadians(params.lonc);
+ azimuth = Utils.toRadians(params.alpha);
// CHECKSTYLE.OFF: SingleSpaceSeparator
if ((azimuth > -1.5*Math.PI && azimuth < -0.5*Math.PI) ||
(azimuth > 0.5*Math.PI && azimuth < 1.5*Math.PI)) {
@@ -321,7 +322,7 @@ public class ObliqueMercator extends AbstractProj implements ICentralMeridianPro
}
// CHECKSTYLE.ON: SingleSpaceSeparator
if (params.gamma != null) {
- rectifiedGridAngle = Math.toRadians(params.gamma);
+ rectifiedGridAngle = Utils.toRadians(params.gamma);
} else {
rectifiedGridAngle = azimuth;
}
@@ -370,7 +371,7 @@ public class ObliqueMercator extends AbstractProj implements ICentralMeridianPro
}
private static double normalizeLonRad(double a) {
- return Math.toRadians(LatLon.normalizeLon(Math.toDegrees(a)));
+ return Utils.toRadians(LatLon.normalizeLon(Utils.toDegrees(a)));
}
@Override
@@ -434,13 +435,13 @@ public class ObliqueMercator extends AbstractProj implements ICentralMeridianPro
// bounds should be configured explicitly.
double lat = referencePoint.lat();
double dLat = 3.0;
- double lon = referencePoint.lon() - Math.toDegrees(centralMeridian);
+ double lon = referencePoint.lon() - Utils.toDegrees(centralMeridian);
double dLon = 3.0;
return new Bounds(lat - dLat, lon - dLon, lat + dLat, lon + dLon, false);
}
@Override
public double getCentralMeridian() {
- return Math.toDegrees(centralMeridian);
+ return Utils.toDegrees(centralMeridian);
}
}
diff --git a/src/org/openstreetmap/josm/data/projection/proj/PolarStereographic.java b/src/org/openstreetmap/josm/data/projection/proj/PolarStereographic.java
index ab05a40..09c3408 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/PolarStereographic.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/PolarStereographic.java
@@ -5,6 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.projection.ProjectionConfigurationException;
+import org.openstreetmap.josm.tools.Utils;
/**
* The polar case of the stereographic projection.
@@ -106,7 +107,7 @@ public class PolarStereographic extends AbstractProj {
if (params.lat_ts == null) {
latitudeTrueScale = (params.lat0 < 0) ? -Math.PI/2 : Math.PI/2;
} else {
- latitudeTrueScale = Math.toRadians(params.lat_ts);
+ latitudeTrueScale = Utils.toRadians(params.lat_ts);
}
southPole = latitudeTrueScale < 0;
diff --git a/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java b/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java
index d1f27a7..934b7d0 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/SwissObliqueMercator.java
@@ -13,13 +13,13 @@ import static java.lang.Math.pow;
import static java.lang.Math.sin;
import static java.lang.Math.sqrt;
import static java.lang.Math.tan;
-import static java.lang.Math.toRadians;
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;
+import org.openstreetmap.josm.tools.Utils;
// CHECKSTYLE.OFF: LineLength
@@ -57,7 +57,7 @@ public class SwissObliqueMercator extends AbstractProj {
}
private void initialize(double lat0) {
- phi0 = toRadians(lat0);
+ phi0 = Utils.toRadians(lat0);
kR = sqrt(1 - ellps.e2) / (1 - (ellps.e2 * pow(sin(phi0), 2)));
alpha = sqrt(1 + (ellps.eb2 * pow(cos(phi0), 4)));
b0 = asin(sin(phi0) / alpha);
diff --git a/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java b/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java
index 785aa43..b942bed 100644
--- a/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java
+++ b/src/org/openstreetmap/josm/data/projection/proj/TransverseMercator.java
@@ -6,6 +6,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.data.projection.ProjectionConfigurationException;
import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
/**
* Transverse Mercator Projection (EPSG code 9807). This
@@ -135,11 +136,11 @@ public class TransverseMercator extends AbstractProj {
CheckParameterUtil.ensureParameterNotNull(params, "params");
CheckParameterUtil.ensureParameterNotNull(params.ellps, "params.ellps");
eb2 = params.ellps.eb2;
- latitudeOfOrigin = params.lat0 == null ? 0 : Math.toRadians(params.lat0);
+ latitudeOfOrigin = params.lat0 == null ? 0 : Utils.toRadians(params.lat0);
ml0 = mlfn(latitudeOfOrigin, Math.sin(latitudeOfOrigin), Math.cos(latitudeOfOrigin));
if (params.gamma != null) {
- rectifiedGridAngle = Math.toRadians(params.gamma);
+ rectifiedGridAngle = Utils.toRadians(params.gamma);
} else {
rectifiedGridAngle = 0.0;
}
diff --git a/src/org/openstreetmap/josm/data/validation/OsmValidator.java b/src/org/openstreetmap/josm/data/validation/OsmValidator.java
index 9aff42f..5c273f8 100644
--- a/src/org/openstreetmap/josm/data/validation/OsmValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/OsmValidator.java
@@ -74,13 +74,13 @@ public final class OsmValidator {
// Hide default constructor for utilities classes
}
- public static volatile ValidatorLayer errorLayer;
+ private static volatile ValidatorLayer errorLayer;
/** The validate action */
public static final ValidateAction validateAction = new ValidateAction();
/** Grid detail, multiplier of east,north values for valuable cell sizing */
- public static double griddetail;
+ private static double griddetail;
private static final Collection<String> ignoredErrors = new TreeSet<>();
@@ -214,6 +214,9 @@ public final class OsmValidator {
}
}
+ /**
+ * Initializes error layer.
+ */
public static synchronized void initializeErrorLayer() {
if (!ValidatorPreference.PREF_LAYER.get())
return;
@@ -224,6 +227,14 @@ public final class OsmValidator {
}
/**
+ * Resets error layer.
+ * @since 11852
+ */
+ public static synchronized void resetErrorLayer() {
+ errorLayer = null;
+ }
+
+ /**
* Gets a map from simple names to all tests.
* @return A map of all tests, indexed and sorted by the name of their Java class
*/
@@ -304,6 +315,15 @@ public final class OsmValidator {
}
}
+ /**
+ * Returns grid detail, multiplier of east,north values for valuable cell sizing
+ * @return grid detail
+ * @since 11852
+ */
+ public static double getGridDetail() {
+ return griddetail;
+ }
+
private static boolean testsInitialized;
/**
diff --git a/src/org/openstreetmap/josm/data/validation/PaintVisitor.java b/src/org/openstreetmap/josm/data/validation/PaintVisitor.java
index 18181ae..ae6086b 100644
--- a/src/org/openstreetmap/josm/data/validation/PaintVisitor.java
+++ b/src/org/openstreetmap/josm/data/validation/PaintVisitor.java
@@ -224,8 +224,7 @@ public class PaintVisitor extends AbstractVisitor implements ValidatorVisitor {
/**
* Checks if the given segment is in the visible area.
- * NOTE: This will return true for a small number of non-visible
- * segments.
+ * NOTE: This will return true for a small number of non-visible segments.
* @param n1 The first point of the segment to check
* @param n2 The second point of the segment to check
* @return {@code true} if the segment is visible
@@ -233,15 +232,10 @@ public class PaintVisitor extends AbstractVisitor implements ValidatorVisitor {
protected boolean isSegmentVisible(Node n1, Node n2) {
Point p1 = mv.getPoint(n1);
Point p2 = mv.getPoint(n2);
- if ((p1.x < 0) && (p2.x < 0))
- return false;
- if ((p1.y < 0) && (p2.y < 0))
- return false;
- if ((p1.x > mv.getWidth()) && (p2.x > mv.getWidth()))
- return false;
- if ((p1.y > mv.getHeight()) && (p2.y > mv.getHeight()))
- return false;
- return true;
+ return (p1.x >= 0 || p2.x >= 0)
+ && (p1.y >= 0 || p2.y >= 0)
+ && (p1.x <= mv.getWidth() || p2.x <= mv.getWidth())
+ && (p1.y <= mv.getHeight() || p2.y <= mv.getHeight());
}
@Override
diff --git a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
index e5863bd..ec90b16 100644
--- a/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
@@ -295,7 +295,7 @@ public final class DomainValidator extends AbstractValidator {
// WARNING: this array MUST be sorted, otherwise it cannot be searched reliably using binary search
private static final String[] GENERIC_TLDS = new String[] {
- // Taken from Version 2017021900, Last Updated Sun Feb 19 07:07:01 2017 UTC
+ // Taken from Version 2017040800, Last Updated Sat Apr 8 07:07:01 2017 UTC
"aaa", // aaa American Automobile Association, Inc.
"aarp", // aarp AARP
"abarth", // abarth Fiat Chrysler Automobiles N.V.
@@ -785,6 +785,7 @@ public final class DomainValidator extends AbstractValidator {
"hosting", // hosting Uniregistry, Corp.
"hot", // hot Amazon Registry Services, Inc.
"hoteles", // hoteles Travel Reservations SRL
+ "hotels", // hotels Booking.com B.V.
"hotmail", // hotmail Microsoft Corporation
"house", // house Sugar Park, LLC
"how", // how Charleston Road Registry Inc.
@@ -1052,7 +1053,6 @@ public final class DomainValidator extends AbstractValidator {
"orange", // orange Orange Brand Services Limited
"org", // org Public Interest Registry (PIR)
"organic", // organic Afilias Limited
- "orientexpress", // orientexpress Orient Express
"origins", // origins The Estée Lauder Companies Inc.
"osaka", // osaka Interlink Co., Ltd.
"otsuka", // otsuka Otsuka Holdings Co., Ltd.
@@ -1162,6 +1162,7 @@ public final class DomainValidator extends AbstractValidator {
"rogers", // rogers Rogers Communications Canada Inc.
"room", // room Amazon Registry Services, Inc.
"rsvp", // rsvp Charleston Road Registry Inc.
+ "rugby", // rugby World Rugby Strategic Developments Limited
"ruhr", // ruhr regiodot GmbH & Co. KG
"run", // run Snow Park, LLC
"rwe", // rwe RWE AG
@@ -2011,7 +2012,7 @@ public final class DomainValidator extends AbstractValidator {
}
try {
final String ascii = IDN.toASCII(input);
- if (IDNBUGHOLDER.IDN_TOASCII_PRESERVES_TRAILING_DOTS) {
+ if (IdnBugHolder.IDN_TOASCII_PRESERVES_TRAILING_DOTS) {
return ascii;
}
final int length = input.length();
@@ -2039,7 +2040,7 @@ public final class DomainValidator extends AbstractValidator {
}
}
- private static class IDNBUGHOLDER {
+ private static class IdnBugHolder {
private static boolean keepsTrailingDot() {
final String input = "a."; // must be a valid name
return input.equals(IDN.toASCII(input));
diff --git a/src/org/openstreetmap/josm/data/validation/routines/InetAddressValidator.java b/src/org/openstreetmap/josm/data/validation/routines/InetAddressValidator.java
index d443964..4ec22b0 100644
--- a/src/org/openstreetmap/josm/data/validation/routines/InetAddressValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/routines/InetAddressValidator.java
@@ -180,7 +180,7 @@ public class InetAddressValidator extends AbstractValidator {
}
int octetInt = 0;
try {
- octetInt = Integer.valueOf(octet, BASE_16).intValue();
+ octetInt = Integer.parseInt(octet, BASE_16);
} catch (NumberFormatException e) {
return false;
}
@@ -190,9 +190,6 @@ public class InetAddressValidator extends AbstractValidator {
}
validOctets++;
}
- if (validOctets < IPV6_MAX_HEX_GROUPS && !containsCompressedZeroes) {
- return false;
- }
- return true;
+ return validOctets >= IPV6_MAX_HEX_GROUPS || containsCompressedZeroes;
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java b/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java
index f41fc32..af32cbb 100644
--- a/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java
+++ b/src/org/openstreetmap/josm/data/validation/routines/UrlValidator.java
@@ -23,6 +23,7 @@ import java.net.URISyntaxException;
import java.util.Collections;
import java.util.HashSet;
import java.util.Locale;
+import java.util.Optional;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -371,11 +372,7 @@ public class UrlValidator extends AbstractValidator {
return false;
}
- if (isOff(ALLOW_ALL_SCHEMES) && !allowedSchemes.contains(scheme.toLowerCase(Locale.ENGLISH))) {
- return false;
- }
-
- return true;
+ return isOn(ALLOW_ALL_SCHEMES) || allowedSchemes.contains(scheme.toLowerCase(Locale.ENGLISH));
}
/**
@@ -427,12 +424,7 @@ public class UrlValidator extends AbstractValidator {
}
}
- String extra = authorityMatcher.group(PARSE_AUTHORITY_EXTRA);
- if (extra != null && !extra.trim().isEmpty()) {
- return false;
- }
-
- return true;
+ return Optional.ofNullable(authorityMatcher.group(PARSE_AUTHORITY_EXTRA)).orElse("").trim().isEmpty();
}
/**
@@ -461,12 +453,7 @@ public class UrlValidator extends AbstractValidator {
return false;
}
- int slash2Count = countToken("//", path);
- if (slash2Count > 0 && isOff(ALLOW_2_SLASHES)) {
- return false;
- }
-
- return true;
+ return isOn(ALLOW_2_SLASHES) || countToken("//", path) <= 0;
}
/**
diff --git a/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java b/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
index a45c052..b0e7407 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/CrossingWays.java
@@ -31,9 +31,9 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor;
public abstract class CrossingWays extends Test {
protected static final int CROSSING_WAYS = 601;
- private static final String HIGHWAY = "highway";
- private static final String RAILWAY = "railway";
- private static final String WATERWAY = "waterway";
+ static final String HIGHWAY = "highway";
+ static final String RAILWAY = "railway";
+ static final String WATERWAY = "waterway";
/** All way segments, grouped by cells */
private final Map<Point2D, List<WaySegment>> cellSegments = new HashMap<>(1000);
@@ -83,10 +83,7 @@ public abstract class CrossingWays extends Test {
|| (w2.hasTag(WATERWAY, "river", "stream", "canal", "drain", "ditch") && w1.hasTag(WATERWAY, "riverbank"))) {
return true;
}
- if (isProposedOrAbandoned(w2)) {
- return true;
- }
- return false;
+ return isProposedOrAbandoned(w2);
}
@Override
@@ -159,10 +156,7 @@ public abstract class CrossingWays extends Test {
@Override
boolean ignoreWaySegmentCombination(Way w1, Way w2) {
- if (!Objects.equals(getLayer(w1), getLayer(w2))) {
- return true;
- }
- return false;
+ return !Objects.equals(getLayer(w1), getLayer(w2));
}
@Override
@@ -322,7 +316,7 @@ public abstract class CrossingWays extends Test {
public static List<List<WaySegment>> getSegments(Map<Point2D, List<WaySegment>> cellSegments, EastNorth n1, EastNorth n2) {
List<List<WaySegment>> cells = new ArrayList<>();
- for (Point2D cell : ValUtil.getSegmentCells(n1, n2, OsmValidator.griddetail)) {
+ for (Point2D cell : ValUtil.getSegmentCells(n1, n2, OsmValidator.getGridDetail())) {
List<WaySegment> segments = cellSegments.get(cell);
if (segments == null) {
segments = new ArrayList<>();
diff --git a/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java b/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
index c143956..2646d9d 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
@@ -1,6 +1,9 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.validation.tests;
+import static org.openstreetmap.josm.data.validation.tests.CrossingWays.HIGHWAY;
+import static org.openstreetmap.josm.data.validation.tests.CrossingWays.RAILWAY;
+import static org.openstreetmap.josm.data.validation.tests.CrossingWays.WATERWAY;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.ArrayList;
@@ -98,7 +101,7 @@ public class DuplicateNode extends Test {
protected static final int DUPLICATE_NODE_WATERWAY = 17;
private static final String[] TYPES = {
- "none", "highway", "railway", "waterway", "boundary", "power", "natural", "landuse", "building"};
+ "none", HIGHWAY, RAILWAY, WATERWAY, "boundary", "power", "natural", "landuse", "building"};
/** The map of potential duplicates.
*
@@ -209,17 +212,17 @@ public class DuplicateNode extends Test {
.message(tr("Mixed type duplicated nodes"))
.primitives(primitives)
.build());
- } else if (typeMap.get("highway")) {
+ } else if (typeMap.get(HIGHWAY)) {
errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_HIGHWAY)
.message(tr("Highway duplicated nodes"))
.primitives(primitives)
.build());
- } else if (typeMap.get("railway")) {
+ } else if (typeMap.get(RAILWAY)) {
errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_RAILWAY)
.message(tr("Railway duplicated nodes"))
.primitives(primitives)
.build());
- } else if (typeMap.get("waterway")) {
+ } else if (typeMap.get(WATERWAY)) {
errors.add(TestError.builder(parentTest, Severity.ERROR, DUPLICATE_NODE_WATERWAY)
.message(tr("Waterway duplicated nodes"))
.primitives(primitives)
@@ -342,8 +345,7 @@ public class DuplicateNode extends Test {
if (testError.getCode() == DUPLICATE_NODE) return false;
// cannot merge nodes outside download area
final Iterator<? extends OsmPrimitive> it = testError.getPrimitives().iterator();
- if (!it.hasNext() || it.next().isOutsideDownloadArea()) return false;
+ return it.hasNext() && !it.next().isOutsideDownloadArea();
// everything else is ok to merge
- return true;
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/Highways.java b/src/org/openstreetmap/josm/data/validation/tests/Highways.java
index a3ba0e6..972d6a8 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/Highways.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/Highways.java
@@ -1,6 +1,7 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.validation.tests;
+import static org.openstreetmap.josm.data.validation.tests.CrossingWays.HIGHWAY;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.ArrayList;
@@ -76,7 +77,8 @@ public class Highways extends Test {
public void visit(Node n) {
if (n.isUsable()) {
if (!n.hasTag("crossing", "no")
- && !(n.hasKey("crossing") && (n.hasTag("highway", "crossing") || n.hasTag("highway", "traffic_signals")))
+ && !(n.hasKey("crossing") && (n.hasTag(HIGHWAY, "crossing")
+ || n.hasTag(HIGHWAY, "traffic_signals")))
&& n.isReferredByWays(2)) {
testMissingPedestrianCrossing(n);
}
@@ -91,7 +93,7 @@ public class Highways extends Test {
@Override
public void visit(Way w) {
if (w.isUsable()) {
- if (w.isClosed() && w.hasTag("highway", CLASSIFIED_HIGHWAYS) && w.hasTag("junction", "roundabout")) {
+ if (w.isClosed() && w.hasTag(HIGHWAY, CLASSIFIED_HIGHWAYS) && w.hasTag("junction", "roundabout")) {
// TODO: find out how to handle splitted roundabouts (see #12841)
testWrongRoundabout(w);
}
@@ -109,7 +111,7 @@ public class Highways extends Test {
// As roundabouts are closed ways, take care of not processing the first/last node twice
for (Node n : new HashSet<>(w.getNodes())) {
for (Way h : Utils.filteredCollection(n.getReferrers(), Way.class)) {
- String value = h.get("highway");
+ String value = h.get(HIGHWAY);
if (h != w && value != null && !value.endsWith("_link")) {
List<Way> list = map.get(value);
if (list == null) {
@@ -129,12 +131,12 @@ public class Highways extends Test {
Boolean oneway2 = OsmUtils.getOsmBoolean(list.get(1).get("oneway"));
if (list.size() > 2 || oneway1 == null || oneway2 == null || !oneway1 || !oneway2) {
// Error when the highway tags do not match
- String value = w.get("highway");
+ String value = w.get(HIGHWAY);
if (!value.equals(s)) {
errors.add(TestError.builder(this, Severity.WARNING, WRONG_ROUNDABOUT_HIGHWAY)
.message(tr("Incorrect roundabout (highway: {0} instead of {1})", value, s))
.primitives(w)
- .fix(() -> new ChangePropertyCommand(w, "highway", s))
+ .fix(() -> new ChangePropertyCommand(w, HIGHWAY, s))
.build());
}
break;
@@ -144,7 +146,7 @@ public class Highways extends Test {
}
public static boolean isHighwayLinkOkay(final Way way) {
- final String highway = way.get("highway");
+ final String highway = way.get(HIGHWAY);
if (highway == null || !highway.endsWith("_link")
|| !IN_DOWNLOADED_AREA.test(way.getNode(0)) || !IN_DOWNLOADED_AREA.test(way.getNode(way.getNodesCount()-1))) {
return true;
@@ -163,7 +165,7 @@ public class Highways extends Test {
}
return Utils.filteredCollection(referrers, Way.class).stream().anyMatch(
- otherWay -> !way.equals(otherWay) && otherWay.hasTag("highway", highway, highway.replaceAll("_link$", "")));
+ otherWay -> !way.equals(otherWay) && otherWay.hasTag(HIGHWAY, highway, highway.replaceAll("_link$", "")));
}
private void testHighwayLink(final Way way) {
@@ -183,8 +185,8 @@ public class Highways extends Test {
cyclistWays = 0;
carsWays = 0;
- for (Way w : OsmPrimitive.getFilteredList(n.getReferrers(), Way.class)) {
- String highway = w.get("highway");
+ for (Way w : n.getParentWays()) {
+ String highway = w.get(HIGHWAY);
if (highway != null) {
if ("footway".equals(highway) || "path".equals(highway)) {
handlePedestrianWay(n, w);
diff --git a/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java b/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
index 6e453af..8b2238c 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
@@ -4,16 +4,23 @@ 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.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
import org.openstreetmap.josm.Main;
+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;
+import org.openstreetmap.josm.data.osm.WaySegment;
import org.openstreetmap.josm.data.validation.Severity;
import org.openstreetmap.josm.data.validation.Test;
import org.openstreetmap.josm.data.validation.TestError;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
/**
- * Checks for untagged ways
+ * Checks for very long segments.
*
* @since 8320
*/
@@ -23,6 +30,11 @@ public class LongSegment extends Test {
protected static final int LONG_SEGMENT = 3501;
/** Maximum segment length for this test */
protected int maxlength;
+ /** set of visited ways. Tracking this increases performance when checking single nodes. */
+ private Set<Way> visitedWays;
+
+ /** set of way segments that have been reported */
+ protected Set<WaySegment> reported;
/**
* Constructor
@@ -33,16 +45,65 @@ public class LongSegment extends Test {
}
@Override
+ public void visit(Node n) {
+ // Test all way segments around this node.
+ // If there is an error in the unchanged part of the way, we do not need to warn the user about it.
+ for (Way way : n.getParentWays()) {
+ if (ignoreWay(way)) {
+ continue;
+ }
+ // Do not simply use index of - a node may be in a way multiple times
+ for (int i = 0; i < way.getNodesCount(); i++) {
+ if (n == way.getNode(i)) {
+ if (i > 0) {
+ visitWaySegment(way, i - 1);
+ }
+ if (i < way.getNodesCount() - 1) {
+ visitWaySegment(way, i);
+ }
+ }
+ }
+ }
+ }
+
+ @Override
public void visit(Way w) {
- if (w.hasTag("route", "ferry")) {
+ if (ignoreWay(w)) {
return;
}
- Double length = w.getLongestSegmentLength();
- if (length > maxlength) {
- length /= 1000.0;
+ visitedWays.add(w);
+
+ testWay(w);
+ }
+
+ private void testWay(Way w) {
+ for (int i = 0; i < w.getNodesCount() - 1; i++) {
+ visitWaySegment(w, i);
+ }
+ }
+
+ private boolean ignoreWay(Way w) {
+ return visitedWays.contains(w) || w.hasTag("route", "ferry");
+ }
+
+ private void visitWaySegment(Way w, int i) {
+ LatLon coor1 = w.getNode(i).getCoor();
+ LatLon coor2 = w.getNode(i + 1).getCoor();
+
+ if (coor1 != null && coor2 != null) {
+ Double length = coor1.greatCircleDistance(coor2);
+ if (length > maxlength) {
+ addErrorForSegment(new WaySegment(w, i), length / 1000.0);
+ }
+ }
+ }
+
+ private void addErrorForSegment(WaySegment waySegment, Double length) {
+ if (reported.add(waySegment)) {
errors.add(TestError.builder(this, Severity.WARNING, LONG_SEGMENT)
.message(tr("Long segments"), marktr("Very long segment of {0} kilometers"), length.intValue())
- .primitives(w)
+ .primitives(waySegment.way)
+ .highlightWaySegments(Collections.singleton(waySegment))
.build());
}
}
@@ -51,10 +112,30 @@ public class LongSegment extends Test {
public void startTest(ProgressMonitor monitor) {
super.startTest(monitor);
maxlength = Main.pref.getInteger("validator.maximum.segment.length", 15_000);
+ reported = new HashSet<>();
+ visitedWays = new HashSet<>();
+ }
+
+ @Override
+ public void endTest() {
+ super.endTest();
+ // free memory
+ visitedWays = null;
+ reported = null;
}
@Override
public boolean isPrimitiveUsable(OsmPrimitive p) {
- return p.isUsable() && p instanceof Way && ((Way) p).getNodesCount() > 1; // test only Ways with at least 2 nodes
+ if (!p.isUsable()) {
+ return false;
+ } else if (p instanceof Way && ((Way) p).getNodesCount() > 1) {
+ // test only Ways with at least 2 nodes
+ return true;
+ } else if (p instanceof Node && p.isDrawable()) {
+ // test all nodes - ways referred by them may not be checked automatically.
+ return true;
+ } else {
+ return false;
+ }
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java b/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
index f62f82e..18ff07e 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/MultipolygonTest.java
@@ -767,9 +767,7 @@ public class MultipolygonTest extends Test {
@Override
public boolean isFixable(TestError testError) {
- if (testError.getCode() == REPEATED_MEMBER_SAME_ROLE)
- return true;
- return false;
+ return testError.getCode() == REPEATED_MEMBER_SAME_ROLE;
}
/**
@@ -832,31 +830,43 @@ public class MultipolygonTest extends Test {
if (!outerCandidate.getBounds().intersects(inner.getBounds())) {
continue;
}
-
- Node unsharedNode = getNonIntersectingNode(outerCandidate, inner);
- if (unsharedNode != null) {
- if (checkIfNodeIsInsidePolygon(unsharedNode, outerCandidate)) {
+ boolean useIntersectionTest = false;
+ Node unsharedOuterNode = null;
+ Node unsharedInnerNode = getNonIntersectingNode(outerCandidate, inner);
+ if (unsharedInnerNode != null) {
+ if (checkIfNodeIsInsidePolygon(unsharedInnerNode, 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;
+ unsharedOuterNode = getNonIntersectingNode(inner, outerCandidate);
+ if (unsharedOuterNode != null) {
+ if (checkIfNodeIsInsidePolygon(unsharedOuterNode, inner)) {
+ return null; // outer is inside inner
}
} else {
- return null; // polygons have only common nodes
+ useIntersectionTest = true;
}
}
} else {
// all nodes of inner are also nodes of outerCandidate
- unsharedNode = getNonIntersectingNode(inner, outerCandidate);
- if (unsharedNode == null) {
- return null;
+ unsharedOuterNode = getNonIntersectingNode(inner, outerCandidate);
+ if (unsharedOuterNode == null) {
+ return null; // all nodes shared -> same ways, maybe different direction
} else {
- innerCandidates.add(inner);
+ if (checkIfNodeIsInsidePolygon(unsharedOuterNode, inner)) {
+ return null; // outer is inside inner
+ } else {
+ useIntersectionTest = true;
+ }
}
}
+ if (useIntersectionTest) {
+ PolygonIntersection res = Geometry.polygonIntersection(inner.getNodes(), outerCandidate.getNodes());
+ if (res == PolygonIntersection.FIRST_INSIDE_SECOND)
+ innerCandidates.add(inner);
+ else if (res == PolygonIntersection.SECOND_INSIDE_FIRST)
+ return null;
+ }
}
return innerCandidates;
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java b/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
index a676de1..adf4b91 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java
@@ -196,7 +196,7 @@ public class OpeningHourTest extends Test.TagTest {
*/
public List<OpeningHoursTestError> checkOpeningHourSyntax(final String key, final String value, CheckMode mode,
boolean ignoreOtherSeverity, String locale) {
- if (ENGINE == null || value == null || value.trim().isEmpty()) {
+ if (ENGINE == null || value == null || value.isEmpty()) {
return Collections.emptyList();
}
final List<OpeningHoursTestError> errors = new ArrayList<>();
diff --git a/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java b/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java
index 8aed181..ffc87f6 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/OverlappingWays.java
@@ -1,6 +1,8 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.validation.tests;
+import static org.openstreetmap.josm.data.validation.tests.CrossingWays.HIGHWAY;
+import static org.openstreetmap.josm.data.validation.tests.CrossingWays.RAILWAY;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.ArrayList;
@@ -89,9 +91,9 @@ public class OverlappingWays extends Test {
int area = 0;
for (WaySegment ws : duplicated) {
- if (ws.way.hasKey("highway")) {
+ if (ws.way.hasKey(HIGHWAY)) {
highway++;
- } else if (ws.way.hasKey("railway")) {
+ } else if (ws.way.hasKey(RAILWAY)) {
railway++;
}
Boolean ar = OsmUtils.getOsmBoolean(ws.way.get("area"));
diff --git a/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java b/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
index 185d48a..50b9bfc 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/RelationChecker.java
@@ -7,8 +7,8 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.Collection;
import java.util.EnumSet;
import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -94,23 +94,13 @@ public class RelationChecker extends Test {
}
}
- private static class RolePreset {
- private final List<Role> roles;
- private final String name;
-
- RolePreset(List<Role> roles, String name) {
- this.roles = roles;
- this.name = name;
- }
- }
-
private static class RoleInfo {
private int total;
}
@Override
public void visit(Relation n) {
- Map<String, RolePreset> allroles = buildAllRoles(n);
+ Map<Role, String> allroles = buildAllRoles(n);
if (allroles.isEmpty() && n.hasTag("type", "route")
&& n.hasTag("route", "train", "subway", "monorail", "tram", "bus", "trolleybus", "aerialway", "ferry")) {
errors.add(TestError.builder(this, Severity.WARNING, RELATION_UNKNOWN)
@@ -150,23 +140,15 @@ public class RelationChecker extends Test {
}
// return Roles grouped by key
- private static Map<String, RolePreset> buildAllRoles(Relation n) {
- Map<String, RolePreset> allroles = new HashMap<>();
+ private static Map<Role, String> buildAllRoles(Relation n) {
+ Map<Role, String> allroles = new LinkedHashMap<>();
for (TaggingPreset p : relationpresets) {
final boolean matches = TaggingPresetItem.matches(Utils.filteredCollection(p.data, KeyedItem.class), n.getKeys());
final Roles r = Utils.find(p.data, Roles.class);
if (matches && r != null) {
for (Role role: r.roles) {
- String key = role.key;
- List<Role> roleGroup;
- if (allroles.containsKey(key)) {
- roleGroup = allroles.get(key).roles;
- } else {
- roleGroup = new LinkedList<>();
- allroles.put(key, new RolePreset(roleGroup, p.name));
- }
- roleGroup.add(role);
+ allroles.put(role, p.name);
}
}
}
@@ -198,21 +180,27 @@ public class RelationChecker extends Test {
/**
* get all role definition for specified key and check, if some definition matches
*
- * @param rolePreset containing preset for role of the member
+ * @param allroles containing list of possible role presets of the member
* @param member to be verified
* @param n relation to be verified
* @return <tt>true</tt> if member passed any of definition within preset
*
*/
- private boolean checkMemberExpressionAndType(RolePreset rolePreset, RelationMember member, Relation n) {
- if (rolePreset == null || rolePreset.roles == null) {
- // no restrictions on role types
- return true;
- }
+ private boolean checkMemberExpressionAndType(Map<Role, String> allroles, RelationMember member, Relation n) {
+ String role = member.getRole();
+ String name = null;
+ // Set of all accepted types in template
+ Collection<TaggingPresetType> types = EnumSet.noneOf(TaggingPresetType.class);
TestError possibleMatchError = null;
// iterate through all of the role definition within preset
// and look for any matching definition
- for (Role r: rolePreset.roles) {
+ for (Map.Entry<Role, String> e : allroles.entrySet()) {
+ Role r = e.getKey();
+ if (!r.isRole(role)) {
+ continue;
+ }
+ name = e.getValue();
+ types.addAll(r.types);
if (checkMemberType(r, member)) {
// member type accepted by role definition
if (r.memberExpression == null) {
@@ -237,7 +225,7 @@ public class RelationChecker extends Test {
possibleMatchError = TestError.builder(this, Severity.WARNING, WRONG_TYPE)
.message(ROLE_VERIF_PROBLEM_MSG,
marktr("Role of relation member does not match expression ''{0}'' in template {1}"),
- r.memberExpression, rolePreset.name)
+ r.memberExpression, name)
.primitives(member.getMember().isUsable() ? member.getMember() : n)
.build();
}
@@ -250,7 +238,9 @@ public class RelationChecker extends Test {
}
}
- if (possibleMatchError != null) {
+ if (name == null) {
+ return true;
+ } else if (possibleMatchError != null) {
// if any error found, then assume that member type was correct
// and complain about not matching the memberExpression
// (the only failure, that we could gather)
@@ -259,19 +249,13 @@ public class RelationChecker extends Test {
// no errors found till now. So member at least failed at matching the type
// it could also fail at memberExpression, but we can't guess at which
- // prepare Set of all accepted types in template
- Collection<TaggingPresetType> types = EnumSet.noneOf(TaggingPresetType.class);
- for (Role r: rolePreset.roles) {
- types.addAll(r.types);
- }
-
// convert in localization friendly way to string of accepted types
String typesStr = types.stream().map(x -> tr(x.getName())).collect(Collectors.joining("/"));
errors.add(TestError.builder(this, Severity.WARNING, WRONG_TYPE)
.message(ROLE_VERIF_PROBLEM_MSG,
marktr("Type ''{0}'' of relation member with role ''{1}'' does not match accepted types ''{2}'' in template {3}"),
- member.getType(), member.getRole(), typesStr, rolePreset.name)
+ member.getType(), member.getRole(), typesStr, name)
.primitives(member.getMember().isUsable() ? member.getMember() : n)
.build());
}
@@ -284,29 +268,36 @@ public class RelationChecker extends Test {
* @param allroles contains presets for specified relation
* @param map contains statistics of occurances of specified role types in relation
*/
- private void checkRoles(Relation n, Map<String, RolePreset> allroles, Map<String, RoleInfo> map) {
+ private void checkRoles(Relation n, Map<Role, String> allroles, Map<String, RoleInfo> map) {
// go through all members of relation
for (RelationMember member: n.getMembers()) {
- String role = member.getRole();
-
// error reporting done inside
- checkMemberExpressionAndType(allroles.get(role), member, n);
+ checkMemberExpressionAndType(allroles, member, n);
}
// verify role counts based on whole role sets
- for (RolePreset rp: allroles.values()) {
- for (Role r: rp.roles) {
- String keyname = r.key;
- if (keyname.isEmpty()) {
- keyname = tr("<empty>");
- }
- checkRoleCounts(n, r, keyname, map.get(r.key));
+ for (Role r: allroles.keySet()) {
+ String keyname = r.key;
+ if (keyname.isEmpty()) {
+ keyname = tr("<empty>");
}
+ checkRoleCounts(n, r, keyname, map.get(r.key));
+ }
+ if ("network".equals(n.get("type")) && !"bicycle".equals(n.get("route"))) {
+ return;
}
// verify unwanted members
for (String key : map.keySet()) {
- if (!allroles.containsKey(key) && !"network".equals(n.get("type")) && !"bicycle".equals(n.get("route"))) {
- String templates = allroles.keySet().stream().collect(Collectors.joining("/"));
+ boolean found = false;
+ for (Role r: allroles.keySet()) {
+ if (r.isRole(key)) {
+ found = true;
+ break;
+ }
+ }
+
+ if (!found) {
+ String templates = allroles.keySet().stream().map(r -> r.key).collect(Collectors.joining("/"));
if (!key.isEmpty()) {
errors.add(TestError.builder(this, Severity.WARNING, ROLE_UNKNOWN)
diff --git a/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java b/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
index 7d450a7..c3ee856 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
@@ -706,13 +706,20 @@ public class TagChecker extends TagTest {
private String description;
protected List<CheckerElement> data = new ArrayList<>();
private OsmPrimitiveType type;
- private int code;
+ private TagCheckLevel level;
protected Severity severity;
- // CHECKSTYLE.OFF: SingleSpaceSeparator
- protected static final int TAG_CHECK_ERROR = 1250;
- protected static final int TAG_CHECK_WARN = 1260;
- protected static final int TAG_CHECK_INFO = 1270;
- // CHECKSTYLE.ON: SingleSpaceSeparator
+
+ private enum TagCheckLevel {
+ TAG_CHECK_ERROR(1250),
+ TAG_CHECK_WARN(1260),
+ TAG_CHECK_INFO(1270);
+
+ final int code;
+
+ TagCheckLevel(int code) {
+ this.code = code;
+ }
+ }
protected static class CheckerElement {
public Object tag;
@@ -808,15 +815,15 @@ public class TagChecker extends TagTest {
switch (n[1]) {
case "W":
severity = Severity.WARNING;
- code = TAG_CHECK_WARN;
+ level = TagCheckLevel.TAG_CHECK_WARN;
break;
case "E":
severity = Severity.ERROR;
- code = TAG_CHECK_ERROR;
+ level = TagCheckLevel.TAG_CHECK_ERROR;
break;
case "I":
severity = Severity.OTHER;
- code = TAG_CHECK_INFO;
+ level = TagCheckLevel.TAG_CHECK_INFO;
break;
default:
return tr("Could not find warning level");
@@ -846,19 +853,31 @@ public class TagChecker extends TagTest {
return true;
}
+ /**
+ * Returns the error description.
+ * @return the error description
+ */
public String getDescription() {
return description;
}
+ /**
+ * Returns the error severity.
+ * @return the error severity
+ */
public Severity getSeverity() {
return severity;
}
+ /**
+ * Returns the error code.
+ * @return the error code
+ */
public int getCode() {
if (type == null)
- return code;
+ return level.code;
- return code + type.ordinal() + 1;
+ return level.code + type.ordinal() + 1;
}
}
}
diff --git a/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java b/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
index 06561b5..6ee45ff 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
@@ -1,6 +1,8 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.validation.tests;
+import static org.openstreetmap.josm.data.validation.tests.CrossingWays.HIGHWAY;
+import static org.openstreetmap.josm.data.validation.tests.CrossingWays.RAILWAY;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.geom.Area;
@@ -56,7 +58,7 @@ public abstract class UnconnectedWays extends Test {
@Override
public boolean isPrimitiveUsable(OsmPrimitive p) {
- return super.isPrimitiveUsable(p) && p.hasKey("highway");
+ return super.isPrimitiveUsable(p) && p.hasKey(HIGHWAY);
}
}
@@ -180,9 +182,9 @@ public abstract class UnconnectedWays extends Test {
if (en == null || !s.highway || !endnodesHighway.contains(en)) {
continue;
}
- if (en.hasTag("highway", "turning_circle", "bus_stop")
+ if (en.hasTag(HIGHWAY, "turning_circle", "bus_stop")
|| en.hasTag("amenity", "parking_entrance")
- || en.hasTag("railway", "buffer_stop")
+ || en.hasTag(RAILWAY, "buffer_stop")
|| en.isKeyTrue("noexit")
|| en.hasKey("entrance", "barrier")) {
continue;
@@ -301,8 +303,8 @@ public abstract class UnconnectedWays extends Test {
MyWaySegment(Way w, Node n1, Node n2) {
this.w = w;
- String railway = w.get("railway");
- String highway = w.get("highway");
+ String railway = w.get(RAILWAY);
+ String highway = w.get(HIGHWAY);
this.isAbandoned = "abandoned".equals(railway) || w.isKeyTrue("disused");
this.highway = (highway != null || railway != null) && !isAbandoned;
this.isBoundary = !this.highway && w.hasTag("boundary", "administrative");
@@ -448,11 +450,11 @@ public abstract class UnconnectedWays extends Test {
// the time very near the associated highway, which is perfectly normal, see #9332
&& !w.hasKey("addr:interpolation")
// similarly for public transport platforms
- && !w.hasTag("highway", "platform") && !w.hasTag("railway", "platform")
+ && !w.hasTag(HIGHWAY, "platform") && !w.hasTag(RAILWAY, "platform")
) {
ways.addAll(getWaySegments(w));
QuadBuckets<Node> set = endnodes;
- if (w.hasKey("highway", "railway")) {
+ if (w.hasKey(HIGHWAY, RAILWAY)) {
set = endnodesHighway;
}
addNode(w.firstNode(), set);
diff --git a/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java b/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java
index 293189f..9c0544f 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/UntaggedWay.java
@@ -1,6 +1,7 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.validation.tests;
+import static org.openstreetmap.josm.data.validation.tests.CrossingWays.HIGHWAY;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.HashSet;
@@ -80,7 +81,7 @@ public class UntaggedWay extends Test {
Map<String, String> tags = w.getKeys();
if (!tags.isEmpty()) {
- String highway = tags.get("highway");
+ String highway = tags.get(HIGHWAY);
if (highway != null && NAMED_WAYS.contains(highway) && !tags.containsKey("name") && !tags.containsKey("ref")
&& !"yes".equals(tags.get("noname"))) {
boolean isJunction = false;
diff --git a/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java b/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java
index 18154d6..ffd7161 100644
--- a/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java
+++ b/src/org/openstreetmap/josm/data/validation/tests/WayConnectedToArea.java
@@ -1,6 +1,7 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.data.validation.tests;
+import static org.openstreetmap.josm.data.validation.tests.CrossingWays.HIGHWAY;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.util.List;
@@ -29,14 +30,14 @@ public class WayConnectedToArea extends Test {
@Override
public void visit(Way w) {
- if (!w.isUsable() || w.isClosed() || !w.hasKey("highway")) {
+ if (!w.isUsable() || w.isClosed() || !w.hasKey(HIGHWAY)) {
return;
}
boolean hasway = false;
List<OsmPrimitive> r = w.firstNode().getReferrers();
for (OsmPrimitive p : r) {
- if (p != w && p.hasKey("highway")) {
+ if (p != w && p.hasKey(HIGHWAY)) {
hasway = true;
break;
}
@@ -49,7 +50,7 @@ public class WayConnectedToArea extends Test {
hasway = false;
r = w.lastNode().getReferrers();
for (OsmPrimitive p : r) {
- if (p != w && p.hasKey("highway")) {
+ if (p != w && p.hasKey(HIGHWAY)) {
hasway = true;
break;
}
@@ -85,7 +86,7 @@ public class WayConnectedToArea extends Test {
private void addPossibleError(Way w, Node wayNode, OsmPrimitive p, OsmPrimitive area) {
// Avoid "legal" cases (see #10655)
- if (w.hasKey("highway") && wayNode.hasTag("leisure", "slipway") && area.hasTag("natural", "water")) {
+ if (w.hasKey(HIGHWAY) && wayNode.hasTag("leisure", "slipway") && area.hasTag("natural", "water")) {
return;
}
errors.add(TestError.builder(this, Severity.WARNING, 2301)
diff --git a/src/org/openstreetmap/josm/data/validation/util/ValUtil.java b/src/org/openstreetmap/josm/data/validation/util/ValUtil.java
index 9e371c4..a7c4544 100644
--- a/src/org/openstreetmap/josm/data/validation/util/ValUtil.java
+++ b/src/org/openstreetmap/josm/data/validation/util/ValUtil.java
@@ -42,13 +42,14 @@ public final class ValUtil {
List<List<Way>> cells = new ArrayList<>(2);
Set<Point2D> cellNodes = new HashSet<>();
Point2D cell;
+ double griddetail = OsmValidator.getGridDetail();
// First, round coordinates
// CHECKSTYLE.OFF: SingleSpaceSeparator
- long x0 = Math.round(n1.getEastNorth().east() * OsmValidator.griddetail);
- long y0 = Math.round(n1.getEastNorth().north() * OsmValidator.griddetail);
- long x1 = Math.round(n2.getEastNorth().east() * OsmValidator.griddetail);
- long y1 = Math.round(n2.getEastNorth().north() * OsmValidator.griddetail);
+ long x0 = Math.round(n1.getEastNorth().east() * griddetail);
+ long y0 = Math.round(n1.getEastNorth().north() * griddetail);
+ long x1 = Math.round(n2.getEastNorth().east() * griddetail);
+ long y1 = Math.round(n2.getEastNorth().north() * griddetail);
// CHECKSTYLE.ON: SingleSpaceSeparator
// Start of the way
@@ -75,10 +76,10 @@ public final class ValUtil {
// Then floor coordinates, in case the way is in the border of the cell.
// CHECKSTYLE.OFF: SingleSpaceSeparator
- x0 = (long) Math.floor(n1.getEastNorth().east() * OsmValidator.griddetail);
- y0 = (long) Math.floor(n1.getEastNorth().north() * OsmValidator.griddetail);
- x1 = (long) Math.floor(n2.getEastNorth().east() * OsmValidator.griddetail);
- y1 = (long) Math.floor(n2.getEastNorth().north() * OsmValidator.griddetail);
+ x0 = (long) Math.floor(n1.getEastNorth().east() * griddetail);
+ y0 = (long) Math.floor(n1.getEastNorth().north() * griddetail);
+ x1 = (long) Math.floor(n2.getEastNorth().east() * griddetail);
+ y1 = (long) Math.floor(n2.getEastNorth().north() * griddetail);
// CHECKSTYLE.ON: SingleSpaceSeparator
// Start of the way
diff --git a/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java b/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java
index 56b00e7..9756c88 100644
--- a/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java
+++ b/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java
@@ -44,7 +44,9 @@ public final class ConditionalOptionPaneUtil {
/**
* this is a static utility class only
*/
- private ConditionalOptionPaneUtil() {}
+ private ConditionalOptionPaneUtil() {
+ // Hide default constructor for utility classes
+ }
/**
* Returns the preference value for the preference key "message." + <code>prefKey</code> + ".value".
diff --git a/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java b/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
index dee1303..c03b9a9 100644
--- a/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
+++ b/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
@@ -95,7 +95,7 @@ public class DefaultNameFormatter implements NameFormatter, HistoryNameFormatter
* A ? prefix indicates a boolean value, for which the key (instead of the value) is used.
*/
private static final String[] DEFAULT_NAMING_TAGS_FOR_RELATIONS = {"name", "ref", "restriction", "landuse", "natural",
- "public_transport", ":LocationCode", "note", "?building"};
+ "leisure", "amenity", "public_transport", ":LocationCode", "note", "?building"};
/** the current list of tags used as naming tags in relations */
private static List<String> namingTagsForRelations;
diff --git a/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java b/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
index 90afdb4..1fd779b 100644
--- a/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
+++ b/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
@@ -37,6 +37,7 @@ public final class ExceptionDialogUtil {
* just static utility functions. no constructor
*/
private ExceptionDialogUtil() {
+ // Hide default constructor for utility classes
}
/**
@@ -360,7 +361,7 @@ public final class ExceptionDialogUtil {
public static void explainGenericHttpException(OsmApiException e) {
HelpAwareOptionPane.showOptionDialog(
Main.parent,
- ExceptionUtil.explainClientTimeout(e),
+ ExceptionUtil.explainGeneric(e),
tr("Communication with OSM server failed"),
JOptionPane.ERROR_MESSAGE,
ht("/ErrorMessages#GenericCommunicationError")
@@ -475,7 +476,7 @@ public final class ExceptionDialogUtil {
case HttpURLConnection.HTTP_CLIENT_TIMEOUT:
explainClientTimeout(oae);
return;
- case 509:
+ case 509: case 429:
explainBandwidthLimitExceeded(oae);
return;
default:
diff --git a/src/org/openstreetmap/josm/gui/ExtendedDialog.java b/src/org/openstreetmap/josm/gui/ExtendedDialog.java
index 3db93b3..da8c6a3 100644
--- a/src/org/openstreetmap/josm/gui/ExtendedDialog.java
+++ b/src/org/openstreetmap/josm/gui/ExtendedDialog.java
@@ -72,7 +72,7 @@ import org.openstreetmap.josm.tools.WindowGeometry;
* }
* </pre>
*/
-public class ExtendedDialog extends JDialog {
+public class ExtendedDialog extends JDialog implements IExtendedDialog {
private final boolean disposeOnClose;
private volatile int result;
public static final int DialogClosedOtherwise = 0;
@@ -172,21 +172,13 @@ public class ExtendedDialog extends JDialog {
}
}
- /**
- * Allows decorating the buttons with icons.
- * @param buttonIcons The button icons
- * @return {@code this}
- */
+ @Override
public ExtendedDialog setButtonIcons(Icon... buttonIcons) {
this.bIcons = Utils.copyArray(buttonIcons);
return this;
}
- /**
- * Convenience method to provide image names instead of images.
- * @param buttonIcons The button icon names
- * @return {@code this}
- */
+ @Override
public ExtendedDialog setButtonIcons(String... buttonIcons) {
bIcons = new Icon[buttonIcons.length];
for (int i = 0; i < buttonIcons.length; ++i) {
@@ -195,77 +187,36 @@ public class ExtendedDialog extends JDialog {
return this;
}
- /**
- * Allows decorating the buttons with tooltips. Expects a String array with
- * translated tooltip texts.
- *
- * @param toolTipTexts the tool tip texts. Ignored, if null.
- * @return {@code this}
- */
+ @Override
public ExtendedDialog setToolTipTexts(String... toolTipTexts) {
this.bToolTipTexts = Utils.copyArray(toolTipTexts);
return this;
}
- /**
- * Sets the content that will be displayed in the message dialog.
- *
- * Note that depending on your other settings more UI elements may appear.
- * The content is played on top of the other elements though.
- *
- * @param content Any element that can be displayed in the message dialog
- * @return {@code this}
- */
+ @Override
public ExtendedDialog setContent(Component content) {
return setContent(content, true);
}
- /**
- * Sets the content that will be displayed in the message dialog.
- *
- * Note that depending on your other settings more UI elements may appear.
- * The content is played on top of the other elements though.
- *
- * @param content Any element that can be displayed in the message dialog
- * @param placeContentInScrollPane if true, places the content in a JScrollPane
- * @return {@code this}
- */
+ @Override
public ExtendedDialog setContent(Component content, boolean placeContentInScrollPane) {
this.content = content;
this.placeContentInScrollPane = placeContentInScrollPane;
return this;
}
- /**
- * Sets the message that will be displayed. The String will be automatically
- * wrapped if it is too long.
- *
- * Note that depending on your other settings more UI elements may appear.
- * The content is played on top of the other elements though.
- *
- * @param message The text that should be shown to the user
- * @return {@code this}
- */
+ @Override
public ExtendedDialog setContent(String message) {
return setContent(string2label(message), false);
}
- /**
- * Decorate the dialog with an icon that is shown on the left part of
- * the window area. (Similar to how it is done in {@link JOptionPane})
- * @param icon The icon to display
- * @return {@code this}
- */
+ @Override
public ExtendedDialog setIcon(Icon icon) {
this.icon = icon;
return this;
}
- /**
- * Convenience method to allow values that would be accepted by {@link JOptionPane} as messageType.
- * @param messageType The {@link JOptionPane} messageType
- * @return {@code this}
- */
+ @Override
public ExtendedDialog setIcon(int messageType) {
switch (messageType) {
case JOptionPane.ERROR_MESSAGE:
@@ -283,11 +234,7 @@ public class ExtendedDialog extends JDialog {
}
}
- /**
- * Show the dialog to the user. Call this after you have set all options
- * for the dialog. You can retrieve the result using {@link #getValue()}.
- * @return {@code this}
- */
+ @Override
public ExtendedDialog showDialog() {
// Check if the user has set the dialog to not be shown again
if (toggleCheckState()) {
@@ -308,23 +255,14 @@ public class ExtendedDialog extends JDialog {
return this;
}
- /**
- * Retrieve the user choice after the dialog has been closed.
- *
- * @return <ul> <li>The selected button. The count starts with 1.</li>
- * <li>A return value of {@link #DialogClosedOtherwise} means the dialog has been closed otherwise.</li>
- * </ul>
- */
+ @Override
public int getValue() {
return result;
}
private boolean setupDone;
- /**
- * This is called by {@link #showDialog()}.
- * Only invoke from outside if you need to modify the contentPane
- */
+ @Override
public void setupDialog() {
if (setupDone)
return;
@@ -522,34 +460,14 @@ public class ExtendedDialog extends JDialog {
}
}
- /**
- * Call this if you want the dialog to remember the geometry (size and position) set by the user.
- * Set the pref to <code>null</code> or to an empty string to disable again.
- * By default, it's disabled.
- *
- * Note: If you want to set the width of this dialog directly use the usual
- * setSize, setPreferredSize, setMaxSize, setMinSize
- *
- * @param pref The preference to save the dimension to
- * @param wg The default window geometry that should be used if no
- * existing preference is found (only takes effect if
- * <code>pref</code> is not null or empty
- * @return {@code this}
- */
+ @Override
public ExtendedDialog setRememberWindowGeometry(String pref, WindowGeometry wg) {
rememberSizePref = pref == null ? "" : pref;
defaultWindowGeometry = wg;
return this;
}
- /**
- * Calling this will offer the user a "Do not show again" checkbox for the
- * dialog. Default is to not offer the choice; the dialog will be shown
- * every time.
- * Currently, this is not supported for non-modal dialogs.
- * @param togglePref The preference to save the checkbox state to
- * @return {@code this}
- */
+ @Override
public ExtendedDialog toggleEnable(String togglePref) {
if (!modal) {
throw new IllegalStateException();
@@ -559,32 +477,19 @@ public class ExtendedDialog extends JDialog {
return this;
}
- /**
- * Sets the button that will react to ENTER.
- * @param defaultButtonIdx The button index (starts to 1)
- * @return {@code this}
- */
+ @Override
public ExtendedDialog setDefaultButton(int defaultButtonIdx) {
this.defaultButtonIdx = defaultButtonIdx;
return this;
}
- /**
- * Used in combination with toggle:
- * If the user presses 'cancel' the toggle settings are ignored and not saved to the pref
- * @param cancelButtonIdx index of the button that stands for cancel, accepts multiple values
- * @return {@code this}
- */
+ @Override
public ExtendedDialog setCancelButton(Integer... cancelButtonIdx) {
this.cancelButtonIdx = new HashSet<>(Arrays.<Integer>asList(cancelButtonIdx));
return this;
}
- /**
- * Makes default button request initial focus or not.
- * @param focus {@code true} to make default button request initial focus
- * @since 7407
- */
+ @Override
public void setFocusOnDefaultButton(boolean focus) {
focusOnDefaultButton = focus;
}
@@ -595,10 +500,7 @@ public class ExtendedDialog extends JDialog {
}
}
- /**
- * This function returns true if the dialog has been set to "do not show again"
- * @return true if dialog should not be shown again
- */
+ @Override
public final boolean toggleCheckState() {
toggleable = togglePref != null && !togglePref.isEmpty();
toggleValue = ConditionalOptionPaneUtil.getDialogReturnValue(togglePref);
@@ -633,20 +535,7 @@ public class ExtendedDialog extends JDialog {
return lbl;
}
- /**
- * Configures how this dialog support for context sensitive help.
- * <ul>
- * <li>if helpTopic is null, the dialog doesn't provide context sensitive help</li>
- * <li>if helpTopic != null, the dialog redirect user to the help page for this helpTopic when
- * the user clicks F1 in the dialog</li>
- * <li>if showHelpButton is true, the dialog displays "Help" button (rightmost button in
- * the button row)</li>
- * </ul>
- *
- * @param helpTopic the help topic
- * @param showHelpButton true, if the dialog displays a help button
- * @return {@code this}
- */
+ @Override
public ExtendedDialog configureContextsensitiveHelp(String helpTopic, boolean showHelpButton) {
this.helpTopic = helpTopic;
this.showHelpButton = showHelpButton;
diff --git a/src/org/openstreetmap/josm/gui/IExtendedDialog.java b/src/org/openstreetmap/josm/gui/IExtendedDialog.java
new file mode 100644
index 0000000..c8a13de
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/IExtendedDialog.java
@@ -0,0 +1,181 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui;
+
+import java.awt.Component;
+
+import javax.swing.Icon;
+import javax.swing.JOptionPane;
+
+import org.openstreetmap.josm.tools.WindowGeometry;
+
+/**
+ * Extracted interface of {@link ExtendedDialog} class.
+ * @since 11945
+ */
+public interface IExtendedDialog {
+
+ /**
+ * Allows decorating the buttons with icons.
+ * @param buttonIcons The button icons
+ * @return {@code this}
+ */
+ ExtendedDialog setButtonIcons(Icon... buttonIcons);
+
+ /**
+ * Convenience method to provide image names instead of images.
+ * @param buttonIcons The button icon names
+ * @return {@code this}
+ */
+ ExtendedDialog setButtonIcons(String... buttonIcons);
+
+ /**
+ * Allows decorating the buttons with tooltips. Expects a String array with
+ * translated tooltip texts.
+ *
+ * @param toolTipTexts the tool tip texts. Ignored, if null.
+ * @return {@code this}
+ */
+ ExtendedDialog setToolTipTexts(String... toolTipTexts);
+
+ /**
+ * Sets the content that will be displayed in the message dialog.
+ *
+ * Note that depending on your other settings more UI elements may appear.
+ * The content is played on top of the other elements though.
+ *
+ * @param content Any element that can be displayed in the message dialog
+ * @return {@code this}
+ */
+ ExtendedDialog setContent(Component content);
+
+ /**
+ * Sets the content that will be displayed in the message dialog.
+ *
+ * Note that depending on your other settings more UI elements may appear.
+ * The content is played on top of the other elements though.
+ *
+ * @param content Any element that can be displayed in the message dialog
+ * @param placeContentInScrollPane if true, places the content in a JScrollPane
+ * @return {@code this}
+ */
+ ExtendedDialog setContent(Component content, boolean placeContentInScrollPane);
+
+ /**
+ * Sets the message that will be displayed. The String will be automatically
+ * wrapped if it is too long.
+ *
+ * Note that depending on your other settings more UI elements may appear.
+ * The content is played on top of the other elements though.
+ *
+ * @param message The text that should be shown to the user
+ * @return {@code this}
+ */
+ ExtendedDialog setContent(String message);
+
+ /**
+ * Decorate the dialog with an icon that is shown on the left part of
+ * the window area. (Similar to how it is done in {@link JOptionPane})
+ * @param icon The icon to display
+ * @return {@code this}
+ */
+ ExtendedDialog setIcon(Icon icon);
+
+ /**
+ * Convenience method to allow values that would be accepted by {@link JOptionPane} as messageType.
+ * @param messageType The {@link JOptionPane} messageType
+ * @return {@code this}
+ */
+ ExtendedDialog setIcon(int messageType);
+
+ /**
+ * Show the dialog to the user. Call this after you have set all options
+ * for the dialog. You can retrieve the result using {@link #getValue()}.
+ * @return {@code this}
+ */
+ ExtendedDialog showDialog();
+
+ /**
+ * Retrieve the user choice after the dialog has been closed.
+ *
+ * @return <ul> <li>The selected button. The count starts with 1.</li>
+ * <li>A return value of {@link ExtendedDialog#DialogClosedOtherwise} means the dialog has been closed otherwise.</li>
+ * </ul>
+ */
+ int getValue();
+
+ /**
+ * This is called by {@link #showDialog()}.
+ * Only invoke from outside if you need to modify the contentPane
+ */
+ void setupDialog();
+
+ /**
+ * Call this if you want the dialog to remember the geometry (size and position) set by the user.
+ * Set the pref to <code>null</code> or to an empty string to disable again.
+ * By default, it's disabled.
+ *
+ * Note: If you want to set the width of this dialog directly use the usual
+ * setSize, setPreferredSize, setMaxSize, setMinSize
+ *
+ * @param pref The preference to save the dimension to
+ * @param wg The default window geometry that should be used if no
+ * existing preference is found (only takes effect if
+ * <code>pref</code> is not null or empty
+ * @return {@code this}
+ */
+ ExtendedDialog setRememberWindowGeometry(String pref, WindowGeometry wg);
+
+ /**
+ * Calling this will offer the user a "Do not show again" checkbox for the
+ * dialog. Default is to not offer the choice; the dialog will be shown
+ * every time.
+ * Currently, this is not supported for non-modal dialogs.
+ * @param togglePref The preference to save the checkbox state to
+ * @return {@code this}
+ */
+ ExtendedDialog toggleEnable(String togglePref);
+
+ /**
+ * Sets the button that will react to ENTER.
+ * @param defaultButtonIdx The button index (starts to 1)
+ * @return {@code this}
+ */
+ ExtendedDialog setDefaultButton(int defaultButtonIdx);
+
+ /**
+ * Used in combination with toggle:
+ * If the user presses 'cancel' the toggle settings are ignored and not saved to the pref
+ * @param cancelButtonIdx index of the button that stands for cancel, accepts multiple values
+ * @return {@code this}
+ */
+ ExtendedDialog setCancelButton(Integer... cancelButtonIdx);
+
+ /**
+ * Makes default button request initial focus or not.
+ * @param focus {@code true} to make default button request initial focus
+ * @since 7407
+ */
+ void setFocusOnDefaultButton(boolean focus);
+
+ /**
+ * This function returns true if the dialog has been set to "do not show again"
+ * @return true if dialog should not be shown again
+ */
+ boolean toggleCheckState();
+
+ /**
+ * Configures how this dialog support for context sensitive help.
+ * <ul>
+ * <li>if helpTopic is null, the dialog doesn't provide context sensitive help</li>
+ * <li>if helpTopic != null, the dialog redirect user to the help page for this helpTopic when
+ * the user clicks F1 in the dialog</li>
+ * <li>if showHelpButton is true, the dialog displays "Help" button (rightmost button in
+ * the button row)</li>
+ * </ul>
+ *
+ * @param helpTopic the help topic
+ * @param showHelpButton true, if the dialog displays a help button
+ * @return {@code this}
+ */
+ ExtendedDialog configureContextsensitiveHelp(String helpTopic, boolean showHelpButton);
+}
diff --git a/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java b/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java
index 059aa9f..04f505a 100644
--- a/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java
+++ b/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java
@@ -96,7 +96,7 @@ public final class JosmUserIdentityManager implements PreferenceChangedListener
}
/**
- * Remebers the fact that the current JOSM user is partially identified
+ * Remembers the fact that the current JOSM user is partially identified
* by the user name of its OSM account.
*
* @param userName the user name. Must not be null. Must not be empty (whitespace only).
@@ -105,10 +105,11 @@ public final class JosmUserIdentityManager implements PreferenceChangedListener
*/
public void setPartiallyIdentified(String userName) {
CheckParameterUtil.ensureParameterNotNull(userName, "userName");
- if (userName.trim().isEmpty())
+ String trimmedUserName = userName.trim();
+ if (trimmedUserName.isEmpty())
throw new IllegalArgumentException(
MessageFormat.format("Expected non-empty value for parameter ''{0}'', got ''{1}''", "userName", userName));
- this.userName = userName;
+ this.userName = trimmedUserName;
userInfo = null;
}
@@ -116,19 +117,20 @@ public final class JosmUserIdentityManager implements PreferenceChangedListener
* Remembers the fact that the current JOSM user is fully identified with a
* verified pair of user name and user id.
*
- * @param username the user name. Must not be null. Must not be empty.
- * @param userinfo additional information about the user, retrieved from the OSM server and including the user id
+ * @param userName the user name. Must not be null. Must not be empty.
+ * @param userInfo additional information about the user, retrieved from the OSM server and including the user id
* @throws IllegalArgumentException if userName is null
* @throws IllegalArgumentException if userName is empty
- * @throws IllegalArgumentException if userinfo is null
+ * @throws IllegalArgumentException if userInfo is null
*/
- public void setFullyIdentified(String username, UserInfo userinfo) {
- CheckParameterUtil.ensureParameterNotNull(username, "username");
- if (username.trim().isEmpty())
+ public void setFullyIdentified(String userName, UserInfo userInfo) {
+ CheckParameterUtil.ensureParameterNotNull(userName, "userName");
+ String trimmedUserName = userName.trim();
+ if (trimmedUserName.isEmpty())
throw new IllegalArgumentException(tr("Expected non-empty value for parameter ''{0}'', got ''{1}''", "userName", userName));
- CheckParameterUtil.ensureParameterNotNull(userinfo, "userinfo");
- this.userName = username;
- this.userInfo = userinfo;
+ CheckParameterUtil.ensureParameterNotNull(userInfo, "userInfo");
+ this.userName = trimmedUserName;
+ this.userInfo = userInfo;
}
/**
diff --git a/src/org/openstreetmap/josm/gui/MainApplication.java b/src/org/openstreetmap/josm/gui/MainApplication.java
index f8d6143..9572be6 100644
--- a/src/org/openstreetmap/josm/gui/MainApplication.java
+++ b/src/org/openstreetmap/josm/gui/MainApplication.java
@@ -362,8 +362,6 @@ public class MainApplication extends Main {
mainFrame.setVisible(true);
});
- Main.MasterWindowListener.setup();
-
boolean maximized = Main.pref.getBoolean("gui.maximized", false);
if ((!args.hasOption(Option.NO_MAXIMIZE) && maximized) || args.hasOption(Option.MAXIMIZE)) {
mainFrame.setMaximized(true);
diff --git a/src/org/openstreetmap/josm/gui/MainFrame.java b/src/org/openstreetmap/josm/gui/MainFrame.java
index 6cbe55b..6c697ea 100644
--- a/src/org/openstreetmap/josm/gui/MainFrame.java
+++ b/src/org/openstreetmap/josm/gui/MainFrame.java
@@ -93,7 +93,7 @@ public class MainFrame extends JFrame {
// This listener is never removed, since the main frame exists forever.
Main.getLayerManager().addActiveLayerChangeListener(e -> refreshTitle());
- Main.getLayerManager().addLayerChangeListener(new ManageLayerListeners(), true);
+ Main.getLayerManager().addAndFireLayerChangeListener(new ManageLayerListeners());
refreshTitle();
diff --git a/src/org/openstreetmap/josm/gui/MapFrame.java b/src/org/openstreetmap/josm/gui/MapFrame.java
index 036aaca..e1ea1fd 100644
--- a/src/org/openstreetmap/josm/gui/MapFrame.java
+++ b/src/org/openstreetmap/josm/gui/MapFrame.java
@@ -242,7 +242,7 @@ public class MapFrame extends JPanel implements Destroyable, ActiveLayerChangeLi
toolBarActions.setFloatable(false);
// toolBarToggles, toggle dialog buttons
- LayerListDialog.createInstance(this);
+ LayerListDialog.createInstance(mapView.getLayerManager());
propertiesDialog = new PropertiesDialog();
selectionListDialog = new SelectionListDialog();
relationListDialog = new RelationListDialog();
diff --git a/src/org/openstreetmap/josm/gui/MapStatus.java b/src/org/openstreetmap/josm/gui/MapStatus.java
index d211559..082915e 100644
--- a/src/org/openstreetmap/josm/gui/MapStatus.java
+++ b/src/org/openstreetmap/josm/gui/MapStatus.java
@@ -78,6 +78,7 @@ import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.tools.Destroyable;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
/**
* A component that manages some status information display about the map.
@@ -586,7 +587,7 @@ public final class MapStatus extends JPanel implements Helpful, Destroyable, Pre
*/
private JLabel popupBuildPrimitiveLabels(final OsmPrimitive osm) {
final StringBuilder text = new StringBuilder(32);
- String name = osm.getDisplayName(DefaultNameFormatter.getInstance());
+ String name = Utils.escapeReservedCharactersHTML(osm.getDisplayName(DefaultNameFormatter.getInstance()));
if (osm.isNewOrUndeleted() || osm.isModified()) {
name = "<i><b>"+ name + "*</b></i>";
}
@@ -600,7 +601,8 @@ public final class MapStatus extends JPanel implements Helpful, Destroyable, Pre
}
if (osm.getUser() != null) {
- text.append(" [").append(tr("User:")).append(' ').append(osm.getUser().getName()).append(']');
+ text.append(" [").append(tr("User:")).append(' ')
+ .append(Utils.escapeReservedCharactersHTML(osm.getUser().getName())).append(']');
}
for (String key : osm.keySet()) {
diff --git a/src/org/openstreetmap/josm/gui/MapView.java b/src/org/openstreetmap/josm/gui/MapView.java
index 2bc17c1..3477e1e 100644
--- a/src/org/openstreetmap/josm/gui/MapView.java
+++ b/src/org/openstreetmap/josm/gui/MapView.java
@@ -71,6 +71,7 @@ import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer;
import org.openstreetmap.josm.gui.layer.markerlayer.PlayHeadMarker;
import org.openstreetmap.josm.tools.AudioPlayer;
import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.Logging;
import org.openstreetmap.josm.tools.Shortcut;
import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.bugreport.BugReport;
@@ -254,7 +255,7 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
public MapView(MainLayerManager layerManager, final ViewportData viewportData) {
this.layerManager = layerManager;
initialViewport = viewportData;
- layerManager.addLayerChangeListener(this, true);
+ layerManager.addAndFireLayerChangeListener(this);
layerManager.addActiveLayerChangeListener(this);
Main.pref.addPreferenceChangeListener(this);
@@ -445,7 +446,8 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
try {
LayerPainter painter = registeredLayers.get(layer);
if (painter == null) {
- throw new IllegalArgumentException("Cannot paint layer, it is not registered.");
+ Logging.warn("Cannot paint layer, it is not registered: {0}", layer);
+ return;
}
MapViewRectangle clipBounds = getState().getViewArea(g.getClipBounds());
MapViewGraphics paintGraphics = new MapViewGraphics(this, g, clipBounds);
@@ -745,7 +747,7 @@ LayerManager.LayerChangeListener, MainLayerManager.ActiveLayerChangeListener {
* Destroy this map view panel. Should be called once when it is not needed any more.
*/
public void destroy() {
- layerManager.removeLayerChangeListener(this, true);
+ layerManager.removeAndFireLayerChangeListener(this);
layerManager.removeActiveLayerChangeListener(this);
Main.pref.removePreferenceChangeListener(this);
DataSet.removeSelectionListener(repaintSelectionChangedListener);
diff --git a/src/org/openstreetmap/josm/gui/MapViewState.java b/src/org/openstreetmap/josm/gui/MapViewState.java
index cb0cc6c..d70eb39 100644
--- a/src/org/openstreetmap/josm/gui/MapViewState.java
+++ b/src/org/openstreetmap/josm/gui/MapViewState.java
@@ -188,15 +188,16 @@ public final class MapViewState implements Serializable {
}
/**
- * Gets the {@link MapViewPoint} for the given node. This is faster than {@link #getPointFor(LatLon)} because it uses the node east/north
- * cache.
+ * Gets the {@link MapViewPoint} for the given node.
+ * This is faster than {@link #getPointFor(LatLon)} because it uses the node east/north cache.
* @param node The node
* @return The position of that node.
* @since 10827
*/
public MapViewPoint getPointFor(Node node) {
try {
- return getPointFor(node.getEastNorth(getProjection()));
+ return getPointFor(Optional.ofNullable(node.getEastNorth(getProjection()))
+ .orElseThrow(IllegalArgumentException::new));
} catch (JosmRuntimeException | IllegalArgumentException | IllegalStateException e) {
throw BugReport.intercept(e).put("node", node);
}
diff --git a/src/org/openstreetmap/josm/gui/NavigatableComponent.java b/src/org/openstreetmap/josm/gui/NavigatableComponent.java
index ded6858..895902a 100644
--- a/src/org/openstreetmap/josm/gui/NavigatableComponent.java
+++ b/src/org/openstreetmap/josm/gui/NavigatableComponent.java
@@ -623,6 +623,29 @@ public class NavigatableComponent extends JComponent implements Helpful {
// snap scale to imagery if needed
newScale = scaleRound(newScale);
+ // Align to the pixel grid:
+ // This is a sub-pixel correction to ensure consistent drawing at a certain scale.
+ // For example take 2 nodes, that have a distance of exactly 2.6 pixels.
+ // Depending on the offset, the distance in rounded or truncated integer
+ // pixels will be 2 or 3. It is preferable to have a consistent distance
+ // and not switch back and forth as the viewport moves. This can be achieved by
+ // locking an arbitrary point to integer pixel coordinates. (Here the EastNorth
+ // origin is used as reference point.)
+ // Note that the normal right mouse button drag moves the map by integer pixel
+ // values, so it is not an issue in this case. It only shows when zooming
+ // in & back out, etc.
+ MapViewState mvs = getState().usingScale(newScale);
+ mvs = mvs.movedTo(mvs.getCenter(), newCenter);
+ Point2D enOrigin = mvs.getPointFor(new EastNorth(0, 0)).getInView();
+ // as a result of the alignment, it is common to round "half integer" values
+ // like 1.49999, which is numerically unstable; add small epsilon to resolve this
+ final double epsilon = 1e-3;
+ Point2D enOriginAligned = new Point2D.Double(
+ Math.round(enOrigin.getX()) + epsilon,
+ Math.round(enOrigin.getY()) + epsilon);
+ EastNorth enShift = mvs.getForView(enOriginAligned.getX(), enOriginAligned.getY()).getEastNorth();
+ newCenter = newCenter.subtract(enShift);
+
if (!newCenter.equals(getCenter()) || !Utils.equalsEpsilon(getScale(), newScale)) {
if (!initial) {
pushZoomUndo(getCenter(), getScale());
@@ -639,22 +662,20 @@ public class NavigatableComponent extends JComponent implements Helpful {
* @param initial true if this call initializes the viewport.
*/
private void zoomNoUndoTo(EastNorth newCenter, double newScale, boolean initial) {
- if (!newCenter.equals(getCenter())) {
- EastNorth oldCenter = getCenter();
- state = state.movedTo(state.getCenterAtPixel(), newCenter);
- if (!initial) {
- firePropertyChange(PROPNAME_CENTER, oldCenter, newCenter);
- }
- }
if (!Utils.equalsEpsilon(getScale(), newScale)) {
double oldScale = getScale();
state = state.usingScale(newScale);
- // temporary. Zoom logic needs to be moved.
- state = state.movedTo(state.getCenterAtPixel(), newCenter);
if (!initial) {
firePropertyChange(PROPNAME_SCALE, oldScale, newScale);
}
}
+ if (!newCenter.equals(getCenter())) {
+ EastNorth oldCenter = getCenter();
+ state = state.movedTo(state.getCenter(), newCenter);
+ if (!initial) {
+ firePropertyChange(PROPNAME_CENTER, oldCenter, newCenter);
+ }
+ }
if (!initial) {
repaint();
diff --git a/src/org/openstreetmap/josm/gui/NotificationManager.java b/src/org/openstreetmap/josm/gui/NotificationManager.java
index e47e93c..9494cd6 100644
--- a/src/org/openstreetmap/josm/gui/NotificationManager.java
+++ b/src/org/openstreetmap/josm/gui/NotificationManager.java
@@ -39,6 +39,7 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.preferences.IntegerProperty;
import org.openstreetmap.josm.gui.help.HelpBrowser;
import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.tools.ImageProvider;
/**
@@ -102,31 +103,32 @@ class NotificationManager {
currentNotification = queue.poll();
if (currentNotification == null) return;
- currentNotificationPanel = new NotificationPanel(currentNotification, new FreezeMouseListener(), e -> this.stopHideTimer());
- currentNotificationPanel.validate();
-
- int margin = 5;
- JFrame parentWindow = (JFrame) Main.parent;
- Dimension size = currentNotificationPanel.getPreferredSize();
- if (parentWindow != null) {
- int x;
- int y;
- if (Main.isDisplayingMapView() && Main.map.mapView.getHeight() > 0) {
- MapView mv = Main.map.mapView;
- Point mapViewPos = SwingUtilities.convertPoint(mv.getParent(), mv.getX(), mv.getY(), Main.parent);
- x = mapViewPos.x + margin;
- y = mapViewPos.y + mv.getHeight() - Main.map.statusLine.getHeight() - size.height - margin;
- } else {
- x = margin;
- y = parentWindow.getHeight() - Main.toolbar.control.getSize().height - size.height - margin;
- }
- parentWindow.getLayeredPane().add(currentNotificationPanel, JLayeredPane.POPUP_LAYER, 0);
-
- currentNotificationPanel.setLocation(x, y);
- }
- currentNotificationPanel.setSize(size);
+ GuiHelper.runInEDTAndWait(() -> {
+ currentNotificationPanel = new NotificationPanel(currentNotification, new FreezeMouseListener(), e -> this.stopHideTimer());
+ currentNotificationPanel.validate();
+
+ int margin = 5;
+ JFrame parentWindow = (JFrame) Main.parent;
+ Dimension size = currentNotificationPanel.getPreferredSize();
+ if (parentWindow != null) {
+ int x;
+ int y;
+ if (Main.isDisplayingMapView() && Main.map.mapView.getHeight() > 0) {
+ MapView mv = Main.map.mapView;
+ Point mapViewPos = SwingUtilities.convertPoint(mv.getParent(), mv.getX(), mv.getY(), Main.parent);
+ x = mapViewPos.x + margin;
+ y = mapViewPos.y + mv.getHeight() - Main.map.statusLine.getHeight() - size.height - margin;
+ } else {
+ x = margin;
+ y = parentWindow.getHeight() - Main.toolbar.control.getSize().height - size.height - margin;
+ }
+ parentWindow.getLayeredPane().add(currentNotificationPanel, JLayeredPane.POPUP_LAYER, 0);
- currentNotificationPanel.setVisible(true);
+ currentNotificationPanel.setLocation(x, y);
+ }
+ currentNotificationPanel.setSize(size);
+ currentNotificationPanel.setVisible(true);
+ });
running = true;
elapsedTime = 0;
diff --git a/src/org/openstreetmap/josm/gui/ProgramArguments.java b/src/org/openstreetmap/josm/gui/ProgramArguments.java
index 268f189..369366b 100644
--- a/src/org/openstreetmap/josm/gui/ProgramArguments.java
+++ b/src/org/openstreetmap/josm/gui/ProgramArguments.java
@@ -135,7 +135,7 @@ public class ProgramArguments {
if (opt != null) {
addOption(opt, g.getOptarg());
} else
- throw new IllegalArgumentException("Invalid option: "+c);
+ throw new IllegalArgumentException("Invalid option: "+ (char) c);
}
// positional arguments are a shortcut for the --download ... option
for (int i = g.getOptind(); i < args.length; ++i) {
diff --git a/src/org/openstreetmap/josm/gui/SelectionManager.java b/src/org/openstreetmap/josm/gui/SelectionManager.java
index 445e491..d441b8c 100644
--- a/src/org/openstreetmap/josm/gui/SelectionManager.java
+++ b/src/org/openstreetmap/josm/gui/SelectionManager.java
@@ -15,6 +15,8 @@ import java.beans.PropertyChangeListener;
import java.util.Collection;
import java.util.LinkedList;
+import javax.swing.Action;
+
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.SelectByInternalPointAction;
import org.openstreetmap.josm.data.Bounds;
@@ -59,7 +61,7 @@ public class SelectionManager implements MouseListener, MouseMotionListener, Pro
* to get informed when a selection closes.
* @author imi
*/
- public interface SelectionEnded {
+ public interface SelectionEnded extends Action {
/**
* Called, when the left mouse button was released.
* @param r The rectangle that encloses the current selection.
@@ -68,19 +70,6 @@ public class SelectionManager implements MouseListener, MouseMotionListener, Pro
* @see SelectionManager#getSelectedObjects(boolean)
*/
void selectionEnded(Rectangle r, MouseEvent e);
-
- /**
- * Called to register the selection manager for "active" property.
- * @param listener The listener to register
- */
- void addPropertyChangeListener(PropertyChangeListener listener);
-
- /**
- * Called to remove the selection manager from the listener list
- * for "active" property.
- * @param listener The listener to register
- */
- void removePropertyChangeListener(PropertyChangeListener listener);
}
/**
diff --git a/src/org/openstreetmap/josm/gui/SplashScreen.java b/src/org/openstreetmap/josm/gui/SplashScreen.java
index 2b20b6a..e83a617 100644
--- a/src/org/openstreetmap/josm/gui/SplashScreen.java
+++ b/src/org/openstreetmap/josm/gui/SplashScreen.java
@@ -5,6 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Color;
import java.awt.Component;
+import java.awt.Container;
import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
@@ -16,6 +17,7 @@ import java.util.Objects;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.swing.BorderFactory;
+import javax.swing.JComponent;
import javax.swing.JFrame;
import javax.swing.JLabel;
import javax.swing.JPanel;
@@ -56,9 +58,11 @@ public class SplashScreen extends JFrame implements ChangeListener {
setUndecorated(true);
// Add a nice border to the main splash screen
- JPanel contentPane = (JPanel) this.getContentPane();
+ Container contentPane = this.getContentPane();
Border margin = new EtchedBorder(1, Color.white, Color.gray);
- contentPane.setBorder(margin);
+ if (contentPane instanceof JComponent) {
+ ((JComponent) contentPane).setBorder(margin);
+ }
// Add a margin from the border to the content
JPanel innerContentPane = new JPanel(new GridBagLayout());
diff --git a/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java b/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
index 83bab67..1f61392 100644
--- a/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
+++ b/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java
@@ -605,9 +605,7 @@ public class TileSelectionBBoxChooser extends JPanel implements BBoxChooser {
} catch (NumberFormatException e) {
return false;
}
- if (tileIndex < 0 || tileIndex >= Math.pow(2, zoomLevel)) return false;
-
- return true;
+ return tileIndex >= 0 && tileIndex < Math.pow(2, zoomLevel);
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java b/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java
index 24b9dae..0eebd8e 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java
@@ -9,7 +9,7 @@ import org.openstreetmap.josm.tools.Utils;
/**
* Enumeration of the possible comparison pairs
- *
+ * @since 1650
*/
public enum ComparePairType {
@@ -47,12 +47,10 @@ public enum ComparePairType {
}
/**
- * replies true, if <code>role</code> is participating in this comparison
- * pair
+ * replies true, if <code>role</code> is participating in this comparison pair
*
* @param role the list role
- * @return true, if <code>role</code> is participating in this comparison
- * pair; false, otherwise
+ * @return true, if <code>role</code> is participating in this comparison pair; false, otherwise
*/
public boolean isParticipatingIn(ListRole role) {
for (ListRole r: participatingRoles) {
@@ -62,18 +60,16 @@ public enum ComparePairType {
}
/**
- * replies the pair of {@link ListRole}s participating in this comparison
- * pair
+ * replies the pair of {@link ListRole}s participating in this comparison pair
*
* @return the pair of list roles
*/
public ListRole[] getParticipatingRoles() {
- return participatingRoles;
+ return Utils.copyArray(participatingRoles);
}
/**
- * replies the opposite role of <code>role</code> participating in this comparison
- * pair
+ * replies the opposite role of <code>role</code> participating in this comparison pair
*
* @param role one of the two roles in this pair
* @return the opposite role
diff --git a/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java b/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
index 4dce0a9..a64ccf2 100644
--- a/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
+++ b/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
@@ -28,6 +28,7 @@ import org.openstreetmap.josm.gui.conflict.pair.IConflictResolver;
import org.openstreetmap.josm.gui.conflict.pair.MergeDecisionType;
import org.openstreetmap.josm.gui.history.VersionInfoPanel;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
/**
* This class represents a UI component for resolving conflicts in some properties of {@link OsmPrimitive}.
@@ -314,7 +315,7 @@ public class PropertiesMerger extends JPanel implements ChangeListener, IConflic
return tr("(none)");
StringBuilder str = new StringBuilder("<html>");
for (OsmPrimitive r: referrers) {
- str.append(r.getDisplayName(DefaultNameFormatter.getInstance())).append("<br>");
+ str.append(Utils.escapeReservedCharactersHTML(r.getDisplayName(DefaultNameFormatter.getInstance()))).append("<br>");
}
str.append("</html>");
return str.toString();
diff --git a/src/org/openstreetmap/josm/gui/datatransfer/ClipboardUtils.java b/src/org/openstreetmap/josm/gui/datatransfer/ClipboardUtils.java
index df3d954..0f4e8b2 100644
--- a/src/org/openstreetmap/josm/gui/datatransfer/ClipboardUtils.java
+++ b/src/org/openstreetmap/josm/gui/datatransfer/ClipboardUtils.java
@@ -33,6 +33,7 @@ public final class ClipboardUtils {
private static Clipboard clipboard;
private ClipboardUtils() {
+ // Hide default constructor for utility classes
}
/**
diff --git a/src/org/openstreetmap/josm/gui/datatransfer/importers/OsmLinkPaster.java b/src/org/openstreetmap/josm/gui/datatransfer/importers/OsmLinkPaster.java
index d251c7b..eac739d 100644
--- a/src/org/openstreetmap/josm/gui/datatransfer/importers/OsmLinkPaster.java
+++ b/src/org/openstreetmap/josm/gui/datatransfer/importers/OsmLinkPaster.java
@@ -50,7 +50,7 @@ public class OsmLinkPaster extends AbstractOsmDataPaster {
}
String transferData = (String) support.getTransferable().getTransferData(df);
- if (new NoWarnOpenLocationAction().openUrl(transferData)) {
+ if (!new NoWarnOpenLocationAction().openUrl(transferData).isEmpty()) {
return true;
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java b/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
index 0edc588..612e84c 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
@@ -28,6 +28,7 @@ import javax.swing.table.TableColumnModel;
import javax.swing.table.TableModel;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.mapmode.MapMode;
import org.openstreetmap.josm.actions.search.SearchAction;
import org.openstreetmap.josm.data.osm.Filter;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -45,6 +46,8 @@ 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.gui.MapFrame;
+import org.openstreetmap.josm.gui.MapFrame.MapModeChangeListener;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.InputMapUtils;
@@ -56,7 +59,7 @@ import org.openstreetmap.josm.tools.Shortcut;
*
* @author Petr_Dlouhý
*/
-public class FilterDialog extends ToggleDialog implements DataSetListener {
+public class FilterDialog extends ToggleDialog implements DataSetListener, MapModeChangeListener {
private JTable userTable;
private final FilterTableModel filterModel = new FilterTableModel();
@@ -81,12 +84,14 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
@Override
public void showNotify() {
DatasetEventManager.getInstance().addDatasetListener(this, FireMode.IN_EDT_CONSOLIDATED);
+ MapFrame.addMapModeChangeListener(this);
filterModel.executeFilters();
}
@Override
public void hideNotify() {
DatasetEventManager.getInstance().removeDatasetListener(this);
+ MapFrame.removeMapModeChangeListener(this);
filterModel.clearFilterFlags();
Main.map.mapView.repaint();
}
@@ -107,6 +112,9 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
tr("Filter mode")
};
+ /**
+ * Builds the GUI.
+ */
protected void build() {
userTable = new UserTable(filterModel);
@@ -374,8 +382,13 @@ public class FilterDialog extends ToggleDialog implements DataSetListener {
filterModel.executeFilters(getAffectedPrimitives(event.getPrimitives()));
}
+ @Override
+ public void mapModeChange(MapMode oldMapMode, MapMode newMapMode) {
+ filterModel.executeFilters();
+ }
+
/**
- * This method is intendet for Plugins getting the filtermodel and using .addFilter() to
+ * This method is intended for Plugins getting the filtermodel and using .addFilter() to
* add a new filter.
* @return the filtermodel
*/
diff --git a/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java
index 04b9545..9a54f0d 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java
@@ -66,7 +66,9 @@ public class FilterTableModel extends AbstractTableModel {
Main.error(e);
JOptionPane.showMessageDialog(
Main.parent,
- tr("<html>Error in filter <code>{0}</code>:<br>{1}", Utils.shortenString(filter.text, 80), e.getMessage()),
+ tr("<html>Error in filter <code>{0}</code>:<br>{1}",
+ Utils.escapeReservedCharactersHTML(Utils.shortenString(filter.text, 80)),
+ Utils.escapeReservedCharactersHTML(e.getMessage())),
tr("Error in filter"),
JOptionPane.ERROR_MESSAGE);
filter.enable = false;
@@ -273,19 +275,19 @@ public class FilterTableModel extends AbstractTableModel {
return classes[column];
}
+ /**
+ * Determines if a cell is enabled.
+ * @param row row index
+ * @param column column index
+ * @return {@code true} if the cell at (row, column) is enabled
+ */
public boolean isCellEnabled(int row, int column) {
- if (!filters.get(row).enable && column != 0)
- return false;
- return true;
+ return filters.get(row).enable || column == 0;
}
@Override
public boolean isCellEditable(int row, int column) {
- if (!filters.get(row).enable && column != 0)
- return false;
- if (column < 4)
- return true;
- return false;
+ return column < 4 && isCellEnabled(row, column);
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java b/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
index e82916a..6b14ed7 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
@@ -8,8 +8,6 @@ import java.awt.Component;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.GraphicsEnvironment;
-import java.awt.Point;
-import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.InputEvent;
import java.awt.event.KeyEvent;
@@ -32,7 +30,6 @@ import javax.swing.JCheckBox;
import javax.swing.JComponent;
import javax.swing.JLabel;
import javax.swing.JTable;
-import javax.swing.JViewport;
import javax.swing.KeyStroke;
import javax.swing.ListSelectionModel;
import javax.swing.UIManager;
@@ -46,7 +43,6 @@ import javax.swing.table.TableModel;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.MergeLayerAction;
import org.openstreetmap.josm.data.preferences.AbstractProperty;
-import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.SideButton;
import org.openstreetmap.josm.gui.dialogs.layer.ActivateLayerAction;
@@ -72,6 +68,7 @@ import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.gui.widgets.DisableShortcutsOnFocusGainedTextField;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
+import org.openstreetmap.josm.gui.widgets.ScrollableTable;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.InputMapUtils;
import org.openstreetmap.josm.tools.MultikeyActionsHandler;
@@ -91,14 +88,15 @@ public class LayerListDialog extends ToggleDialog {
private static volatile LayerListDialog instance;
/**
- * Creates the instance of the dialog. It's connected to the map frame <code>mapFrame</code>
+ * Creates the instance of the dialog. It's connected to the layer manager
*
- * @param mapFrame the map frame
+ * @param layerManager the layer manager
+ * @since 11885 (signature)
*/
- public static void createInstance(MapFrame mapFrame) {
+ public static void createInstance(MainLayerManager layerManager) {
if (instance != null)
throw new IllegalStateException("Dialog was already created");
- instance = new LayerListDialog(mapFrame);
+ instance = new LayerListDialog(layerManager);
}
/**
@@ -106,7 +104,7 @@ public class LayerListDialog extends ToggleDialog {
*
* @return the instance of the dialog
* @throws IllegalStateException if the dialog is not created yet
- * @see #createInstance(MapFrame)
+ * @see #createInstance(MainLayerManager)
*/
public static LayerListDialog getInstance() {
if (instance == null)
@@ -165,15 +163,7 @@ public class LayerListDialog extends ToggleDialog {
}
/**
- * Creates a layer list and attach it to the given mapView.
- * @param mapFrame map frame
- */
- protected LayerListDialog(MapFrame mapFrame) {
- this(mapFrame.mapView.getLayerManager());
- }
-
- /**
- * Creates a layer list and attach it to the given mapView.
+ * Creates a layer list and attach it to the given layer manager.
* @param layerManager The layer manager this list is for
* @since 10467
*/
@@ -332,14 +322,14 @@ public class LayerListDialog extends ToggleDialog {
@Override
public void showNotify() {
layerManager.addActiveLayerChangeListener(activateLayerAction);
- layerManager.addLayerChangeListener(model, true);
+ layerManager.addAndFireLayerChangeListener(model);
layerManager.addAndFireActiveLayerChangeListener(model);
model.populate();
}
@Override
public void hideNotify() {
- layerManager.removeLayerChangeListener(model, true);
+ layerManager.removeAndFireLayerChangeListener(model);
layerManager.removeActiveLayerChangeListener(model);
layerManager.removeActiveLayerChangeListener(activateLayerAction);
}
@@ -994,9 +984,7 @@ public class LayerListDialog extends ToggleDialog {
@Override
public boolean isCellEditable(int row, int col) {
- if (col == 0 && getActiveLayer() == getLayers().get(row))
- return false;
- return true;
+ return col != 0 || getActiveLayer() != getLayers().get(row);
}
@Override
@@ -1095,7 +1083,7 @@ public class LayerListDialog extends ToggleDialog {
/**
* This component displays a list of layers and provides the methods needed by {@link LayerListModel}.
*/
- static class LayerList extends JTable {
+ static class LayerList extends ScrollableTable {
LayerList(LayerListModel dataModel) {
super(dataModel);
@@ -1107,16 +1095,6 @@ public class LayerListDialog extends ToggleDialog {
setTransferHandler(new LayerListTransferHandler());
}
- public void scrollToVisible(int row, int col) {
- if (!(getParent() instanceof JViewport))
- return;
- JViewport viewport = (JViewport) getParent();
- Rectangle rect = getCellRect(row, col, true);
- Point pt = viewport.getViewPosition();
- rect.setLocation(rect.x - pt.x, rect.y - pt.y);
- viewport.scrollRectToVisible(rect);
- }
-
@Override
public LayerListModel getModel() {
return (LayerListModel) super.getModel();
diff --git a/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java b/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
index 251c42d..97e2fbd 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
@@ -9,12 +9,9 @@ import java.awt.Dimension;
import java.awt.Font;
import java.awt.GridBagLayout;
import java.awt.Insets;
-import java.awt.Point;
-import java.awt.Rectangle;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.awt.event.MouseEvent;
-import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
@@ -41,7 +38,6 @@ import javax.swing.JPopupMenu;
import javax.swing.JScrollPane;
import javax.swing.JTabbedPane;
import javax.swing.JTable;
-import javax.swing.JViewport;
import javax.swing.ListSelectionModel;
import javax.swing.SingleSelectionModel;
import javax.swing.SwingConstants;
@@ -54,7 +50,6 @@ import javax.swing.filechooser.FileFilter;
import javax.swing.table.AbstractTableModel;
import javax.swing.table.DefaultTableCellRenderer;
import javax.swing.table.TableCellRenderer;
-import javax.swing.table.TableModel;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.actions.ExtensionFileFilter;
@@ -77,6 +72,7 @@ import org.openstreetmap.josm.gui.widgets.FileChooserManager;
import org.openstreetmap.josm.gui.widgets.HtmlPanel;
import org.openstreetmap.josm.gui.widgets.JosmTextArea;
import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
+import org.openstreetmap.josm.gui.widgets.ScrollableTable;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageOverlay;
import org.openstreetmap.josm.tools.ImageProvider;
@@ -91,7 +87,7 @@ import org.openstreetmap.josm.tools.Utils;
*/
public class MapPaintDialog extends ToggleDialog {
- protected StylesTable tblStyles;
+ protected ScrollableTable tblStyles;
protected StylesModel model;
protected final DefaultListSelectionModel selectionModel = new DefaultListSelectionModel();
@@ -138,7 +134,7 @@ public class MapPaintDialog extends ToggleDialog {
cbWireframe.addActionListener(e -> Main.main.menu.wireFrameToggleAction.actionPerformed(null));
cbWireframe.setBorder(new EmptyBorder(new Insets(1, 1, 1, 1)));
- tblStyles = new StylesTable(model);
+ tblStyles = new ScrollableTable(model);
tblStyles.setSelectionModel(selectionModel);
tblStyles.addMouseListener(new PopupMenuHandler());
tblStyles.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
@@ -178,23 +174,6 @@ public class MapPaintDialog extends ToggleDialog {
));
}
- protected static class StylesTable extends JTable {
-
- public StylesTable(TableModel dm) {
- super(dm);
- }
-
- public void scrollToVisible(int row, int col) {
- if (!(getParent() instanceof JViewport))
- return;
- JViewport viewport = (JViewport) getParent();
- Rectangle rect = getCellRect(row, col, true);
- Point pt = viewport.getViewPosition();
- rect.setLocation(rect.x - pt.x, rect.y - pt.y);
- viewport.scrollRectToVisible(rect);
- }
- }
-
@Override
public void showNotify() {
MapPaintStyles.addMapPaintSylesUpdateListener(model);
@@ -506,11 +485,8 @@ public class MapPaintDialog extends ToggleDialog {
getProgressMonitor().indeterminateSubTask(
tr("Save style ''{0}'' as ''{1}''", s.getDisplayString(), file.getPath()));
try {
- InputStream in = s.getSourceInputStream();
- try (InputStream bis = new BufferedInputStream(in)) {
- Files.copy(bis, file.toPath(), StandardCopyOption.REPLACE_EXISTING);
- } finally {
- s.closeSourceInputStream(in);
+ try (InputStream in = s.getSourceInputStream()) {
+ Files.copy(in, file.toPath(), StandardCopyOption.REPLACE_EXISTING);
}
} catch (IOException e) {
Main.warn(e);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
index 4afa213..da9ed27 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
@@ -264,9 +264,11 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
* @since 10467
*/
protected void registerInWindowMenu() {
- windowMenuItem = MainMenu.addWithCheckbox(Main.main.menu.windowMenu,
- (JosmAction) getToggleAction(),
- MainMenu.WINDOW_MENU_GROUP.TOGGLE_DIALOG);
+ if (Main.main != null) {
+ windowMenuItem = MainMenu.addWithCheckbox(Main.main.menu.windowMenu,
+ (JosmAction) getToggleAction(),
+ MainMenu.WINDOW_MENU_GROUP.TOGGLE_DIALOG);
+ }
}
/**
@@ -328,7 +330,9 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
}
// toggling the selected value in order to enforce PropertyChangeEvents
setIsShowing(true);
- windowMenuItem.setState(true);
+ if (windowMenuItem != null) {
+ windowMenuItem.setState(true);
+ }
toggleAction.putValue("selected", Boolean.FALSE);
toggleAction.putValue("selected", Boolean.TRUE);
}
@@ -373,7 +377,9 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
public void hideDialog() {
closeDetachedDialog();
this.setVisible(false);
- windowMenuItem.setState(false);
+ if (windowMenuItem != null) {
+ windowMenuItem.setState(false);
+ }
setIsShowing(false);
toggleAction.putValue("selected", Boolean.FALSE);
}
@@ -455,7 +461,9 @@ public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help
if (isShowing) {
hideNotify();
}
- Main.main.menu.windowMenu.remove(windowMenuItem);
+ if (Main.main != null) {
+ Main.main.menu.windowMenu.remove(windowMenuItem);
+ }
Toolkit.getDefaultToolkit().removeAWTEventListener(this);
Main.pref.removePreferenceChangeListener(this);
destroyComponents(this, false);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
index 0bcedbb..ad0f3fc 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java
@@ -54,6 +54,7 @@ import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
import org.openstreetmap.josm.gui.widgets.PopupMenuLauncher;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.bugreport.BugReportExceptionHandler;
/**
@@ -198,7 +199,7 @@ public class ChangesetContentPanel extends JPanel implements PropertyChangeListe
"<html>None of the selected objects is available in the current<br>"
+ "edit layer ''{0}''.</html>",
primitives.size(),
- Main.getLayerManager().getEditLayer().getName()
+ Utils.escapeReservedCharactersHTML(Main.getLayerManager().getEditLayer().getName())
),
title, JOptionPane.WARNING_MESSAGE, helpTopic
);
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java
index 223c8f8..3201862 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java
@@ -16,6 +16,10 @@ import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
*/
public class ChangesetContentTableCellRenderer extends AbstractCellRenderer {
+ /**
+ * Renders primitive modification type.
+ * @param type modification type
+ */
protected void renderModificationType(ChangesetModificationType type) {
switch(type) {
case CREATED: setText(tr("Created")); break;
@@ -34,12 +38,10 @@ public class ChangesetContentTableCellRenderer extends AbstractCellRenderer {
renderColors(isSelected);
switch(column) {
case 0:
- ChangesetModificationType type = (ChangesetModificationType) value;
- renderModificationType(type);
+ renderModificationType((ChangesetModificationType) value);
break;
case 1:
- HistoryOsmPrimitive primitive = (HistoryOsmPrimitive) value;
- renderId(primitive.getId());
+ renderId(((HistoryOsmPrimitive) value).getId());
break;
default:
/* do nothing */
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
index a846162..5171745 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableModel.java
@@ -17,13 +17,17 @@ import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
/**
* This is the table model for the content of a changeset.
- *
+ * @since 2689
*/
public class ChangesetContentTableModel extends AbstractTableModel {
private final transient List<ChangesetContentEntry> data = new ArrayList<>();
private final DefaultListSelectionModel selectionModel;
+ /**
+ * Constructs a new {@code ChangesetContentTableModel}.
+ * @param selectionModel selection model
+ */
public ChangesetContentTableModel(DefaultListSelectionModel selectionModel) {
this.selectionModel = selectionModel;
}
@@ -37,6 +41,10 @@ public class ChangesetContentTableModel extends AbstractTableModel {
return selectionModel.getMinSelectionIndex() >= 0;
}
+ /**
+ * Selects a single item by its index.
+ * @param row index
+ */
public void setSelectedByIdx(int row) {
selectionModel.setSelectionInterval(row, row);
}
@@ -49,6 +57,10 @@ public class ChangesetContentTableModel extends AbstractTableModel {
return selectionModel;
}
+ /**
+ * Returns the selected history primitives.
+ * @return the selected history primitives
+ */
public Set<HistoryOsmPrimitive> getSelectedPrimitives() {
Set<HistoryOsmPrimitive> ret = new HashSet<>();
for (int i = 0; i < data.size(); i++) {
@@ -77,6 +89,9 @@ public class ChangesetContentTableModel extends AbstractTableModel {
fireTableDataChanged();
}
+ /**
+ * Sort data.
+ */
protected void sort() {
data.sort((c1, c2) -> {
if (c1.getModificationType().equals(c2.getModificationType())) {
@@ -129,7 +144,6 @@ public class ChangesetContentTableModel extends AbstractTableModel {
/**
* The type used internally to keep information about {@link HistoryOsmPrimitive}
* with their {@link ChangesetModificationType}.
- *
*/
private static class ChangesetContentEntry implements ChangesetDataSetEntry {
private final ChangesetModificationType modificationType;
diff --git a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
index c8dd411..a5b6ed6 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java
@@ -16,6 +16,7 @@ import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.text.DateFormat;
import java.util.Collections;
+import java.util.Date;
import java.util.HashSet;
import java.util.Set;
@@ -42,6 +43,7 @@ import org.openstreetmap.josm.gui.widgets.JosmTextArea;
import org.openstreetmap.josm.gui.widgets.JosmTextField;
import org.openstreetmap.josm.io.OnlineResource;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.date.DateUtils;
/**
@@ -236,8 +238,10 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
tfUser.setText(msg);
DateFormat sdf = DateUtils.getDateTimeFormat(DateFormat.SHORT, DateFormat.SHORT);
- tfCreatedOn.setText(cs.getCreatedAt() == null ? "" : sdf.format(cs.getCreatedAt()));
- tfClosedOn.setText(cs.getClosedAt() == null ? "" : sdf.format(cs.getClosedAt()));
+ Date createdDate = cs.getCreatedAt();
+ Date closedDate = cs.getClosedAt();
+ tfCreatedOn.setText(createdDate == null ? "" : sdf.format(createdDate));
+ tfClosedOn.setText(closedDate == null ? "" : sdf.format(closedDate));
}
/**
@@ -339,7 +343,7 @@ public class ChangesetDetailPanel extends JPanel implements PropertyChangeListen
tr("<html>None of the objects in the content of changeset {0} is available in the current<br>"
+ "edit layer ''{1}''.</html>",
currentChangeset.getId(),
- Main.getLayerManager().getEditLayer().getName()
+ Utils.escapeReservedCharactersHTML(Main.getLayerManager().getEditLayer().getName())
),
tr("Nothing to select"),
JOptionPane.WARNING_MESSAGE,
diff --git a/src/org/openstreetmap/josm/gui/dialogs/layer/LayerListTransferHandler.java b/src/org/openstreetmap/josm/gui/dialogs/layer/LayerListTransferHandler.java
index f42715b..0a091ce 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/layer/LayerListTransferHandler.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/layer/LayerListTransferHandler.java
@@ -73,12 +73,8 @@ public class LayerListTransferHandler extends TransferHandler {
return false;
}
- if (support.getDropAction() == LINK) {
- // cannot link yet.
- return false;
- }
-
- return true;
+ // cannot link yet.
+ return support.getDropAction() != LINK;
}
@Override
@@ -91,8 +87,12 @@ public class LayerListTransferHandler extends TransferHandler {
int dropLocation;
if (support.isDrop()) {
- JTable.DropLocation dl = (JTable.DropLocation) support.getDropLocation();
- dropLocation = dl.getRow();
+ DropLocation dl = support.getDropLocation();
+ if (dl instanceof JTable.DropLocation) {
+ dropLocation = ((JTable.DropLocation) dl).getRow();
+ } else {
+ dropLocation = 0;
+ }
} else {
dropLocation = layers.getLayers().get(0).getDefaultLayerPosition().getPosition(layers.getManager());
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java b/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java
index 1b3ca34..5eb1f04 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java
@@ -39,6 +39,7 @@ import org.openstreetmap.josm.tools.Utils;
* @author Michael Zangl
*/
public final class LayerVisibilityAction extends AbstractAction implements IEnabledStateUpdating, LayerAction {
+ private static final String DIALOGS_LAYERLIST = "dialogs/layerlist";
private static final int SLIDER_STEPS = 100;
/**
* Steps the value is changed by a mouse wheel change (one full click)
@@ -69,7 +70,7 @@ public final class LayerVisibilityAction extends AbstractAction implements IEnab
content.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
content.setLayout(new GridBagLayout());
- new ImageProvider("dialogs/layerlist", "visibility").getResource().attachImageIcon(this, true);
+ new ImageProvider(DIALOGS_LAYERLIST, "visibility").getResource().attachImageIcon(this, true);
putValue(SHORT_DESCRIPTION, tr("Change visibility of the selected layer."));
visibilityCheckbox = new JCheckBox(tr("Show layer"));
@@ -316,7 +317,7 @@ public final class LayerVisibilityAction extends AbstractAction implements IEnab
@Override
public ImageIcon getIcon() {
- return ImageProvider.get("dialogs/layerlist", "transparency");
+ return ImageProvider.get(DIALOGS_LAYERLIST, "transparency");
}
@Override
@@ -354,7 +355,7 @@ public final class LayerVisibilityAction extends AbstractAction implements IEnab
@Override
public ImageIcon getIcon() {
- return ImageProvider.get("dialogs/layerlist", "gamma");
+ return ImageProvider.get(DIALOGS_LAYERLIST, "gamma");
}
@Override
@@ -412,7 +413,7 @@ public final class LayerVisibilityAction extends AbstractAction implements IEnab
@Override
public ImageIcon getIcon() {
- return ImageProvider.get("dialogs/layerlist", "sharpness");
+ return ImageProvider.get(DIALOGS_LAYERLIST, "sharpness");
}
@Override
@@ -449,7 +450,7 @@ public final class LayerVisibilityAction extends AbstractAction implements IEnab
@Override
public ImageIcon getIcon() {
- return ImageProvider.get("dialogs/layerlist", "colorfulness");
+ return ImageProvider.get(DIALOGS_LAYERLIST, "colorfulness");
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java b/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
index 70fd658..f8b54fe 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java
@@ -75,6 +75,7 @@ import org.openstreetmap.josm.data.preferences.EnumProperty;
import org.openstreetmap.josm.data.preferences.IntegerProperty;
import org.openstreetmap.josm.data.preferences.StringProperty;
import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.IExtendedDialog;
import org.openstreetmap.josm.gui.datatransfer.ClipboardUtils;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox;
@@ -240,6 +241,10 @@ public class TagEditHelper {
addDialog.undoAllTagsAdding();
}
+ /**
+ * Returns a new {@code AddTagsDialog}.
+ * @return a new {@code AddTagsDialog}
+ */
protected AddTagsDialog getAddTagsDialog() {
return new AddTagsDialog();
}
@@ -266,11 +271,15 @@ public class TagEditHelper {
editDialog.performTagEdit();
}
- protected interface IEditTagDialog {
- ExtendedDialog showDialog();
-
- int getValue();
-
+ /**
+ * Extracted interface of {@link EditTagDialog}.
+ */
+ protected interface IEditTagDialog extends IExtendedDialog {
+ /**
+ * Edit tags of multiple selected objects according to selected ComboBox values
+ * If value == "", tag will be deleted
+ * Confirmations may be needed.
+ */
void performTagEdit();
}
@@ -482,11 +491,6 @@ public class TagEditHelper {
});
}
- /**
- * Edit tags of multiple selected objects according to selected ComboBox values
- * If value == "", tag will be deleted
- * Confirmations may be needed.
- */
@Override
public void performTagEdit() {
String value = Tag.removeWhiteSpaces(values.getEditor().getItem().toString());
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java b/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
index 23f3984..d243662 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
@@ -45,6 +45,7 @@ import org.openstreetmap.josm.io.OsmServerObjectReader;
import org.openstreetmap.josm.io.OsmTransferException;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
import org.xml.sax.SAXException;
/**
@@ -346,7 +347,7 @@ public class ChildRelationBrowser extends JPanel {
String message = tr("<html>The child relation<br>"
+ "{0}<br>"
+ "is deleted on the server. It cannot be loaded</html>",
- r.getDisplayName(DefaultNameFormatter.getInstance())
+ Utils.escapeReservedCharactersHTML(r.getDisplayName(DefaultNameFormatter.getInstance()))
);
JOptionPane.showMessageDialog(
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
index d9dcce2..5d6d536 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
@@ -97,6 +97,7 @@ import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetType;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
import org.openstreetmap.josm.tools.CheckParameterUtil;
import org.openstreetmap.josm.tools.Shortcut;
+import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.WindowGeometry;
/**
@@ -871,7 +872,7 @@ public class GenericRelationEditor extends RelationEditor {
+ "the object ''{0}''<br>"
+ "<br>"
+ "Do you really want to add another relation member?</html>",
- primitive.getDisplayName(DefaultNameFormatter.getInstance())
+ Utils.escapeReservedCharactersHTML(primitive.getDisplayName(DefaultNameFormatter.getInstance()))
);
int ret = ConditionalOptionPaneUtil.showOptionDialog(
"add_primitive_to_relation",
@@ -905,7 +906,7 @@ public class GenericRelationEditor extends RelationEditor {
+ "<br>"
+ "This creates circular references and is therefore discouraged.<br>"
+ "Skipping relation ''{0}''.</html>",
- primitive.getDisplayName(DefaultNameFormatter.getInstance()));
+ Utils.escapeReservedCharactersHTML(primitive.getDisplayName(DefaultNameFormatter.getInstance())));
JOptionPane.showMessageDialog(
Main.parent,
msg,
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
index a1b6880..addc129 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
@@ -333,9 +333,7 @@ implements TableModelListener, SelectionChangedListener, DataSetListener, OsmPri
}
public boolean canRemove(int... rows) {
- if (rows == null || rows.length == 0)
- return false;
- return true;
+ return rows != null && rows.length != 0;
}
public DefaultListSelectionModel getSelectionModel() {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTransferHandler.java b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTransferHandler.java
index df89571..d519742 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTransferHandler.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTransferHandler.java
@@ -60,7 +60,12 @@ public class MemberTransferHandler extends TransferHandler {
private static int computeInsertionRow(TransferSupport support, MemberTable destination) {
final int insertRow;
if (support.isDrop()) {
- insertRow = ((JTable.DropLocation) support.getDropLocation()).getRow();
+ DropLocation dl = support.getDropLocation();
+ if (dl instanceof JTable.DropLocation) {
+ insertRow = ((JTable.DropLocation) dl).getRow();
+ } else {
+ insertRow = 0;
+ }
} else {
int selection = destination.getSelectedRow();
if (selection < 0) {
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java
index 52ae353..5b8e561 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java
@@ -2,6 +2,7 @@
package org.openstreetmap.josm.gui.dialogs.relation;
import java.awt.Point;
+import java.awt.Window;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.util.HashMap;
@@ -193,11 +194,14 @@ public class RelationDialogManager extends WindowAdapter implements LayerChangeL
@Override
public void windowClosed(WindowEvent e) {
- RelationEditor editor = (RelationEditor) e.getWindow();
- for (Iterator<Entry<DialogContext, RelationEditor>> it = openDialogs.entrySet().iterator(); it.hasNext();) {
- if (editor.equals(it.next().getValue())) {
- it.remove();
- break;
+ Window w = e.getWindow();
+ if (w instanceof RelationEditor) {
+ RelationEditor editor = (RelationEditor) w;
+ for (Iterator<Entry<DialogContext, RelationEditor>> it = openDialogs.entrySet().iterator(); it.hasNext();) {
+ if (editor.equals(it.next().getValue())) {
+ it.remove();
+ break;
+ }
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java
index a556741..5fd32c7 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/actions/SavingAction.java
@@ -29,6 +29,7 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.gui.tagging.TagEditorModel;
import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
/**
* Abstract superclass of relation saving actions (OK, Apply, Cancel).
@@ -151,8 +152,8 @@ abstract class SavingAction extends AbstractRelationEditorAction {
tr("<html>Layer ''{0}'' already has a conflict for object<br>"
+ "''{1}''.<br>"
+ "Please resolve this conflict first, then try again.</html>",
- layer.getName(),
- editor.getRelation().getDisplayName(DefaultNameFormatter.getInstance())
+ Utils.escapeReservedCharactersHTML(layer.getName()),
+ Utils.escapeReservedCharactersHTML(editor.getRelation().getDisplayName(DefaultNameFormatter.getInstance()))
),
tr("Double conflict"),
JOptionPane.WARNING_MESSAGE
diff --git a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java
index 15d2558..42f4a9e 100644
--- a/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java
+++ b/src/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculator.java
@@ -134,10 +134,10 @@ public class WayConnectionTypeCalculator {
private int firstGroupIdx;
private void makeLoopIfNeeded(final List<WayConnectionType> con, final int i) {
- boolean loop;
+ boolean loop = false;
if (i == firstGroupIdx) { //is primitive loop
loop = determineDirection(i, FORWARD, i) == FORWARD;
- } else {
+ } else if (i >= 0) {
loop = determineDirection(i, con.get(i).direction, firstGroupIdx) == con.get(firstGroupIdx).direction;
}
if (loop) {
diff --git a/src/org/openstreetmap/josm/gui/help/HelpBrowser.java b/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
index f71ca81..22af7df 100644
--- a/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
+++ b/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
@@ -20,7 +20,7 @@ import java.util.Locale;
import javax.swing.AbstractAction;
import javax.swing.JButton;
-import javax.swing.JDialog;
+import javax.swing.JFrame;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
@@ -57,7 +57,7 @@ import org.openstreetmap.josm.tools.WindowGeometry;
/**
* Help browser displaying HTML pages fetched from JOSM wiki.
*/
-public class HelpBrowser extends JDialog implements IHelpBrowser {
+public class HelpBrowser extends JFrame implements IHelpBrowser {
/** the unique instance */
private static HelpBrowser instance;
@@ -149,6 +149,10 @@ public class HelpBrowser extends JDialog implements IHelpBrowser {
return ss;
}
+ /**
+ * Builds toolbar.
+ * @return the toolbar
+ */
protected JToolBar buildToolBar() {
JToolBar tb = new JToolBar();
tb.add(new JButton(new HomeAction(this)));
@@ -161,6 +165,9 @@ public class HelpBrowser extends JDialog implements IHelpBrowser {
return tb;
}
+ /**
+ * Builds GUI.
+ */
protected final void build() {
help = new JosmEditorPane();
JosmHTMLEditorKit kit = new JosmHTMLEditorKit();
@@ -219,6 +226,10 @@ public class HelpBrowser extends JDialog implements IHelpBrowser {
super.setVisible(visible);
}
+ /**
+ * Load help topic.
+ * @param content topic contents
+ */
protected void loadTopic(String content) {
Document document = help.getEditorKit().createDefaultDocument();
try {
diff --git a/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java b/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
index f0f4cc0..eb53b16 100644
--- a/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
+++ b/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
@@ -230,8 +230,8 @@ public class CoordinateInfoViewer extends JPanel {
protected final Pair<LatLon, LatLon> getCoordinates() {
HistoryOsmPrimitive p = getPrimitive();
- HistoryOsmPrimitive opposite = getOppositePrimitive();
if (!(p instanceof HistoryNode)) return null;
+ HistoryOsmPrimitive opposite = getOppositePrimitive();
if (!(opposite instanceof HistoryNode)) return null;
HistoryNode node = (HistoryNode) p;
HistoryNode oppositeNode = (HistoryNode) opposite;
diff --git a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
index 25694f1..f847735 100644
--- a/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
+++ b/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
@@ -151,7 +151,7 @@ public class VersionInfoPanel extends JPanel implements ChangeListener {
OsmDataLayer editLayer = Main.getLayerManager().getEditLayer();
text = tr("<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>",
Long.toString(version),
- editLayer == null ? tr("unknown") : editLayer.getName()
+ editLayer == null ? tr("unknown") : Utils.escapeReservedCharactersHTML(editLayer.getName())
);
} else {
String date = "?";
diff --git a/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java b/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java
index a3213fe..bbfb205 100644
--- a/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java
+++ b/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java
@@ -5,6 +5,7 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Component;
import java.text.DateFormat;
+import java.util.Date;
import javax.swing.ImageIcon;
import javax.swing.JLabel;
@@ -14,6 +15,7 @@ import javax.swing.UIManager;
import org.openstreetmap.josm.data.osm.Changeset;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.date.DateUtils;
/**
@@ -35,13 +37,15 @@ public class ChangesetCellRenderer extends JLabel implements ListCellRenderer<Ch
protected String buildToolTipText(Changeset cs) {
StringBuilder sb = new StringBuilder(64);
sb.append("<html><strong>").append(tr("Changeset id:")).append("</strong>").append(cs.getId()).append("<br>");
- if (cs.getCreatedAt() != null) {
+ Date createdDate = cs.getCreatedAt();
+ if (createdDate != null) {
sb.append("<strong>").append(tr("Created at:")).append("</strong>").append(
- DateUtils.formatDateTime(cs.getCreatedAt(), DateFormat.SHORT, DateFormat.SHORT)).append("<br>");
+ DateUtils.formatDateTime(createdDate, DateFormat.SHORT, DateFormat.SHORT)).append("<br>");
}
String comment = cs.get("comment");
if (comment != null) {
- sb.append("<strong>").append(tr("Changeset comment:")).append("</strong>").append(comment).append("<br>");
+ sb.append("<strong>").append(tr("Changeset comment:")).append("</strong>")
+ .append(Utils.escapeReservedCharactersHTML(comment)).append("<br>");
}
return sb.toString();
}
diff --git a/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java b/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
index 86cbd4c..7f463e8 100644
--- a/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
+++ b/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
@@ -77,12 +77,14 @@ public class DownloadOpenChangesetsTask extends PleaseWaitRunnable {
return;
}
if (changesets.isEmpty()) {
- JOptionPane.showMessageDialog(
- Main.parent,
- tr("There are no open changesets"),
- tr("No open changesets"),
- JOptionPane.INFORMATION_MESSAGE
- );
+ if (!GraphicsEnvironment.isHeadless()) {
+ JOptionPane.showMessageDialog(
+ Main.parent,
+ tr("There are no open changesets"),
+ tr("No open changesets"),
+ JOptionPane.INFORMATION_MESSAGE
+ );
+ }
return;
}
SwingUtilities.invokeLater(() -> ChangesetCache.getInstance().update(changesets));
diff --git a/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java b/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java
index 7a7758a..eba4d23 100644
--- a/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java
+++ b/src/org/openstreetmap/josm/gui/io/LayerNameAndFilePathTableCell.java
@@ -123,12 +123,9 @@ class LayerNameAndFilePathTableCell extends JPanel implements TableCellRenderer,
}
private static boolean canWrite(File f) {
- if (f == null) return false;
- if (f.isDirectory()) return false;
+ if (f == null || f.isDirectory()) return false;
if (f.exists() && f.canWrite()) return true;
- if (!f.exists() && f.getParentFile() != null && f.getParentFile().canWrite())
- return true;
- return false;
+ return !f.exists() && f.getParentFile() != null && f.getParentFile().canWrite();
}
/**
diff --git a/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java b/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java
index e75adce..00d80fc 100644
--- a/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java
+++ b/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java
@@ -15,6 +15,7 @@ import javax.swing.table.TableCellRenderer;
import javax.swing.table.TableColumn;
import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
class SaveLayersTableColumnModel extends DefaultTableColumnModel {
/** small renderer class that handles the "should be uploaded/saved" texts. */
@@ -41,18 +42,19 @@ class SaveLayersTableColumnModel extends DefaultTableColumnModel {
StringBuilder sb = new StringBuilder(24);
sb.append("<html>");
if (info != null) {
+ String htmlInfoName = Utils.escapeReservedCharactersHTML(info.getName());
if (info.getLayer().requiresUploadToServer() && !info.getLayer().isUploadDiscouraged()) {
panel.add(needsUpload, defaultCellStyle);
- sb.append(tr("Layer ''{0}'' has modifications which should be uploaded to the server.", info.getName()));
+ sb.append(tr("Layer ''{0}'' has modifications which should be uploaded to the server.", htmlInfoName));
} else {
if (info.isUploadable()) {
panel.add(pnlEmpty, defaultCellStyle);
}
if (info.getLayer().requiresUploadToServer()) {
- sb.append(tr("Layer ''{0}'' has modifications which are discouraged to be uploaded.", info.getName()));
+ sb.append(tr("Layer ''{0}'' has modifications which are discouraged to be uploaded.", htmlInfoName));
} else {
- sb.append(tr("Layer ''{0}'' has no modifications to be uploaded.", info.getName()));
+ sb.append(tr("Layer ''{0}'' has no modifications to be uploaded.", htmlInfoName));
}
}
sb.append("<br/>");
@@ -60,12 +62,12 @@ class SaveLayersTableColumnModel extends DefaultTableColumnModel {
if (info.getLayer().requiresSaveToFile()) {
panel.add(needsSave, defaultCellStyle);
sb.append(tr("Layer ''{0}'' has modifications which should be saved to its associated file ''{1}''.",
- info.getName(), info.getFile().toString()));
+ htmlInfoName, info.getFile().toString()));
} else {
if (info.isSavable()) {
panel.add(pnlEmpty, defaultCellStyle);
}
- sb.append(tr("Layer ''{0}'' has no modifications to be saved.", info.getName()));
+ sb.append(tr("Layer ''{0}'' has no modifications to be saved.", htmlInfoName));
}
}
sb.append("</html>");
diff --git a/src/org/openstreetmap/josm/gui/layer/AbstractMapViewPaintable.java b/src/org/openstreetmap/josm/gui/layer/AbstractMapViewPaintable.java
index dd7a7db..282532e 100644
--- a/src/org/openstreetmap/josm/gui/layer/AbstractMapViewPaintable.java
+++ b/src/org/openstreetmap/josm/gui/layer/AbstractMapViewPaintable.java
@@ -87,6 +87,7 @@ public abstract class AbstractMapViewPaintable implements MapViewPaintable {
/**
* This needs to be called whenever the content of this view was invalidated.
+ * It triggers a repaint of the components that display this layer.
*/
public void invalidate() {
for (PaintableInvalidationListener l : invalidationListeners) {
diff --git a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
index 5bda417..c689176 100644
--- a/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
@@ -4,7 +4,6 @@ package org.openstreetmap.josm.gui.layer;
import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.Color;
-import java.awt.Component;
import java.awt.Dimension;
import java.awt.Font;
import java.awt.Graphics;
@@ -12,10 +11,12 @@ import java.awt.Graphics2D;
import java.awt.GridBagLayout;
import java.awt.Image;
import java.awt.Point;
+import java.awt.Shape;
import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
+import java.awt.geom.AffineTransform;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
@@ -27,6 +28,7 @@ import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -41,28 +43,28 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Collectors;
+import java.util.stream.IntStream;
import java.util.stream.Stream;
import javax.swing.AbstractAction;
import javax.swing.Action;
-import javax.swing.BorderFactory;
-import javax.swing.JCheckBoxMenuItem;
import javax.swing.JLabel;
import javax.swing.JMenuItem;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JSeparator;
-import javax.swing.JTextField;
import javax.swing.Timer;
import org.openstreetmap.gui.jmapviewer.AttributionSupport;
import org.openstreetmap.gui.jmapviewer.MemoryTileCache;
import org.openstreetmap.gui.jmapviewer.OsmTileLoader;
import org.openstreetmap.gui.jmapviewer.Tile;
+import org.openstreetmap.gui.jmapviewer.TileRange;
import org.openstreetmap.gui.jmapviewer.TileXY;
import org.openstreetmap.gui.jmapviewer.interfaces.CachedTileLoader;
import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
+import org.openstreetmap.gui.jmapviewer.interfaces.IProjected;
import org.openstreetmap.gui.jmapviewer.interfaces.TemplatedTileSource;
import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
@@ -82,20 +84,31 @@ import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader;
import org.openstreetmap.josm.data.imagery.TileLoaderFactory;
import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
import org.openstreetmap.josm.data.preferences.IntegerProperty;
+import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.Projections;
import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.gui.NavigatableComponent.ZoomChangeListener;
-import org.openstreetmap.josm.gui.PleaseWaitRunnable;
import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
+import org.openstreetmap.josm.gui.layer.imagery.AutoLoadTilesAction;
+import org.openstreetmap.josm.gui.layer.imagery.AutoZoomAction;
+import org.openstreetmap.josm.gui.layer.imagery.DecreaseZoomAction;
+import org.openstreetmap.josm.gui.layer.imagery.FlushTileCacheAction;
import org.openstreetmap.josm.gui.layer.imagery.ImageryFilterSettings.FilterChangeListener;
+import org.openstreetmap.josm.gui.layer.imagery.IncreaseZoomAction;
+import org.openstreetmap.josm.gui.layer.imagery.LoadAllTilesAction;
+import org.openstreetmap.josm.gui.layer.imagery.LoadErroneousTilesAction;
+import org.openstreetmap.josm.gui.layer.imagery.ReprojectionTile;
+import org.openstreetmap.josm.gui.layer.imagery.ShowErrorsAction;
+import org.openstreetmap.josm.gui.layer.imagery.TileAnchor;
import org.openstreetmap.josm.gui.layer.imagery.TileCoordinateConverter;
import org.openstreetmap.josm.gui.layer.imagery.TilePosition;
-import org.openstreetmap.josm.gui.layer.imagery.TileRange;
import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings.DisplaySettingsChangeEvent;
import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings.DisplaySettingsChangeListener;
+import org.openstreetmap.josm.gui.layer.imagery.ZoomToBestAction;
+import org.openstreetmap.josm.gui.layer.imagery.ZoomToNativeLevelAction;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.io.WMSLayerImporter;
@@ -103,6 +116,7 @@ import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.MemoryManager;
import org.openstreetmap.josm.tools.MemoryManager.MemoryHandle;
import org.openstreetmap.josm.tools.MemoryManager.NotEnoughMemoryException;
+import org.openstreetmap.josm.tools.Utils;
/**
* Base abstract class that supports displaying images provided by TileSource. It might be TMS source, WMS or WMTS
@@ -179,7 +193,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
private final ImageryAdjustAction adjustAction = new ImageryAdjustAction(this);
// prepared to be moved to the painter
- private TileCoordinateConverter coordinateConverter;
+ protected TileCoordinateConverter coordinateConverter;
/**
* Creates Tile Source based Imagery Layer based on Imagery Info
@@ -219,6 +233,16 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
protected abstract TileLoaderFactory getTileLoaderFactory();
/**
+ * Get projections this imagery layer supports natively.
+ *
+ * For example projection of tiles that are downloaded from a server. Layer
+ * may support even more projections (by reprojecting the tiles), but with a
+ * certain loss in image quality and performance.
+ * @return projections this imagery layer supports natively; null if layer is projection agnostic.
+ */
+ public abstract Collection<String> getNativeProjections();
+
+ /**
* Creates and returns a new {@link TileSource} instance depending on {@link #info} specified in the constructor.
*
* @return TileSource for specified ImageryInfo
@@ -275,9 +299,6 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
/**
* Clears the tile cache.
- *
- * If the current tileLoader is an instance of OsmTileLoader, a new
- * TmsTileClearController is created and passed to the according clearCache method.
*/
public void clearTileCache() {
if (tileLoader instanceof CachedTileLoader) {
@@ -287,17 +308,6 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
}
/**
- * Initiates a repaint of Main.map
- *
- * @see Main#map
- * @see MapFrame#repaint()
- * @see #invalidate() To trigger a repaint of all places where the layer is displayed.
- */
- protected void redraw() {
- invalidate();
- }
-
- /**
* {@inheritDoc}
* @deprecated Use {@link TileSourceDisplaySettings#getDx()}
*/
@@ -340,9 +350,24 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
@Override
public Object getInfoComponent() {
JPanel panel = (JPanel) super.getInfoComponent();
+ List<List<String>> content = new ArrayList<>();
+ Collection<String> nativeProjections = getNativeProjections();
+ if (nativeProjections != null) {
+ content.add(Arrays.asList(tr("Native projections"), Utils.join(", ", getNativeProjections())));
+ }
EastNorth offset = getDisplaySettings().getDisplacement();
if (offset.distanceSq(0, 0) > 1e-10) {
- panel.add(new JLabel(tr("Offset: ") + offset.east() + ';' + offset.north()), GBC.eol().insets(0, 5, 10, 0));
+ content.add(Arrays.asList(tr("Offset"), offset.east() + ";" + offset.north()));
+ }
+ if (coordinateConverter.requiresReprojection()) {
+ content.add(Arrays.asList(tr("Tile download projection"), tileSource.getServerCRS()));
+ content.add(Arrays.asList(tr("Tile display projection"), Main.getProjection().toCode()));
+ }
+ content.add(Arrays.asList(tr("Current zoom"), Integer.toString(currentZoomLevel)));
+ for (List<String> entry: content) {
+ panel.add(new JLabel(entry.get(0) + ':'), GBC.std());
+ panel.add(GBC.glue(5, 0), GBC.std());
+ panel.add(createTextField(entry.get(1)), GBC.eol().fill(GBC.HORIZONTAL));
}
return panel;
}
@@ -357,7 +382,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
* @param zoom zoom level
* @return average number of screen pixels per tile pixel
*/
- private double getScaleFactor(int zoom) {
+ public double getScaleFactor(int zoom) {
if (coordinateConverter != null) {
return coordinateConverter.getScaleFactor(zoom);
} else {
@@ -365,7 +390,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
}
}
- protected int getBestZoom() {
+ public int getBestZoom() {
double factor = getScaleFactor(1); // check the ratio between area of tilesize at zoom 1 to current view
double result = Math.log(factor)/Math.log(2)/2;
/*
@@ -378,13 +403,22 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
* maps as a imagery layer
*/
int intResult = (int) Math.round(result + 1 + ZOOM_OFFSET.get() / 1.9);
-
- intResult = Math.min(intResult, getMaxZoomLvl());
- intResult = Math.max(intResult, getMinZoomLvl());
+ int minZoom = getMinZoomLvl();
+ int maxZoom = getMaxZoomLvl();
+ if (minZoom <= maxZoom) {
+ intResult = Utils.clamp(intResult, minZoom, maxZoom);
+ } else if (intResult > maxZoom) {
+ intResult = maxZoom;
+ }
return intResult;
}
- private static boolean actionSupportLayers(List<Layer> layers) {
+ /**
+ * Default implementation of {@link org.openstreetmap.josm.gui.layer.Layer.LayerAction#supportLayers(List)}.
+ * @param layers layers
+ * @return {@code true} is layers contains only a {@code TMSLayer}
+ */
+ public static boolean actionSupportLayers(List<Layer> layers) {
return layers.size() == 1 && layers.get(0) instanceof TMSLayer;
}
@@ -392,19 +426,13 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
private ShowTileInfoAction() {
super(tr("Show tile info"));
+ setEnabled(clickedTileHolder.getTile() != null);
}
private String getSizeString(int size) {
return new StringBuilder().append(size).append('x').append(size).toString();
}
- private JTextField createTextField(String text) {
- JTextField ret = new JTextField(text);
- ret.setEditable(false);
- ret.setBorder(BorderFactory.createEmptyBorder());
- return ret;
- }
-
@Override
public void actionPerformed(ActionEvent ae) {
Tile clickedTile = clickedTileHolder.getTile();
@@ -420,19 +448,30 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
Main.trace(e);
}
- String[][] content = {
- {"Tile name", clickedTile.getKey()},
- {"Tile url", url},
- {"Tile size", getSizeString(clickedTile.getTileSource().getTileSize()) },
- {"Tile display size", new StringBuilder().append(displaySize.getWidth())
- .append('x')
- .append(displaySize.getHeight()).toString()},
- };
-
- for (String[] entry: content) {
- panel.add(new JLabel(tr(entry[0]) + ':'), GBC.std());
+ List<List<String>> content = new ArrayList<>();
+ content.add(Arrays.asList(tr("Tile name"), clickedTile.getKey()));
+ content.add(Arrays.asList(tr("Tile URL"), url));
+ content.add(Arrays.asList(tr("Tile size"),
+ getSizeString(clickedTile.getTileSource().getTileSize())));
+ content.add(Arrays.asList(tr("Tile display size"),
+ new StringBuilder().append(displaySize.getWidth())
+ .append('x')
+ .append(displaySize.getHeight()).toString()));
+ if (coordinateConverter.requiresReprojection()) {
+ content.add(Arrays.asList(tr("Reprojection"),
+ clickedTile.getTileSource().getServerCRS() +
+ " -> " + Main.getProjection().toCode()));
+ BufferedImage img = clickedTile.getImage();
+ if (img != null) {
+ content.add(Arrays.asList(tr("Reprojected tile size"),
+ img.getWidth() + "x" + img.getHeight()));
+
+ }
+ }
+ for (List<String> entry: content) {
+ panel.add(new JLabel(entry.get(0) + ':'), GBC.std());
panel.add(GBC.glue(5, 0), GBC.std());
- panel.add(createTextField(entry[1]), GBC.eol().fill(GBC.HORIZONTAL));
+ panel.add(createTextField(entry.get(1)), GBC.eol().fill(GBC.HORIZONTAL));
}
for (Entry<String, String> e: clickedTile.getMetadata().entrySet()) {
@@ -456,6 +495,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
private LoadTileAction() {
super(tr("Load tile"));
+ setEnabled(clickedTileHolder.getTile() != null);
}
@Override
@@ -468,172 +508,6 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
}
}
- private class AutoZoomAction extends AbstractAction implements LayerAction {
- AutoZoomAction() {
- super(tr("Auto zoom"));
- }
-
- @Override
- public void actionPerformed(ActionEvent ae) {
- getDisplaySettings().setAutoZoom(!getDisplaySettings().isAutoZoom());
- }
-
- @Override
- public Component createMenuComponent() {
- JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
- item.setSelected(getDisplaySettings().isAutoZoom());
- return item;
- }
-
- @Override
- public boolean supportLayers(List<Layer> layers) {
- return actionSupportLayers(layers);
- }
- }
-
- private class AutoLoadTilesAction extends AbstractAction implements LayerAction {
- AutoLoadTilesAction() {
- super(tr("Auto load tiles"));
- }
-
- @Override
- public void actionPerformed(ActionEvent ae) {
- getDisplaySettings().setAutoLoad(!getDisplaySettings().isAutoLoad());
- }
-
- @Override
- public Component createMenuComponent() {
- JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
- item.setSelected(getDisplaySettings().isAutoLoad());
- return item;
- }
-
- @Override
- public boolean supportLayers(List<Layer> layers) {
- return actionSupportLayers(layers);
- }
- }
-
- private class ShowErrorsAction extends AbstractAction implements LayerAction {
- ShowErrorsAction() {
- super(tr("Show errors"));
- }
-
- @Override
- public void actionPerformed(ActionEvent ae) {
- getDisplaySettings().setShowErrors(!getDisplaySettings().isShowErrors());
- }
-
- @Override
- public Component createMenuComponent() {
- JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
- item.setSelected(getDisplaySettings().isShowErrors());
- return item;
- }
-
- @Override
- public boolean supportLayers(List<Layer> layers) {
- return actionSupportLayers(layers);
- }
- }
-
- private class LoadAllTilesAction extends AbstractAction {
- LoadAllTilesAction() {
- super(tr("Load all tiles"));
- }
-
- @Override
- public void actionPerformed(ActionEvent ae) {
- loadAllTiles(true);
- }
- }
-
- private class LoadErroneusTilesAction extends AbstractAction {
- LoadErroneusTilesAction() {
- super(tr("Load all error tiles"));
- }
-
- @Override
- public void actionPerformed(ActionEvent ae) {
- loadAllErrorTiles(true);
- }
- }
-
- private class ZoomToNativeLevelAction extends AbstractAction {
- ZoomToNativeLevelAction() {
- super(tr("Zoom to native resolution"));
- }
-
- @Override
- public void actionPerformed(ActionEvent ae) {
- double newFactor = Math.sqrt(getScaleFactor(currentZoomLevel));
- Main.map.mapView.zoomToFactor(newFactor);
- redraw();
- }
- }
-
- private class ZoomToBestAction extends AbstractAction {
- ZoomToBestAction() {
- super(tr("Change resolution"));
- setEnabled(!getDisplaySettings().isAutoZoom() && getBestZoom() != currentZoomLevel);
- }
-
- @Override
- public void actionPerformed(ActionEvent ae) {
- setZoomLevel(getBestZoom());
- }
- }
-
- private class IncreaseZoomAction extends AbstractAction {
- IncreaseZoomAction() {
- super(tr("Increase zoom"));
- setEnabled(!getDisplaySettings().isAutoZoom() && zoomIncreaseAllowed());
- }
-
- @Override
- public void actionPerformed(ActionEvent ae) {
- increaseZoomLevel();
- }
- }
-
- private class DecreaseZoomAction extends AbstractAction {
- DecreaseZoomAction() {
- super(tr("Decrease zoom"));
- setEnabled(!getDisplaySettings().isAutoZoom() && zoomDecreaseAllowed());
- }
-
- @Override
- public void actionPerformed(ActionEvent ae) {
- decreaseZoomLevel();
- }
- }
-
- private class FlushTileCacheAction extends AbstractAction {
- FlushTileCacheAction() {
- super(tr("Flush tile cache"));
- }
-
- @Override
- public void actionPerformed(ActionEvent ae) {
- new PleaseWaitRunnable(tr("Flush tile cache")) {
- @Override
- protected void realRun() {
- clearTileCache();
- }
-
- @Override
- protected void finish() {
- // empty - flush is instaneus
- }
-
- @Override
- protected void cancel() {
- // empty - flush is instaneus
- }
- }.run();
- }
- }
-
/**
* Simple class to keep clickedTile within hookUpMapView
*/
@@ -656,7 +530,6 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
public void hookUpMapView() {
// this needs to be here and not in constructor to allow empty TileSource class construction using SessionWriter
initializeIfRequired();
-
super.hookUpMapView();
}
@@ -833,13 +706,19 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
*/
@Override
public void zoomChanged() {
+ zoomChanged(true);
+ }
+
+ private void zoomChanged(boolean invalidate) {
if (Main.isDebugEnabled()) {
Main.debug("zoomChanged(): " + currentZoomLevel);
}
if (tileLoader instanceof TMSCachedTileLoader) {
((TMSCachedTileLoader) tileLoader).cancelOutstandingTasks();
}
- invalidate();
+ if (invalidate) {
+ invalidate();
+ }
}
protected int getMaxZoomLvl() {
@@ -894,11 +773,15 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
* @return true, when zoom has changed to desired value, false if it was outside supported zoom levels
*/
public boolean setZoomLevel(int zoom) {
+ return setZoomLevel(zoom, true);
+ }
+
+ private boolean setZoomLevel(int zoom, boolean invalidate) {
if (zoom == currentZoomLevel) return true;
if (zoom > this.getMaxZoomLvl()) return false;
if (zoom < this.getMinZoomLvl()) return false;
currentZoomLevel = zoom;
- zoomChanged();
+ zoomChanged(invalidate);
return true;
}
@@ -933,19 +816,6 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
return true;
}
- /*
- * We use these for quick, hackish calculations. They are temporary only and intentionally not inserted into the tileCache.
- */
- private Tile tempCornerTile(Tile t) {
- int x = t.getXtile() + 1;
- int y = t.getYtile() + 1;
- int zoom = t.getZoom();
- Tile tile = getTile(x, y, zoom);
- if (tile != null)
- return tile;
- return new Tile(tileSource, x, y, zoom);
- }
-
private Tile getOrCreateTile(TilePosition tilePosition) {
return getOrCreateTile(tilePosition.getX(), tilePosition.getY(), tilePosition.getZoom());
}
@@ -953,13 +823,13 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
private Tile getOrCreateTile(int x, int y, int zoom) {
Tile tile = getTile(x, y, zoom);
if (tile == null) {
- tile = new Tile(tileSource, x, y, zoom);
+ if (coordinateConverter.requiresReprojection()) {
+ tile = new ReprojectionTile(tileSource, x, y, zoom);
+ } else {
+ tile = new Tile(tileSource, x, y, zoom);
+ }
tileCache.addTile(tile);
}
-
- if (!tile.isLoaded()) {
- tile.loadPlaceholderFromCache(tileCache);
- }
return tile;
}
@@ -995,10 +865,15 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
private TileSet getVisibleTileSet() {
ProjectionBounds bounds = Main.map.mapView.getState().getViewArea().getProjectionBounds();
- return getTileSet(bounds.getMin(), bounds.getMax(), currentZoomLevel);
+ return getTileSet(bounds, currentZoomLevel);
}
- protected void loadAllTiles(boolean force) {
+ /**
+ * Load all visible tiles.
+ * @param force {@code true} to force loading if auto-load is disabled
+ * @since 11950
+ */
+ public void loadAllTiles(boolean force) {
TileSet ts = getVisibleTileSet();
// if there is more than 18 tiles on screen in any direction, do not load all tiles!
@@ -1010,7 +885,12 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
invalidate();
}
- protected void loadAllErrorTiles(boolean force) {
+ /**
+ * Load all visible tiles in error.
+ * @param force {@code true} to force loading if auto-load is disabled
+ * @since 11950
+ */
+ public void loadAllErrorTiles(boolean force) {
TileSet ts = getVisibleTileSet();
ts.loadAllErrorTiles(force);
invalidate();
@@ -1032,7 +912,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
}
/**
- * Invalidate the layer at a time in the future so taht the user still sees the interface responsive.
+ * Invalidate the layer at a time in the future so that the user still sees the interface responsive.
*/
private void invalidateLater() {
GuiHelper.runInEDT(() -> {
@@ -1047,9 +927,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
if (i == null)
return false;
int status = Toolkit.getDefaultToolkit().checkImage(i, -1, -1, this);
- if ((status & ALLBITS) != 0)
- return true;
- return false;
+ return (status & ALLBITS) != 0;
}
/**
@@ -1059,73 +937,82 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
* @param tile the Tile for which the image should be returned
* @return the image of the tile or null.
*/
- private Image getLoadedTileImage(Tile tile) {
- Image img = tile.getImage();
+ private BufferedImage getLoadedTileImage(Tile tile) {
+ BufferedImage img = tile.getImage();
if (!imageLoaded(img))
return null;
return img;
}
- // 'source' is the pixel coordinates for the area that the img is capable of filling in.
- // However, we probably only want a portion of it.
- //
- // 'border' is the screen cordinates that need to be drawn. We must not draw outside of it.
- private void drawImageInside(Graphics g, Image sourceImg, Rectangle2D source, Rectangle2D border) {
- Rectangle2D target = source;
+ /**
+ * Draw a tile image on screen.
+ * @param g the Graphics2D
+ * @param toDrawImg tile image
+ * @param anchorImage tile anchor in image coordinates
+ * @param anchorScreen tile anchor in screen coordinates
+ * @param clip clipping region in screen coordinates (can be null)
+ */
+ private void drawImageInside(Graphics2D g, BufferedImage toDrawImg, TileAnchor anchorImage, TileAnchor anchorScreen, Shape clip) {
+ AffineTransform imageToScreen = anchorImage.convert(anchorScreen);
+ Point2D screen0 = imageToScreen.transform(new Point.Double(0, 0), null);
+ Point2D screen1 = imageToScreen.transform(new Point.Double(
+ toDrawImg.getWidth(), toDrawImg.getHeight()), null);
- // If a border is specified, only draw the intersection if what we have combined with what we are supposed to draw.
- if (border != null) {
- target = source.createIntersection(border);
- if (Main.isDebugEnabled()) {
- Main.debug("source: " + source + "\nborder: " + border + "\nintersection: " + target);
- }
+ Shape oldClip = null;
+ if (clip != null) {
+ oldClip = g.getClip();
+ g.clip(clip);
}
-
- // All of the rectangles are in screen coordinates. We need to how these correlate to the sourceImg pixels.
- // We could avoid doing this by scaling the image up to the 'source' size, but this should be cheaper.
- //
- // In some projections, x any y are scaled differently enough to
- // cause a pixel or two of fudge. Calculate them separately.
- double imageYScaling = sourceImg.getHeight(this) / source.getHeight();
- double imageXScaling = sourceImg.getWidth(this) / source.getWidth();
-
- // How many pixels into the 'source' rectangle are we drawing?
- double screenXoffset = target.getX() - source.getX();
- double screenYoffset = target.getY() - source.getY();
- // And how many pixels into the image itself does that correlate to?
- int imgXoffset = (int) (screenXoffset * imageXScaling + 0.5);
- int imgYoffset = (int) (screenYoffset * imageYScaling + 0.5);
- // Now calculate the other corner of the image that we need
- // by scaling the 'target' rectangle's dimensions.
- int imgXend = imgXoffset + (int) (target.getWidth() * imageXScaling + 0.5);
- int imgYend = imgYoffset + (int) (target.getHeight() * imageYScaling + 0.5);
-
- if (Main.isDebugEnabled()) {
- Main.debug("drawing image into target rect: " + target);
+ g.drawImage(toDrawImg, (int) Math.round(screen0.getX()), (int) Math.round(screen0.getY()),
+ (int) Math.round(screen1.getX()) - (int) Math.round(screen0.getX()),
+ (int) Math.round(screen1.getY()) - (int) Math.round(screen0.getY()), this);
+ if (clip != null) {
+ g.setClip(oldClip);
}
- g.drawImage(sourceImg,
- (int) target.getX(), (int) target.getY(),
- (int) target.getMaxX(), (int) target.getMaxY(),
- imgXoffset, imgYoffset,
- imgXend, imgYend,
- this);
}
- private List<Tile> paintTileImages(Graphics g, TileSet ts) {
+ private List<Tile> paintTileImages(Graphics2D g, TileSet ts) {
Object paintMutex = new Object();
List<TilePosition> missed = Collections.synchronizedList(new ArrayList<>());
ts.visitTiles(tile -> {
- Image img = getLoadedTileImage(tile);
- if (img == null) {
+ boolean miss = false;
+ BufferedImage img = null;
+ TileAnchor anchorImage = null;
+ if (!tile.isLoaded() || tile.hasError()) {
+ miss = true;
+ } else {
+ synchronized (tile) {
+ img = getLoadedTileImage(tile);
+ anchorImage = getAnchor(tile, img);
+ }
+ if (img == null || anchorImage == null) {
+ miss = true;
+ }
+ }
+ if (miss) {
missed.add(new TilePosition(tile));
return;
}
- img = applyImageProcessors((BufferedImage) img);
- Rectangle2D sourceRect = coordinateConverter.getRectangleForTile(tile);
+
+ img = applyImageProcessors(img);
+
+ TileAnchor anchorScreen = coordinateConverter.getScreenAnchorForTile(tile);
synchronized (paintMutex) {
//cannot paint in parallel
- drawImageInside(g, img, sourceRect, null);
+ drawImageInside(g, img, anchorImage, anchorScreen, null);
+ }
+ if (tile instanceof ReprojectionTile) {
+ // This means we have a reprojected tile in memory cache, but not at
+ // current scale. Generally, the positioning of the tile will still
+ // be correct, but for best image quality, the tile should be
+ // reprojected to the target scale. The original tile image should
+ // still be in disk cache, so this is fairly cheap.
+ if (((ReprojectionTile) tile).needsUpdate(Main.map.mapView.getScale())) {
+ ((ReprojectionTile) tile).invalidate();
+ loadTile(tile, false);
+ }
}
+
}, missed::add);
return missed.stream().map(this::getOrCreateTile).collect(Collectors.toList());
@@ -1138,35 +1025,61 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
// The "border" tile tells us the boundaries of where we may drawn.
// It will not be from the zoom level that is being drawn currently.
// If drawing the displayZoomLevel, border is null and we draw the entire tile set.
- private List<Tile> paintTileImages(Graphics g, TileSet ts, int zoom, Tile border) {
+ private List<Tile> paintTileImages(Graphics2D g, TileSet ts, int zoom, Tile border) {
if (zoom <= 0) return Collections.emptyList();
- Rectangle2D borderRect = coordinateConverter.getRectangleForTile(border);
+ Shape borderClip = coordinateConverter.getTileShapeScreen(border);
List<Tile> missedTiles = new LinkedList<>();
// The callers of this code *require* that we return any tiles that we do not draw in missedTiles.
// ts.allExistingTiles() by default will only return already-existing tiles.
// However, we need to return *all* tiles to the callers, so force creation here.
for (Tile tile : ts.allTilesCreate()) {
- Image img = getLoadedTileImage(tile);
- if (img == null || tile.hasError()) {
- if (Main.isDebugEnabled()) {
- Main.debug("missed tile: " + tile);
+ boolean miss = false;
+ BufferedImage img = null;
+ TileAnchor anchorImage = null;
+ if (!tile.isLoaded() || tile.hasError()) {
+ miss = true;
+ } else {
+ synchronized (tile) {
+ img = getLoadedTileImage(tile);
+ anchorImage = getAnchor(tile, img);
+ }
+
+ if (img == null || anchorImage == null) {
+ miss = true;
}
+ }
+ if (miss) {
missedTiles.add(tile);
continue;
}
// applying all filters to this layer
- img = applyImageProcessors((BufferedImage) img);
+ img = applyImageProcessors(img);
- Rectangle2D sourceRect = coordinateConverter.getRectangleForTile(tile);
- if (!sourceRect.intersects(borderRect)) {
+ Shape clip;
+ if (tileSource.isInside(tile, border)) {
+ clip = null;
+ } else if (tileSource.isInside(border, tile)) {
+ clip = borderClip;
+ } else {
continue;
}
- drawImageInside(g, img, sourceRect, borderRect);
+ TileAnchor anchorScreen = coordinateConverter.getScreenAnchorForTile(tile);
+ drawImageInside(g, img, anchorImage, anchorScreen, clip);
}
return missedTiles;
}
+ private static TileAnchor getAnchor(Tile tile, BufferedImage image) {
+ if (tile instanceof ReprojectionTile) {
+ return ((ReprojectionTile) tile).getAnchor();
+ } else if (image != null) {
+ return new TileAnchor(new Point.Double(0, 0), new Point.Double(image.getWidth(), image.getHeight()));
+ } else {
+ return null;
+ }
+ }
+
private void myDrawString(Graphics g, String text, int x, int y) {
Color oldColor = g.getColor();
String textToDraw = text;
@@ -1194,11 +1107,11 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
}
}
- private void paintTileText(TileSet ts, Tile tile, Graphics g, MapView mv, int zoom, Tile t) {
+ private void paintTileText(Tile tile, Graphics2D g) {
if (tile == null) {
return;
}
- Point2D p = coordinateConverter.getPixelForTile(t);
+ Point2D p = coordinateConverter.getPixelForTile(tile);
int fontHeight = g.getFontMetrics().getHeight();
int x = (int) p.getX();
int y = (int) p.getY();
@@ -1224,27 +1137,10 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
//texty += 1 + fontHeight;
}
- int xCursor = -1;
- int yCursor = -1;
if (Main.isDebugEnabled()) {
- if (yCursor < t.getYtile()) {
- if (Math.abs(t.getYtile() % 32) == 31) {
- g.fillRect(0, y - 1, mv.getWidth(), 3);
- } else {
- g.drawLine(0, y, mv.getWidth(), y);
- }
- //yCursor = t.getYtile();
- }
- // This draws the vertical lines for the entire column. Only draw them for the top tile in the column.
- if (xCursor < t.getXtile()) {
- if (t.getXtile() % 32 == 0) {
- // level 7 tile boundary
- g.fillRect(x - 1, 0, 3, mv.getHeight());
- } else {
- g.drawLine(x, 0, x, mv.getHeight());
- }
- //xCursor = t.getXtile();
- }
+ // draw tile outline in semi-transparent red
+ g.setColor(new Color(255, 0, 0, 50));
+ g.draw(coordinateConverter.getTileShapeScreen(tile));
}
}
@@ -1256,19 +1152,20 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
return getShiftedLatLon(en).toCoordinate();
}
- private LatLon getShiftedLatLon(ICoordinate latLon) {
- return getShiftedLatLon(Main.getProjection().latlon2eastNorth(new LatLon(latLon)));
- }
-
private final TileSet nullTileSet = new TileSet();
- private class TileSet extends TileRange {
+ protected class TileSet extends TileRange {
protected TileSet(TileXY t1, TileXY t2, int zoom) {
super(t1, t2, zoom);
sanitize();
}
+ protected TileSet(TileRange range) {
+ super(range);
+ sanitize();
+ }
+
/**
* null tile set
*/
@@ -1319,12 +1216,17 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
return tilePositions().map(mapper).filter(Objects::nonNull).collect(Collectors.toList());
}
- @Override
+ /**
+ * Gets a stream of all tile positions in this set
+ * @return A stream of all positions
+ */
public Stream<TilePosition> tilePositions() {
- if (this.insane()) {
+ if (zoom == 0 || this.insane()) {
return Stream.empty(); // Tileset is either empty or too large
} else {
- return super.tilePositions();
+ return IntStream.rangeClosed(minX, maxX).mapToObj(
+ x -> IntStream.rangeClosed(minY, maxY).mapToObj(y -> new TilePosition(x, y, zoom))
+ ).flatMap(Function.identity());
}
}
@@ -1388,30 +1290,28 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
/**
* Create a TileSet by EastNorth bbox taking a layer shift in account
- * @param topLeft top-left lat/lon
- * @param botRight bottom-right lat/lon
- * @param zoom zoom level
- * @return the tile set
- * @since 10651
- */
- protected TileSet getTileSet(EastNorth topLeft, EastNorth botRight, int zoom) {
- return getTileSet(getShiftedLatLon(topLeft), getShiftedLatLon(botRight), zoom);
- }
-
- /**
- * Create a TileSet by known LatLon bbox without layer shift correction
- * @param topLeft top-left lat/lon
- * @param botRight bottom-right lat/lon
+ * @param bounds the EastNorth bounds
* @param zoom zoom level
* @return the tile set
- * @since 10651
*/
- protected TileSet getTileSet(LatLon topLeft, LatLon botRight, int zoom) {
+ protected TileSet getTileSet(ProjectionBounds bounds, int zoom) {
if (zoom == 0)
return new TileSet();
-
- TileXY t1 = tileSource.latLonToTileXY(topLeft.toCoordinate(), zoom);
- TileXY t2 = tileSource.latLonToTileXY(botRight.toCoordinate(), zoom);
+ TileXY t1, t2;
+ if (coordinateConverter.requiresReprojection()) {
+ Projection projServer = Projections.getProjectionByCode(tileSource.getServerCRS());
+ ProjectionBounds projBounds = new ProjectionBounds(
+ new EastNorth(coordinateConverter.shiftDisplayToServer(bounds.getMin())),
+ new EastNorth(coordinateConverter.shiftDisplayToServer(bounds.getMax())));
+ ProjectionBounds bbox = projServer.getEastNorthBoundsBox(projBounds, Main.getProjection());
+ t1 = tileSource.projectedToTileXY(bbox.getMin().toProjected(), zoom);
+ t2 = tileSource.projectedToTileXY(bbox.getMax().toProjected(), zoom);
+ } else {
+ IProjected topLeftUnshifted = coordinateConverter.shiftDisplayToServer(bounds.getMin());
+ IProjected botRightUnshifted = coordinateConverter.shiftDisplayToServer(bounds.getMax());
+ t1 = tileSource.projectedToTileXY(topLeftUnshifted, zoom);
+ t2 = tileSource.projectedToTileXY(botRightUnshifted, zoom);
+ }
return new TileSet(t1, t2, zoom);
}
@@ -1466,7 +1366,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
synchronized (tileSets) {
TileSet ts = tileSets[zoom-minZoom];
if (ts == null) {
- ts = AbstractTileSourceLayer.this.getTileSet(bounds.getMin(), bounds.getMax(), zoom);
+ ts = AbstractTileSourceLayer.this.getTileSet(bounds, zoom);
tileSets[zoom-minZoom] = ts;
}
return ts;
@@ -1523,7 +1423,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
tsi = dts.getTileSetInfo(zoom);
}
- setZoomLevel(zoom);
+ setZoomLevel(zoom, false);
// If all tiles at displayZoomLevel is loaded, load all tiles at next zoom level
// to make sure there're really no more zoom levels
@@ -1541,7 +1441,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
}
ts = dts.getTileSet(zoom);
} else if (getDisplaySettings().isAutoZoom()) {
- setZoomLevel(zoom);
+ setZoomLevel(zoom, false);
}
// Too many tiles... refuse to download
@@ -1564,7 +1464,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
g.setColor(Color.DARK_GRAY);
List<Tile> missedTiles = this.paintTileImages(g, ts);
- int[] otherZooms = {-1, 1, -2, 2, -3, -4, -5};
+ int[] otherZooms = {1, 2, -1, -2, -3, -4, -5};
for (int zoomOffset : otherZooms) {
if (!getDisplaySettings().isAutoZoom()) {
break;
@@ -1583,9 +1483,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
newlyMissedTiles.add(missed);
continue;
}
- Tile t2 = tempCornerTile(missed);
- TileSet ts2 = getTileSet(getShiftedLatLon(tileSource.tileXYToLatLon(missed)),
- getShiftedLatLon(tileSource.tileXYToLatLon(t2)), newzoom);
+ TileSet ts2 = new TileSet(tileSource.getCoveringTileRange(missed, newzoom));
// Instantiating large TileSets is expensive. If there are no loaded tiles, don't bother even trying.
if (ts2.allLoadedTiles().isEmpty()) {
newlyMissedTiles.add(missed);
@@ -1606,7 +1504,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
// The current zoom tileset should have all of its tiles due to the loadAllTiles(), unless it to tooLarge()
for (Tile t : ts.allExistingTiles()) {
- this.paintTileText(ts, t, g, mv, displayZoomLevel, t);
+ this.paintTileText(t, g);
}
EastNorth min = pb.getMin();
@@ -1653,22 +1551,8 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
if (Main.isDebugEnabled()) {
Main.debug("getTileForPixelpos("+px+", "+py+')');
}
- MapView mv = Main.map.mapView;
- Point clicked = new Point(px, py);
- EastNorth topLeft = mv.getEastNorth(0, 0);
- EastNorth botRight = mv.getEastNorth(mv.getWidth(), mv.getHeight());
- TileSet ts = getTileSet(topLeft, botRight, currentZoomLevel);
-
- if (!ts.tooLarge()) {
- ts.loadAllTiles(false); // make sure there are tile objects for all tiles
- }
- Stream<Tile> clickedTiles = ts.allExistingTiles().stream()
- .filter(t -> coordinateConverter.getRectangleForTile(t).contains(clicked));
- if (Main.isTraceEnabled()) {
- clickedTiles = clickedTiles.peek(t -> Main.trace("Clicked on tile: " + t.getXtile() + ' ' + t.getYtile() +
- " currentZoomLevel: " + currentZoomLevel));
- }
- return clickedTiles.findAny().orElse(null);
+ TileXY xy = coordinateConverter.getTileforPixel(px, py, currentZoomLevel);
+ return getTile(xy.getXIndex(), xy.getYIndex(), currentZoomLevel);
}
/**
@@ -1768,16 +1652,16 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
*/
public Action[] getCommonEntries() {
return new Action[] {
- new AutoLoadTilesAction(),
- new AutoZoomAction(),
- new ShowErrorsAction(),
- new IncreaseZoomAction(),
- new DecreaseZoomAction(),
- new ZoomToBestAction(),
- new ZoomToNativeLevelAction(),
- new FlushTileCacheAction(),
- new LoadErroneusTilesAction(),
- new LoadAllTilesAction()
+ new AutoLoadTilesAction(this),
+ new AutoZoomAction(this),
+ new ShowErrorsAction(this),
+ new IncreaseZoomAction(this),
+ new DecreaseZoomAction(this),
+ new ZoomToBestAction(this),
+ new ZoomToNativeLevelAction(this),
+ new FlushTileCacheAction(this),
+ new LoadErroneousTilesAction(this),
+ new LoadAllTilesAction(this)
};
}
@@ -1919,7 +1803,7 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
}
@Override
- public void destroy() {
+ public synchronized void destroy() {
super.destroy();
adjustAction.destroy();
}
@@ -1967,4 +1851,12 @@ implements ImageObserver, TileLoaderListener, ZoomChangeListener, FilterChangeLi
}
}
}
+
+ @Override
+ public void projectionChanged(Projection oldValue, Projection newValue) {
+ super.projectionChanged(oldValue, newValue);
+ if (tileCache != null) {
+ tileCache.clear();
+ }
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/layer/GpxLayer.java b/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
index a162d12..dd07aa0 100644
--- a/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
@@ -388,7 +388,7 @@ public class GpxLayer extends Layer {
}
@Override
- public void destroy() {
+ public synchronized void destroy() {
super.destroy();
SystemOfMeasurement.removeSoMChangeListener(drawHelper);
}
diff --git a/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java b/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
index 13168aa..c38e54a 100644
--- a/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/ImageryLayer.java
@@ -10,10 +10,13 @@ import java.awt.event.ActionEvent;
import java.awt.image.BufferedImage;
import java.awt.image.BufferedImageOp;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.Locale;
import javax.swing.AbstractAction;
import javax.swing.Action;
+import javax.swing.BorderFactory;
import javax.swing.Icon;
import javax.swing.JCheckBoxMenuItem;
import javax.swing.JComponent;
@@ -23,6 +26,7 @@ import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import javax.swing.JSeparator;
+import javax.swing.JTextField;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.ProjectionBounds;
@@ -32,7 +36,6 @@ import org.openstreetmap.josm.data.preferences.IntegerProperty;
import org.openstreetmap.josm.gui.MenuScroller;
import org.openstreetmap.josm.gui.layer.imagery.ImageryFilterSettings;
import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
-import org.openstreetmap.josm.gui.widgets.UrlLabel;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.ImageProvider.ImageSizes;
@@ -151,15 +154,36 @@ public abstract class ImageryLayer extends Layer {
JPanel panel = new JPanel(new GridBagLayout());
panel.add(new JLabel(getToolTipText()), GBC.eol());
if (info != null) {
- String url = info.getUrl();
- if (url != null) {
- panel.add(new JLabel(tr("URL: ")), GBC.std().insets(0, 5, 2, 0));
- panel.add(new UrlLabel(url), GBC.eol().insets(2, 5, 10, 0));
+ List<List<String>> content = new ArrayList<>();
+ content.add(Arrays.asList(tr("Name"), info.getName()));
+ content.add(Arrays.asList(tr("Type"), info.getImageryType().getTypeString().toUpperCase(Locale.ENGLISH)));
+ content.add(Arrays.asList(tr("URL"), info.getUrl()));
+ content.add(Arrays.asList(tr("Id"), info.getId() == null ? "-" : info.getId()));
+ if (info.getMinZoom() != 0) {
+ content.add(Arrays.asList(tr("Min. zoom"), Integer.toString(info.getMinZoom())));
+ }
+ if (info.getMaxZoom() != 0) {
+ content.add(Arrays.asList(tr("Max. zoom"), Integer.toString(info.getMaxZoom())));
+ }
+ if (info.getDescription() != null) {
+ content.add(Arrays.asList(tr("Description"), info.getDescription()));
+ }
+ for (List<String> entry: content) {
+ panel.add(new JLabel(entry.get(0) + ':'), GBC.std());
+ panel.add(GBC.glue(5, 0), GBC.std());
+ panel.add(createTextField(entry.get(1)), GBC.eol().fill(GBC.HORIZONTAL));
}
}
return panel;
}
+ protected JTextField createTextField(String text) {
+ JTextField ret = new JTextField(text);
+ ret.setEditable(false);
+ ret.setBorder(BorderFactory.createEmptyBorder());
+ return ret;
+ }
+
public static ImageryLayer create(ImageryInfo info) {
switch(info.getImageryType()) {
case WMS:
diff --git a/src/org/openstreetmap/josm/gui/layer/Layer.java b/src/org/openstreetmap/josm/gui/layer/Layer.java
index 12f0668..11247f5 100644
--- a/src/org/openstreetmap/josm/gui/layer/Layer.java
+++ b/src/org/openstreetmap/josm/gui/layer/Layer.java
@@ -150,6 +150,7 @@ public abstract class Layer extends AbstractMapViewPaintable implements Destroya
private File associatedFile;
private final ValueChangeListener<Object> invalidateListener = change -> invalidate();
+ private boolean isDestroyed;
/**
* Create the layer and fill in the necessary components.
@@ -270,7 +271,11 @@ public abstract class Layer extends AbstractMapViewPaintable implements Destroya
* via command line parameter).
*/
@Override
- public void destroy() {
+ public synchronized void destroy() {
+ if (isDestroyed) {
+ throw new IllegalStateException("The layer has already been destroyed: " + this);
+ }
+ isDestroyed = true;
// Override in subclasses if needed
removeColorPropertyListener();
}
@@ -552,7 +557,8 @@ public abstract class Layer extends AbstractMapViewPaintable implements Destroya
public void projectionChanged(Projection oldValue, Projection newValue) {
if (!isProjectionSupported(newValue)) {
final String message = "<html><body><p>" +
- tr("The layer {0} does not support the new projection {1}.", getName(), newValue.toCode()) + "</p>" +
+ tr("The layer {0} does not support the new projection {1}.",
+ Utils.escapeReservedCharactersHTML(getName()), newValue.toCode()) + "</p>" +
"<p style='width: 450px;'>" + tr("Supported projections are: {0}", nameSupportedProjections()) + "</p>" +
tr("Change the projection again or remove the layer.");
diff --git a/src/org/openstreetmap/josm/gui/layer/LayerManager.java b/src/org/openstreetmap/josm/gui/layer/LayerManager.java
index 8161d5f..aa6e271 100644
--- a/src/org/openstreetmap/josm/gui/layer/LayerManager.java
+++ b/src/org/openstreetmap/josm/gui/layer/LayerManager.java
@@ -63,6 +63,9 @@ public class LayerManager {
void layerOrderChanged(LayerOrderChangeEvent e);
}
+ /**
+ * Base class of layer manager events.
+ */
protected static class LayerManagerEvent {
private final LayerManager source;
@@ -214,6 +217,11 @@ public class LayerManager {
GuiHelper.runInEDTAndWaitWithException(() -> realAddLayer(layer, initialZoom));
}
+ /**
+ * Add a layer (implementation).
+ * @param layer The layer to add
+ * @param initialZoom whether if the mapview must be zoomed at layer projection bounds
+ */
protected synchronized void realAddLayer(Layer layer, boolean initialZoom) {
if (containsLayer(layer)) {
throw new IllegalArgumentException("Cannot add a layer twice: " + layer);
@@ -239,6 +247,10 @@ public class LayerManager {
GuiHelper.runInEDTAndWaitWithException(() -> realRemoveLayer(layer));
}
+ /**
+ * Remove the layer from the mapview (implementation).
+ * @param layer The layer to remove
+ */
protected synchronized void realRemoveLayer(Layer layer) {
GuiHelper.assertCallFromEdt();
Set<Layer> toRemove = Collections.newSetFromMap(new IdentityHashMap<Layer, Boolean>());
@@ -255,6 +267,11 @@ public class LayerManager {
}
}
+ /**
+ * Remove a single layer from the mapview (implementation).
+ * @param layerToRemove The layer to remove
+ * @return A list of layers that should be removed afterwards.
+ */
protected Collection<Layer> realRemoveSingleLayer(Layer layerToRemove) {
updateLayers(mutableLayers -> mutableLayers.remove(layerToRemove));
return fireLayerRemoving(layerToRemove);
@@ -272,6 +289,12 @@ public class LayerManager {
GuiHelper.runInEDTAndWaitWithException(() -> realMoveLayer(layer, position));
}
+ /**
+ * Move a layer to a new position (implementation).
+ * @param layer The layer to move.
+ * @param position The position.
+ * @throws IndexOutOfBoundsException if the position is out of bounds.
+ */
protected synchronized void realMoveLayer(Layer layer, int position) {
checkContainsLayer(layer);
checkPosition(position);
@@ -359,6 +382,11 @@ public class LayerManager {
return getLayers().contains(layer);
}
+ /**
+ * Checks if the specified layer is handled by this layer manager.
+ * @param layer layer to check
+ * @throws IllegalArgumentException if layer is not handled by this layer manager
+ */
protected void checkContainsLayer(Layer layer) {
if (!containsLayer(layer)) {
throw new IllegalArgumentException(layer + " is not managed by us.");
@@ -370,27 +398,27 @@ public class LayerManager {
*
* @param listener the listener.
* @throws IllegalArgumentException If the listener was added twice.
+ * @see #addAndFireLayerChangeListener
*/
public synchronized void addLayerChangeListener(LayerChangeListener listener) {
- addLayerChangeListener(listener, false);
+ if (layerChangeListeners.contains(listener)) {
+ throw new IllegalArgumentException("Listener already registered.");
+ }
+ layerChangeListeners.add(listener);
}
/**
- * Adds a layer change listener
+ * Adds a layer change listener and fire an add event for every layer in this manager.
*
* @param listener the listener.
- * @param fireAdd if we should fire an add event for every layer in this manager.
* @throws IllegalArgumentException If the listener was added twice.
+ * @see #addLayerChangeListener
+ * @since 11905
*/
- public synchronized void addLayerChangeListener(LayerChangeListener listener, boolean fireAdd) {
- if (layerChangeListeners.contains(listener)) {
- throw new IllegalArgumentException("Listener already registered.");
- }
- layerChangeListeners.add(listener);
- if (fireAdd) {
- for (Layer l : getLayers()) {
- listener.layerAdded(new LayerAddEvent(this, l, true));
- }
+ public synchronized void addAndFireLayerChangeListener(LayerChangeListener listener) {
+ addLayerChangeListener(listener);
+ for (Layer l : getLayers()) {
+ listener.layerAdded(new LayerAddEvent(this, l, true));
}
}
@@ -398,27 +426,27 @@ public class LayerManager {
* Removes a layer change listener
*
* @param listener the listener. Ignored if null or already registered.
+ * @see #removeAndFireLayerChangeListener
*/
public synchronized void removeLayerChangeListener(LayerChangeListener listener) {
- removeLayerChangeListener(listener, false);
+ if (!layerChangeListeners.remove(listener)) {
+ throw new IllegalArgumentException("Listener was not registered before: " + listener);
+ }
}
/**
- * Removes a layer change listener
+ * Removes a layer change listener and fire a remove event for every layer in this manager.
+ * The event is fired as if the layer was deleted but
+ * {@link LayerRemoveEvent#scheduleRemoval(Collection)} is ignored.
*
* @param listener the listener.
- * @param fireRemove if we should fire a remove event for every layer in this manager. The event is fired as if the layer was deleted but
- * {@link LayerRemoveEvent#scheduleRemoval(Collection)} is ignored.
+ * @see #removeLayerChangeListener
+ * @since 11905
*/
- public synchronized void removeLayerChangeListener(LayerChangeListener listener, boolean fireRemove) {
- if (!layerChangeListeners.remove(listener)) {
- throw new IllegalArgumentException("Listener was not registered before: " + listener);
- } else {
- if (fireRemove) {
- for (Layer l : getLayers()) {
- listener.layerRemoving(new LayerRemoveEvent(this, l));
- }
- }
+ public synchronized void removeAndFireLayerChangeListener(LayerChangeListener listener) {
+ removeLayerChangeListener(listener);
+ for (Layer l : getLayers()) {
+ listener.layerRemoving(new LayerRemoveEvent(this, l));
}
}
@@ -474,6 +502,9 @@ public class LayerManager {
GuiHelper.runInEDTAndWaitWithException(this::realResetState);
}
+ /**
+ * Reset all layer manager state (implementation).
+ */
protected synchronized void realResetState() {
// The listeners trigger the removal of other layers
while (!getLayers().isEmpty()) {
diff --git a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
index 7c9d73c..5996995 100644
--- a/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
@@ -65,6 +65,7 @@ import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.DataSet.UploadPolicy;
import org.openstreetmap.josm.data.osm.DataSetMerger;
import org.openstreetmap.josm.data.osm.DatasetConsistencyTest;
+import org.openstreetmap.josm.data.osm.HighlightUpdateListener;
import org.openstreetmap.josm.data.osm.IPrimitive;
import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -116,7 +117,7 @@ import org.openstreetmap.josm.tools.date.DateUtils;
* @author imi
* @since 17
*/
-public class OsmDataLayer extends AbstractModifiableLayer implements Listener, SelectionChangedListener {
+public class OsmDataLayer extends AbstractModifiableLayer implements Listener, SelectionChangedListener, HighlightUpdateListener {
private static final int HATCHED_SIZE = 15;
/** Property used to know if this layer has to be saved on disk */
public static final String REQUIRES_SAVE_TO_DISK_PROP = OsmDataLayer.class.getName() + ".requiresSaveToDisk";
@@ -125,7 +126,6 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
private boolean requiresSaveToFile;
private boolean requiresUploadToServer;
- private int highlightUpdateCount;
/**
* List of validation errors in this layer.
@@ -363,6 +363,7 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
conflicts = new ConflictCollection();
data.addDataSetListener(new DataSetListenerAdapter(this));
data.addDataSetListener(MultipolygonCache.getInstance());
+ data.addHighlightUpdateListener(this);
DataSet.addSelectionListener(this);
if (name != null && name.startsWith(createLayerName("")) && Character.isDigit(
(name.substring(createLayerName("").length()) + "XX" /*avoid StringIndexOutOfBoundsException*/).charAt(1))) {
@@ -399,8 +400,6 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
* Draw nodes last to overlap the ways they belong to.
*/
@Override public void paint(final Graphics2D g, final MapView mv, Bounds box) {
- highlightUpdateCount = data.getHighlightUpdateCount();
-
boolean active = mv.getLayerManager().getActiveLayer() == this;
boolean inactive = !active && Main.pref.getBoolean("draw.data.inactive_color", true);
boolean virtual = !inactive && mv.isVirtualNodesEnabled();
@@ -907,11 +906,6 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
}
@Override
- public boolean isChanged() {
- return highlightUpdateCount != data.getHighlightUpdateCount();
- }
-
- @Override
public void onPostSaveToFile() {
setRequiresSaveToFile(false);
setRequiresUploadToServer(isModified());
@@ -948,9 +942,10 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
}
@Override
- public void destroy() {
+ public synchronized void destroy() {
super.destroy();
DataSet.removeSelectionListener(this);
+ data.removeHighlightUpdateListener(this);
}
@Override
@@ -1025,7 +1020,7 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
}
ConflictCollection conflictsCol = getConflicts();
- if (conflictsCol != null && !conflictsCol.isEmpty() && 1 != GuiHelper.runInEDTAndWaitAndReturn(() -> {
+ return conflictsCol == null || conflictsCol.isEmpty() || 1 == GuiHelper.runInEDTAndWaitAndReturn(() -> {
ExtendedDialog dialog = new ExtendedDialog(
Main.parent,
/* I18N: Display title of the window showing conflicts */
@@ -1036,10 +1031,7 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
tr("There are unresolved conflicts. Conflicts will not be saved and handled as if you rejected all. Continue?"));
dialog.setButtonIcons(new String[] {"save", "cancel"});
return dialog.showDialog().getValue();
- })) {
- return false;
- }
- return true;
+ });
}
/**
@@ -1104,4 +1096,9 @@ public class OsmDataLayer extends AbstractModifiableLayer implements Listener, S
}
return v.getBounds();
}
+
+ @Override
+ public void highlightUpdated(HighlightUpdateEvent e) {
+ invalidate();
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/layer/TMSLayer.java b/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
index b42c965..1595f8a 100644
--- a/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/TMSLayer.java
@@ -1,10 +1,9 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.layer;
-import static org.openstreetmap.josm.tools.I18n.tr;
-
import java.util.ArrayList;
import java.util.Collection;
+import java.util.Collections;
import org.apache.commons.jcs.access.CacheAccess;
import org.openstreetmap.gui.jmapviewer.OsmMercator;
@@ -21,7 +20,6 @@ import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
import org.openstreetmap.josm.data.imagery.TMSCachedTileLoader;
import org.openstreetmap.josm.data.preferences.BooleanProperty;
import org.openstreetmap.josm.data.preferences.IntegerProperty;
-import org.openstreetmap.josm.data.projection.Projection;
/**
* Class that displays a slippy map layer.
@@ -78,13 +76,8 @@ public class TMSLayer extends AbstractCachedTileSourceLayer<TMSTileSource> imple
}
@Override
- public final boolean isProjectionSupported(Projection proj) {
- return "EPSG:3857".equals(proj.toCode()) || "EPSG:4326".equals(proj.toCode());
- }
-
- @Override
- public final String nameSupportedProjections() {
- return tr("EPSG:4326 and Mercator projection are supported");
+ public Collection<String> getNativeProjections() {
+ return Collections.singletonList("EPSG:3857");
}
/**
@@ -160,4 +153,4 @@ public class TMSLayer extends AbstractCachedTileSourceLayer<TMSTileSource> imple
}
return new ScaleList(scales);
}
- }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java b/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java
index cc52120..682e27c 100644
--- a/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/ValidatorLayer.java
@@ -161,7 +161,7 @@ public class ValidatorLayer extends Layer implements LayerChangeListener {
if (e.getRemovedLayer() instanceof OsmDataLayer && e.getSource().getLayersOfType(OsmDataLayer.class).size() <= 1) {
e.scheduleRemoval(Collections.singleton(this));
} else if (e.getRemovedLayer() == this) {
- OsmValidator.errorLayer = null;
+ OsmValidator.resetErrorLayer();
}
}
@@ -171,7 +171,7 @@ public class ValidatorLayer extends Layer implements LayerChangeListener {
}
@Override
- public void destroy() {
+ public synchronized void destroy() {
Main.map.validatorDialog.tree.removeInvalidationListener(invalidator);
Main.getLayerManager().removeLayerChangeListener(this);
super.destroy();
diff --git a/src/org/openstreetmap/josm/gui/layer/WMSLayer.java b/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
index d855dcc..6a7f476 100644
--- a/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/WMSLayer.java
@@ -6,13 +6,12 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.awt.event.ActionEvent;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collection;
import java.util.List;
-import java.util.Set;
-import java.util.TreeSet;
+import java.util.Objects;
import javax.swing.AbstractAction;
import javax.swing.Action;
-import javax.swing.JOptionPane;
import org.apache.commons.jcs.access.CacheAccess;
import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
@@ -27,9 +26,10 @@ import org.openstreetmap.josm.data.imagery.WMSCachedTileLoader;
import org.openstreetmap.josm.data.preferences.BooleanProperty;
import org.openstreetmap.josm.data.preferences.IntegerProperty;
import org.openstreetmap.josm.data.projection.Projection;
-import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.data.projection.Projections;
import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
import org.openstreetmap.josm.tools.CheckParameterUtil;
+import org.openstreetmap.josm.tools.Utils;
/**
* This is a layer that grabs the current screen from an WMS server. The data
@@ -53,7 +53,7 @@ public class WMSLayer extends AbstractCachedTileSourceLayer<AbstractWMSTileSourc
private static final String CACHE_REGION_NAME = "WMS";
- private final Set<String> supportedProjections;
+ private final List<String> serverProjections;
/**
* Constructs a new {@code WMSLayer}.
@@ -64,7 +64,7 @@ public class WMSLayer extends AbstractCachedTileSourceLayer<AbstractWMSTileSourc
CheckParameterUtil.ensureThat(info.getImageryType() == ImageryType.WMS, "ImageryType is WMS");
CheckParameterUtil.ensureParameterNotNull(info.getUrl(), "info.url");
TemplatedWMSTileSource.checkUrl(info.getUrl());
- this.supportedProjections = new TreeSet<>(info.getServerProjections());
+ this.serverProjections = new ArrayList<>(info.getServerProjections());
}
@Override
@@ -85,7 +85,8 @@ public class WMSLayer extends AbstractCachedTileSourceLayer<AbstractWMSTileSourc
@Override
protected AbstractWMSTileSource getTileSource() {
- AbstractWMSTileSource tileSource = new TemplatedWMSTileSource(info);
+ AbstractWMSTileSource tileSource = new TemplatedWMSTileSource(
+ info, chooseProjection(Main.getProjection()));
info.setAttribution(tileSource);
return tileSource;
}
@@ -110,50 +111,34 @@ public class WMSLayer extends AbstractCachedTileSourceLayer<AbstractWMSTileSourc
}
@Override
- public boolean isProjectionSupported(Projection proj) {
- return supportedProjections == null || supportedProjections.isEmpty() || supportedProjections.contains(proj.toCode()) ||
- (info.isEpsg4326To3857Supported() && supportedProjections.contains("EPSG:4326")
- && "EPSG:3857".equals(Main.getProjection().toCode()));
+ public Collection<String> getNativeProjections() {
+ return serverProjections;
}
@Override
- public String nameSupportedProjections() {
- StringBuilder ret = new StringBuilder();
- for (String e: supportedProjections) {
- ret.append(e).append(", ");
- }
- String appendix = "";
-
- if (isReprojectionPossible()) {
- appendix = ". <p>" + tr("JOSM will use EPSG:4326 to query the server, but results may vary "
- + "depending on the WMS server") + "</p>";
+ public void projectionChanged(Projection oldValue, Projection newValue) {
+ super.projectionChanged(oldValue, newValue);
+ Projection tileProjection = chooseProjection(newValue);
+ if (!Objects.equals(tileSource.getTileProjection(), tileProjection)) {
+ tileSource.setTileProjection(tileProjection);
}
- return ret.substring(0, ret.length()-2) + appendix;
}
- @Override
- public void projectionChanged(Projection oldValue, Projection newValue) {
- // do not call super - we need custom warning dialog
-
- if (!isProjectionSupported(newValue)) {
- String message =
- "<html><body><p>" + tr("The layer {0} does not support the new projection {1}.", getName(), newValue.toCode()) +
- "<p style='width: 450px; position: absolute; margin: 0px;'>" +
- tr("Supported projections are: {0}", nameSupportedProjections()) + "</p>" +
- "<p>" + tr("Change the projection again or remove the layer.");
-
- ExtendedDialog warningDialog = new ExtendedDialog(Main.parent, tr("Warning"), new String[]{tr("OK")}).
- setContent(message).
- setIcon(JOptionPane.WARNING_MESSAGE);
-
- if (isReprojectionPossible()) {
- warningDialog.toggleEnable("imagery.wms.projectionSupportWarnings." + tileSource.getBaseUrl());
+ private Projection chooseProjection(Projection requested) {
+ if (serverProjections.contains(requested.toCode())) {
+ return requested;
+ } else {
+ for (String code : serverProjections) {
+ Projection proj = Projections.getProjectionByCode(code);
+ if (proj != null) {
+ Main.info(tr("Reprojecting layer {0} from {1} to {2}. For best image quality and performance,"
+ + " switch to one of the supported projections: {3}",
+ getName(), proj.toCode(), Main.getProjection().toCode(), Utils.join(", ", getNativeProjections())));
+ return proj;
+ }
}
- warningDialog.showDialog();
- }
-
- if (!newValue.equals(oldValue)) {
- tileSource.initProjection(newValue);
+ Main.warn(tr("Unable to find supported projection for layer {0}. Using {1}.", getName(), requested.toCode()));
+ return requested;
}
}
@@ -173,8 +158,4 @@ public class WMSLayer extends AbstractCachedTileSourceLayer<AbstractWMSTileSourc
public static CacheAccess<String, BufferedImageCacheEntry> getCache() {
return AbstractCachedTileSourceLayer.getCache(CACHE_REGION_NAME);
}
-
- private boolean isReprojectionPossible() {
- return supportedProjections.contains("EPSG:4326") && "EPSG:3857".equals(Main.getProjection().toCode());
- }
}
diff --git a/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java b/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java
index cb4c52b..ab9895f 100644
--- a/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/WMTSLayer.java
@@ -2,7 +2,7 @@
package org.openstreetmap.josm.gui.layer;
import java.io.IOException;
-import java.util.Set;
+import java.util.Collection;
import org.apache.commons.jcs.access.CacheAccess;
import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
@@ -14,6 +14,7 @@ import org.openstreetmap.josm.data.imagery.WMSCachedTileLoader;
import org.openstreetmap.josm.data.imagery.WMTSTileSource;
import org.openstreetmap.josm.data.projection.Projection;
import org.openstreetmap.josm.gui.layer.imagery.TileSourceDisplaySettings;
+import org.openstreetmap.josm.tools.Utils;
/**
* WMTS layer based on AbstractTileSourceLayer. Overrides few methods to align WMTS to Tile based computations
@@ -67,22 +68,20 @@ public class WMTSLayer extends AbstractCachedTileSourceLayer<WMTSTileSource> imp
}
@Override
- protected int getBestZoom() {
+ public int getBestZoom() {
if (!Main.isDisplayingMapView())
return 0;
ScaleList scaleList = getNativeScales();
if (scaleList == null) {
return getMaxZoomLvl();
}
- double displayScale = Main.map.mapView.getScale() * Main.getProjection().getMetersPerUnit(); // meter per pixel
+ double displayScale = Main.map.mapView.getScale();
+ if (coordinateConverter.requiresReprojection()) {
+ displayScale *= Main.getProjection().getMetersPerUnit();
+ }
Scale snap = scaleList.getSnapScale(displayScale, false);
- return Math.max(
- getMinZoomLvl(),
- Math.min(
- snap != null ? snap.getIndex() : getMaxZoomLvl(),
- getMaxZoomLvl()
- )
- );
+ return Utils.clamp(snap != null ? snap.getIndex() : getMaxZoomLvl(),
+ getMinZoomLvl(), getMaxZoomLvl());
}
@Override
@@ -91,18 +90,8 @@ public class WMTSLayer extends AbstractCachedTileSourceLayer<WMTSTileSource> imp
}
@Override
- public boolean isProjectionSupported(Projection proj) {
- Set<String> supportedProjections = tileSource.getSupportedProjections();
- return supportedProjections.contains(proj.toCode());
- }
-
- @Override
- public String nameSupportedProjections() {
- StringBuilder ret = new StringBuilder();
- for (String e: tileSource.getSupportedProjections()) {
- ret.append(e).append(", ");
- }
- return ret.length() > 2 ? ret.substring(0, ret.length()-2) : ret.toString();
+ public Collection<String> getNativeProjections() {
+ return tileSource.getSupportedProjections();
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java b/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
index 016c151..da64da3 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java
@@ -34,8 +34,6 @@ import java.util.Date;
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.List;
-import java.util.Locale;
-import java.util.Objects;
import java.util.Optional;
import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
@@ -1250,216 +1248,4 @@ public class CorrelateGpxWithImages extends AbstractAction {
}
return endIndex;
}
-
- static final class Timezone {
-
- static final Timezone ZERO = new Timezone(0.0);
- private final double timezone;
-
- Timezone(double hours) {
- this.timezone = hours;
- }
-
- public double getHours() {
- return timezone;
- }
-
- String formatTimezone() {
- StringBuilder ret = new StringBuilder();
-
- double timezone = this.timezone;
- if (timezone < 0) {
- ret.append('-');
- timezone = -timezone;
- } else {
- ret.append('+');
- }
- ret.append((long) timezone).append(':');
- int minutes = (int) ((timezone % 1) * 60);
- if (minutes < 10) {
- ret.append('0');
- }
- ret.append(minutes);
-
- return ret.toString();
- }
-
- static Timezone parseTimezone(String timezone) throws ParseException {
-
- if (timezone.isEmpty())
- return ZERO;
-
- String error = tr("Error while parsing timezone.\nExpected format: {0}", "+H:MM");
-
- char sgnTimezone = '+';
- StringBuilder hTimezone = new StringBuilder();
- StringBuilder mTimezone = new StringBuilder();
- int state = 1; // 1=start/sign, 2=hours, 3=minutes.
- for (int i = 0; i < timezone.length(); i++) {
- char c = timezone.charAt(i);
- switch (c) {
- case ' ':
- if (state != 2 || hTimezone.length() != 0)
- throw new ParseException(error, i);
- break;
- case '+':
- case '-':
- if (state == 1) {
- sgnTimezone = c;
- state = 2;
- } else
- throw new ParseException(error, i);
- break;
- case ':':
- case '.':
- if (state == 2) {
- state = 3;
- } else
- throw new ParseException(error, i);
- break;
- case '0':
- case '1':
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- switch (state) {
- case 1:
- case 2:
- state = 2;
- hTimezone.append(c);
- break;
- case 3:
- mTimezone.append(c);
- break;
- default:
- throw new ParseException(error, i);
- }
- break;
- default:
- throw new ParseException(error, i);
- }
- }
-
- int h = 0;
- int m = 0;
- try {
- h = Integer.parseInt(hTimezone.toString());
- if (mTimezone.length() > 0) {
- m = Integer.parseInt(mTimezone.toString());
- }
- } catch (NumberFormatException nfe) {
- // Invalid timezone
- throw (ParseException) new ParseException(error, 0).initCause(nfe);
- }
-
- if (h > 12 || m > 59)
- throw new ParseException(error, 0);
- else
- return new Timezone((h + m / 60.0) * (sgnTimezone == '-' ? -1 : 1));
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof Timezone)) return false;
- Timezone timezone1 = (Timezone) o;
- return Double.compare(timezone1.timezone, timezone) == 0;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(timezone);
- }
- }
-
- static final class Offset {
-
- static final Offset ZERO = new Offset(0);
- private final long milliseconds;
-
- private Offset(long milliseconds) {
- this.milliseconds = milliseconds;
- }
-
- static Offset milliseconds(long milliseconds) {
- return new Offset(milliseconds);
- }
-
- static Offset seconds(long seconds) {
- return new Offset(1000 * seconds);
- }
-
- long getMilliseconds() {
- return milliseconds;
- }
-
- long getSeconds() {
- return milliseconds / 1000;
- }
-
- String formatOffset() {
- if (milliseconds % 1000 == 0) {
- return Long.toString(milliseconds / 1000);
- } else if (milliseconds % 100 == 0) {
- return String.format(Locale.ENGLISH, "%.1f", milliseconds / 1000.);
- } else {
- return String.format(Locale.ENGLISH, "%.3f", milliseconds / 1000.);
- }
- }
-
- static Offset parseOffset(String offset) throws ParseException {
- String error = tr("Error while parsing offset.\nExpected format: {0}", "number");
-
- if (!offset.isEmpty()) {
- try {
- if (offset.startsWith("+")) {
- offset = offset.substring(1);
- }
- return Offset.milliseconds(Math.round(Double.parseDouble(offset) * 1000));
- } catch (NumberFormatException nfe) {
- throw (ParseException) new ParseException(error, 0).initCause(nfe);
- }
- } else {
- return Offset.ZERO;
- }
- }
-
- int getDayOffset() {
- // Find day difference
- return (int) Math.round(((double) getMilliseconds()) / TimeUnit.DAYS.toMillis(1));
- }
-
- Offset withoutDayOffset() {
- return milliseconds(getMilliseconds() - TimeUnit.DAYS.toMillis(getDayOffset()));
- }
-
- Pair<Timezone, Offset> splitOutTimezone() {
- // In hours
- 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 * TimeUnit.HOURS.toMillis(1));
- return Pair.create(new Timezone(timezone), Offset.milliseconds(delta));
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (!(o instanceof Offset)) return false;
- Offset offset = (Offset) o;
- return milliseconds == offset.milliseconds;
- }
-
- @Override
- public int hashCode() {
- return Objects.hash(milliseconds);
- }
- }
}
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
index 130c3e4..50fbd6d 100644
--- a/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java
@@ -274,7 +274,7 @@ public class GeoImageLayer extends AbstractModifiableLayer implements PropertyCh
StringBuilder sb = new StringBuilder();
sb.append("<html>");
if (errorMessages.size() == 1) {
- sb.append(errorMessages.iterator().next());
+ sb.append(Utils.escapeReservedCharactersHTML(errorMessages.iterator().next()));
} else {
sb.append(Utils.joinAsHtmlUnorderedList(errorMessages));
}
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/Offset.java b/src/org/openstreetmap/josm/gui/layer/geoimage/Offset.java
new file mode 100644
index 0000000..c9f4f11
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/Offset.java
@@ -0,0 +1,101 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.geoimage;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.text.ParseException;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+
+import org.openstreetmap.josm.tools.Pair;
+
+/**
+ * Time offset of GPX correlation.
+ * @since 11914 (extracted from {@link CorrelateGpxWithImages})
+ */
+public final class Offset {
+
+ static final Offset ZERO = new Offset(0);
+ private final long milliseconds;
+
+ private Offset(long milliseconds) {
+ this.milliseconds = milliseconds;
+ }
+
+ static Offset milliseconds(long milliseconds) {
+ return new Offset(milliseconds);
+ }
+
+ static Offset seconds(long seconds) {
+ return new Offset(1000 * seconds);
+ }
+
+ long getMilliseconds() {
+ return milliseconds;
+ }
+
+ long getSeconds() {
+ return milliseconds / 1000;
+ }
+
+ String formatOffset() {
+ if (milliseconds % 1000 == 0) {
+ return Long.toString(milliseconds / 1000);
+ } else if (milliseconds % 100 == 0) {
+ return String.format(Locale.ENGLISH, "%.1f", milliseconds / 1000.);
+ } else {
+ return String.format(Locale.ENGLISH, "%.3f", milliseconds / 1000.);
+ }
+ }
+
+ static Offset parseOffset(String offset) throws ParseException {
+ String error = tr("Error while parsing offset.\nExpected format: {0}", "number");
+
+ if (!offset.isEmpty()) {
+ try {
+ if (offset.startsWith("+")) {
+ offset = offset.substring(1);
+ }
+ return Offset.milliseconds(Math.round(Double.parseDouble(offset) * 1000));
+ } catch (NumberFormatException nfe) {
+ throw (ParseException) new ParseException(error, 0).initCause(nfe);
+ }
+ } else {
+ return Offset.ZERO;
+ }
+ }
+
+ int getDayOffset() {
+ // Find day difference
+ return (int) Math.round(((double) getMilliseconds()) / TimeUnit.DAYS.toMillis(1));
+ }
+
+ Offset withoutDayOffset() {
+ return milliseconds(getMilliseconds() - TimeUnit.DAYS.toMillis(getDayOffset()));
+ }
+
+ Pair<Timezone, Offset> splitOutTimezone() {
+ // In hours
+ 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 * TimeUnit.HOURS.toMillis(1));
+ return Pair.create(new Timezone(timezone), Offset.milliseconds(delta));
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof Offset)) return false;
+ Offset offset = (Offset) o;
+ return milliseconds == offset.milliseconds;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(milliseconds);
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/geoimage/Timezone.java b/src/org/openstreetmap/josm/gui/layer/geoimage/Timezone.java
new file mode 100644
index 0000000..19ab09c
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/geoimage/Timezone.java
@@ -0,0 +1,142 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.geoimage;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.text.ParseException;
+import java.util.Objects;
+
+/**
+ * Timezone in hours.<p>
+ * TODO: should probably be replaced by {@link java.util.TimeZone}.
+ * @since 11914 (extracted from {@link CorrelateGpxWithImages})
+ */
+public final class Timezone {
+
+ static final Timezone ZERO = new Timezone(0.0);
+ private final double timezone;
+
+ Timezone(double hours) {
+ this.timezone = hours;
+ }
+
+ /**
+ * Returns the timezone in hours.
+ * @return the timezone in hours
+ */
+ public double getHours() {
+ return timezone;
+ }
+
+ String formatTimezone() {
+ StringBuilder ret = new StringBuilder();
+
+ double timezone = this.timezone;
+ if (timezone < 0) {
+ ret.append('-');
+ timezone = -timezone;
+ } else {
+ ret.append('+');
+ }
+ ret.append((long) timezone).append(':');
+ int minutes = (int) ((timezone % 1) * 60);
+ if (minutes < 10) {
+ ret.append('0');
+ }
+ ret.append(minutes);
+
+ return ret.toString();
+ }
+
+ static Timezone parseTimezone(String timezone) throws ParseException {
+
+ if (timezone.isEmpty())
+ return ZERO;
+
+ String error = tr("Error while parsing timezone.\nExpected format: {0}", "+H:MM");
+
+ char sgnTimezone = '+';
+ StringBuilder hTimezone = new StringBuilder();
+ StringBuilder mTimezone = new StringBuilder();
+ int state = 1; // 1=start/sign, 2=hours, 3=minutes.
+ for (int i = 0; i < timezone.length(); i++) {
+ char c = timezone.charAt(i);
+ switch (c) {
+ case ' ':
+ if (state != 2 || hTimezone.length() != 0)
+ throw new ParseException(error, i);
+ break;
+ case '+':
+ case '-':
+ if (state == 1) {
+ sgnTimezone = c;
+ state = 2;
+ } else
+ throw new ParseException(error, i);
+ break;
+ case ':':
+ case '.':
+ if (state == 2) {
+ state = 3;
+ } else
+ throw new ParseException(error, i);
+ break;
+ case '0':
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ switch (state) {
+ case 1:
+ case 2:
+ state = 2;
+ hTimezone.append(c);
+ break;
+ case 3:
+ mTimezone.append(c);
+ break;
+ default:
+ throw new ParseException(error, i);
+ }
+ break;
+ default:
+ throw new ParseException(error, i);
+ }
+ }
+
+ int h = 0;
+ int m = 0;
+ try {
+ h = Integer.parseInt(hTimezone.toString());
+ if (mTimezone.length() > 0) {
+ m = Integer.parseInt(mTimezone.toString());
+ }
+ } catch (NumberFormatException nfe) {
+ // Invalid timezone
+ throw (ParseException) new ParseException(error, 0).initCause(nfe);
+ }
+
+ if (h > 12 || m > 59)
+ throw new ParseException(error, 0);
+ else
+ return new Timezone((h + m / 60.0) * (sgnTimezone == '-' ? -1 : 1));
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (!(o instanceof Timezone)) return false;
+ Timezone timezone1 = (Timezone) o;
+ return Double.compare(timezone1.timezone, timezone) == 0;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(timezone);
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
index dafa400..1484d32 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java
@@ -150,9 +150,8 @@ public abstract class ConvertToDataLayerAction<T extends Layer> extends Abstract
public void actionPerformed(ActionEvent e) {
JPanel msg = new JPanel(new GridBagLayout());
msg.add(new JLabel(
- // CHECKSTYLE.OFF: LineLength
- tr("<html>Upload of unprocessed GPS data as map data is considered harmful.<br>If you want to upload traces, look here:</html>")),
- // CHECKSTYLE.ON: LineLength
+ tr("<html>Upload of unprocessed GPS data as map data is considered harmful.<br>"
+ + "If you want to upload traces, look here:</html>")),
GBC.eol());
msg.add(new UrlLabel(Main.getOSMWebsite() + "/traces", 2), GBC.eop());
if (!ConditionalOptionPaneUtil.showConfirmationDialog("convert_to_data", Main.parent, msg, tr("Warning"),
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java b/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java
index 1557e4b..988cf53 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/GpxDrawHelper.java
@@ -1244,7 +1244,7 @@ public class GpxDrawHelper implements SoMChangeListener {
private static void drawHeatGrayDotMap(Graphics2D gB, MapView mv, List<WayPoint> listSegm, int drawSize) {
// typical rendering rate -> use realtime preview instead of accurate display
- final double maxSegm = 25000, nrSegms = listSegm.size();
+ final double maxSegm = 25_000, nrSegms = listSegm.size();
// determine random drop rate
final double randomDrop = Math.min(nrSegms > maxSegm ? (nrSegms - maxSegm) / nrSegms : 0, 0.70f);
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
index c1fa741..964b2b6 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/ImportAudioAction.java
@@ -70,7 +70,7 @@ public class ImportAudioAction extends AbstractAction {
private static void warnCantImportIntoServerLayer(GpxLayer layer) {
String msg = tr("<html>The data in the GPX layer ''{0}'' has been downloaded from the server.<br>" +
"Because its way points do not include a timestamp we cannot correlate them with audio data.</html>",
- layer.getName());
+ Utils.escapeReservedCharactersHTML(layer.getName()));
HelpAwareOptionPane.showOptionDialog(Main.parent, msg, tr("Import not possible"),
JOptionPane.WARNING_MESSAGE, ht("/Action/ImportAudio#CantImportIntoGpxLayerFromServer"));
}
diff --git a/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java b/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java
index b799bc9..b803f6f 100644
--- a/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java
+++ b/src/org/openstreetmap/josm/gui/layer/gpx/ImportImagesAction.java
@@ -35,7 +35,7 @@ public class ImportImagesAction extends AbstractAction {
private static void warnCantImportIntoServerLayer(GpxLayer layer) {
String msg = tr("<html>The data in the GPX layer ''{0}'' has been downloaded from the server.<br>"+
"Because its way points do not include a timestamp we cannot correlate them with images.</html>",
- layer.getName());
+ Utils.escapeReservedCharactersHTML(layer.getName()));
HelpAwareOptionPane.showOptionDialog(Main.parent, msg, tr("Import not possible"),
JOptionPane.WARNING_MESSAGE, ht("/Action/ImportImages#CantImportIntoGpxLayerFromServer"));
}
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/AutoLoadTilesAction.java b/src/org/openstreetmap/josm/gui/layer/imagery/AutoLoadTilesAction.java
new file mode 100644
index 0000000..fe6544f
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/AutoLoadTilesAction.java
@@ -0,0 +1,51 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.imagery;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.util.List;
+
+import javax.swing.AbstractAction;
+import javax.swing.JCheckBoxMenuItem;
+
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
+
+/**
+ * Auto load tiles.
+ * @since 11950 (extracted from {@link AbstractTileSourceLayer})
+ */
+public class AutoLoadTilesAction extends AbstractAction implements LayerAction {
+
+ private final AbstractTileSourceLayer<?> layer;
+
+ /**
+ * Constructs a new {@code AutoLoadTilesAction}.
+ * @param layer imagery layer
+ */
+ public AutoLoadTilesAction(AbstractTileSourceLayer<?> layer) {
+ super(tr("Auto load tiles"));
+ this.layer = layer;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent ae) {
+ TileSourceDisplaySettings settings = layer.getDisplaySettings();
+ settings.setAutoLoad(!settings.isAutoLoad());
+ }
+
+ @Override
+ public Component createMenuComponent() {
+ JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
+ item.setSelected(layer.getDisplaySettings().isAutoLoad());
+ return item;
+ }
+
+ @Override
+ public boolean supportLayers(List<Layer> layers) {
+ return AbstractTileSourceLayer.actionSupportLayers(layers);
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/AutoZoomAction.java b/src/org/openstreetmap/josm/gui/layer/imagery/AutoZoomAction.java
new file mode 100644
index 0000000..cb5eff9
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/AutoZoomAction.java
@@ -0,0 +1,51 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.imagery;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.util.List;
+
+import javax.swing.AbstractAction;
+import javax.swing.JCheckBoxMenuItem;
+
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
+
+/**
+ * Auto zoom.
+ * @since 11950 (extracted from {@link AbstractTileSourceLayer})
+ */
+public class AutoZoomAction extends AbstractAction implements LayerAction {
+
+ private final AbstractTileSourceLayer<?> layer;
+
+ /**
+ * Constructs a new {@code AutoZoomAction}.
+ * @param layer imagery layer
+ */
+ public AutoZoomAction(AbstractTileSourceLayer<?> layer) {
+ super(tr("Auto zoom"));
+ this.layer = layer;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent ae) {
+ TileSourceDisplaySettings settings = layer.getDisplaySettings();
+ settings.setAutoZoom(!settings.isAutoZoom());
+ }
+
+ @Override
+ public Component createMenuComponent() {
+ JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
+ item.setSelected(layer.getDisplaySettings().isAutoZoom());
+ return item;
+ }
+
+ @Override
+ public boolean supportLayers(List<Layer> layers) {
+ return AbstractTileSourceLayer.actionSupportLayers(layers);
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/ColorfulFilter.java b/src/org/openstreetmap/josm/gui/layer/imagery/ColorfulFilter.java
new file mode 100644
index 0000000..9978005
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/ColorfulFilter.java
@@ -0,0 +1,136 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.imagery;
+
+import java.awt.Rectangle;
+import java.awt.RenderingHints;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.awt.image.BufferedImageOp;
+import java.awt.image.ColorModel;
+import java.awt.image.DataBuffer;
+import java.awt.image.DataBufferByte;
+import java.util.Optional;
+
+import org.openstreetmap.josm.Main;
+
+/**
+ * Colorful filter.
+ * @since 11914 (extracted from ColorfulImageProcessor)
+ */
+public class ColorfulFilter implements BufferedImageOp {
+ private final double colorfulness;
+
+ /**
+ * Create a new colorful filter.
+ * @param colorfulness The colorfulness as defined in the {@link ColorfulImageProcessor} class.
+ */
+ ColorfulFilter(double colorfulness) {
+ this.colorfulness = colorfulness;
+ }
+
+ @Override
+ public BufferedImage filter(BufferedImage src, BufferedImage dst) {
+ if (src.getWidth() == 0 || src.getHeight() == 0) {
+ return src;
+ }
+
+ BufferedImage dest = Optional.ofNullable(dst).orElseGet(() -> createCompatibleDestImage(src, null));
+ DataBuffer srcBuffer = src.getRaster().getDataBuffer();
+ DataBuffer destBuffer = dest.getRaster().getDataBuffer();
+ if (!(srcBuffer instanceof DataBufferByte) || !(destBuffer instanceof DataBufferByte)) {
+ Main.trace("Cannot apply color filter: Images do not use DataBufferByte.");
+ return src;
+ }
+
+ int type = src.getType();
+ if (type != dest.getType()) {
+ Main.trace("Cannot apply color filter: Src / Dest differ in type (" + type + '/' + dest.getType() + ')');
+ return src;
+ }
+ int redOffset;
+ int greenOffset;
+ int blueOffset;
+ int alphaOffset = 0;
+ switch (type) {
+ case BufferedImage.TYPE_3BYTE_BGR:
+ blueOffset = 0;
+ greenOffset = 1;
+ redOffset = 2;
+ break;
+ case BufferedImage.TYPE_4BYTE_ABGR:
+ case BufferedImage.TYPE_4BYTE_ABGR_PRE:
+ blueOffset = 1;
+ greenOffset = 2;
+ redOffset = 3;
+ break;
+ case BufferedImage.TYPE_INT_ARGB:
+ case BufferedImage.TYPE_INT_ARGB_PRE:
+ redOffset = 0;
+ greenOffset = 1;
+ blueOffset = 2;
+ alphaOffset = 3;
+ break;
+ default:
+ Main.trace("Cannot apply color filter: Source image is of wrong type (" + type + ").");
+ return src;
+ }
+ doFilter((DataBufferByte) srcBuffer, (DataBufferByte) destBuffer, redOffset, greenOffset, blueOffset,
+ alphaOffset, src.getAlphaRaster() != null);
+ return dest;
+ }
+
+ private void doFilter(DataBufferByte src, DataBufferByte dest, int redOffset, int greenOffset, int blueOffset,
+ int alphaOffset, boolean hasAlpha) {
+ byte[] srcPixels = src.getData();
+ byte[] destPixels = dest.getData();
+ if (srcPixels.length != destPixels.length) {
+ Main.trace("Cannot apply color filter: Source/Dest lengths differ.");
+ return;
+ }
+ int entries = hasAlpha ? 4 : 3;
+ for (int i = 0; i < srcPixels.length; i += entries) {
+ int r = srcPixels[i + redOffset] & 0xff;
+ int g = srcPixels[i + greenOffset] & 0xff;
+ int b = srcPixels[i + blueOffset] & 0xff;
+ double luminosity = r * .21d + g * .72d + b * .07d;
+ destPixels[i + redOffset] = mix(r, luminosity);
+ destPixels[i + greenOffset] = mix(g, luminosity);
+ destPixels[i + blueOffset] = mix(b, luminosity);
+ if (hasAlpha) {
+ destPixels[i + alphaOffset] = srcPixels[i + alphaOffset];
+ }
+ }
+ }
+
+ private byte mix(int color, double luminosity) {
+ int val = (int) (colorfulness * color + (1 - colorfulness) * luminosity);
+ if (val < 0) {
+ return 0;
+ } else if (val > 0xff) {
+ return (byte) 0xff;
+ } else {
+ return (byte) val;
+ }
+ }
+
+ @Override
+ public Rectangle2D getBounds2D(BufferedImage src) {
+ return new Rectangle(src.getWidth(), src.getHeight());
+ }
+
+ @Override
+ public BufferedImage createCompatibleDestImage(BufferedImage src, ColorModel destCM) {
+ return new BufferedImage(src.getWidth(), src.getHeight(), src.getType());
+ }
+
+ @Override
+ public Point2D getPoint2D(Point2D srcPt, Point2D dstPt) {
+ return (Point2D) srcPt.clone();
+ }
+
+ @Override
+ public RenderingHints getRenderingHints() {
+ return null;
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/ColorfulImageProcessor.java b/src/org/openstreetmap/josm/gui/layer/imagery/ColorfulImageProcessor.java
index bcc3264..1e1c5d7 100644
--- a/src/org/openstreetmap/josm/gui/layer/imagery/ColorfulImageProcessor.java
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/ColorfulImageProcessor.java
@@ -1,18 +1,8 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.layer.imagery;
-import java.awt.Rectangle;
-import java.awt.RenderingHints;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
import java.awt.image.BufferedImage;
-import java.awt.image.BufferedImageOp;
-import java.awt.image.ColorModel;
-import java.awt.image.DataBuffer;
-import java.awt.image.DataBufferByte;
-import java.util.Optional;
-import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.gui.layer.ImageProcessor;
/**
@@ -64,121 +54,4 @@ public class ColorfulImageProcessor implements ImageProcessor {
public String toString() {
return "ColorfulImageProcessor [colorfulness=" + colorfulness + ']';
}
-
- static class ColorfulFilter implements BufferedImageOp {
- private final double colorfulness;
-
- /**
- * Create a new colorful filter.
- * @param colorfulness The colorfulness as defined in the {@link ColorfulImageProcessor} class.
- */
- ColorfulFilter(double colorfulness) {
- this.colorfulness = colorfulness;
- }
-
- @Override
- public BufferedImage filter(BufferedImage src, BufferedImage dst) {
- if (src.getWidth() == 0 || src.getHeight() == 0) {
- return src;
- }
-
- BufferedImage dest = Optional.ofNullable(dst).orElseGet(() -> createCompatibleDestImage(src, null));
- DataBuffer srcBuffer = src.getRaster().getDataBuffer();
- DataBuffer destBuffer = dest.getRaster().getDataBuffer();
- if (!(srcBuffer instanceof DataBufferByte) || !(destBuffer instanceof DataBufferByte)) {
- Main.trace("Cannot apply color filter: Images do not use DataBufferByte.");
- return src;
- }
-
- int type = src.getType();
- if (type != dest.getType()) {
- Main.trace("Cannot apply color filter: Src / Dest differ in type (" + type + '/' + dest.getType() + ')');
- return src;
- }
- int redOffset;
- int greenOffset;
- int blueOffset;
- int alphaOffset = 0;
- switch (type) {
- case BufferedImage.TYPE_3BYTE_BGR:
- blueOffset = 0;
- greenOffset = 1;
- redOffset = 2;
- break;
- case BufferedImage.TYPE_4BYTE_ABGR:
- case BufferedImage.TYPE_4BYTE_ABGR_PRE:
- blueOffset = 1;
- greenOffset = 2;
- redOffset = 3;
- break;
- case BufferedImage.TYPE_INT_ARGB:
- case BufferedImage.TYPE_INT_ARGB_PRE:
- redOffset = 0;
- greenOffset = 1;
- blueOffset = 2;
- alphaOffset = 3;
- break;
- default:
- Main.trace("Cannot apply color filter: Source image is of wrong type (" + type + ").");
- return src;
- }
- doFilter((DataBufferByte) srcBuffer, (DataBufferByte) destBuffer, redOffset, greenOffset, blueOffset,
- alphaOffset, src.getAlphaRaster() != null);
- return dest;
- }
-
- private void doFilter(DataBufferByte src, DataBufferByte dest, int redOffset, int greenOffset, int blueOffset,
- int alphaOffset, boolean hasAlpha) {
- byte[] srcPixels = src.getData();
- byte[] destPixels = dest.getData();
- if (srcPixels.length != destPixels.length) {
- Main.trace("Cannot apply color filter: Source/Dest lengths differ.");
- return;
- }
- int entries = hasAlpha ? 4 : 3;
- for (int i = 0; i < srcPixels.length; i += entries) {
- int r = srcPixels[i + redOffset] & 0xff;
- int g = srcPixels[i + greenOffset] & 0xff;
- int b = srcPixels[i + blueOffset] & 0xff;
- double luminosity = r * .21d + g * .72d + b * .07d;
- destPixels[i + redOffset] = mix(r, luminosity);
- destPixels[i + greenOffset] = mix(g, luminosity);
- destPixels[i + blueOffset] = mix(b, luminosity);
- if (hasAlpha) {
- destPixels[i + alphaOffset] = srcPixels[i + alphaOffset];
- }
- }
- }
-
- private byte mix(int color, double luminosity) {
- int val = (int) (colorfulness * color + (1 - colorfulness) * luminosity);
- if (val < 0) {
- return 0;
- } else if (val > 0xff) {
- return (byte) 0xff;
- } else {
- return (byte) val;
- }
- }
-
- @Override
- public Rectangle2D getBounds2D(BufferedImage src) {
- return new Rectangle(src.getWidth(), src.getHeight());
- }
-
- @Override
- public BufferedImage createCompatibleDestImage(BufferedImage src, ColorModel destCM) {
- return new BufferedImage(src.getWidth(), src.getHeight(), src.getType());
- }
-
- @Override
- public Point2D getPoint2D(Point2D srcPt, Point2D dstPt) {
- return (Point2D) srcPt.clone();
- }
-
- @Override
- public RenderingHints getRenderingHints() {
- return null;
- }
- }
}
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/DecreaseZoomAction.java b/src/org/openstreetmap/josm/gui/layer/imagery/DecreaseZoomAction.java
new file mode 100644
index 0000000..23a14d6
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/DecreaseZoomAction.java
@@ -0,0 +1,34 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.imagery;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
+
+/**
+ * Decrease zoom.
+ * @since 11950 (extracted from {@link AbstractTileSourceLayer})
+ */
+public class DecreaseZoomAction extends AbstractAction {
+
+ private final AbstractTileSourceLayer<?> layer;
+
+ /**
+ * Constructs a new {@code DecreaseZoomAction}.
+ * @param layer imagery layer
+ */
+ public DecreaseZoomAction(AbstractTileSourceLayer<?> layer) {
+ super(tr("Decrease zoom"));
+ this.layer = layer;
+ setEnabled(!layer.getDisplaySettings().isAutoZoom() && layer.zoomDecreaseAllowed());
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent ae) {
+ layer.decreaseZoomLevel();
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/FlushTileCacheAction.java b/src/org/openstreetmap/josm/gui/layer/imagery/FlushTileCacheAction.java
new file mode 100644
index 0000000..6e7f9c9
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/FlushTileCacheAction.java
@@ -0,0 +1,50 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.imagery;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+
+import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
+
+/**
+ * Flush tile cache.
+ * @since 11950 (extracted from {@link AbstractTileSourceLayer})
+ */
+public class FlushTileCacheAction extends AbstractAction {
+
+ private final AbstractTileSourceLayer<?> layer;
+
+ /**
+ * Constructs a new {@code FlushTileCacheAction}.
+ * @param layer imagery layer
+ */
+ public FlushTileCacheAction(AbstractTileSourceLayer<?> layer) {
+ super(tr("Flush tile cache"));
+ this.layer = layer;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent ae) {
+ new PleaseWaitRunnable(tr("Flush tile cache")) {
+ @Override
+ protected void realRun() {
+ layer.clearTileCache();
+ layer.invalidate();
+ }
+
+ @Override
+ protected void finish() {
+ // empty - flush is instaneus
+ }
+
+ @Override
+ protected void cancel() {
+ // empty - flush is instaneus
+ }
+ }.run();
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/IncreaseZoomAction.java b/src/org/openstreetmap/josm/gui/layer/imagery/IncreaseZoomAction.java
new file mode 100644
index 0000000..7635a42
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/IncreaseZoomAction.java
@@ -0,0 +1,34 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.imagery;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
+
+/**
+ * Increase zoom.
+ * @since 11950 (extracted from {@link AbstractTileSourceLayer})
+ */
+public class IncreaseZoomAction extends AbstractAction {
+
+ private final AbstractTileSourceLayer<?> layer;
+
+ /**
+ * Constructs a new {@code IncreaseZoomAction}.
+ * @param layer imagery layer
+ */
+ public IncreaseZoomAction(AbstractTileSourceLayer<?> layer) {
+ super(tr("Increase zoom"));
+ this.layer = layer;
+ setEnabled(!layer.getDisplaySettings().isAutoZoom() && layer.zoomIncreaseAllowed());
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent ae) {
+ layer.increaseZoomLevel();
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/LoadAllTilesAction.java b/src/org/openstreetmap/josm/gui/layer/imagery/LoadAllTilesAction.java
new file mode 100644
index 0000000..c4e68fc
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/LoadAllTilesAction.java
@@ -0,0 +1,37 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.imagery;
+
+/**
+ * Load all tiles.
+ * @since 11950 (extracted from {@link AbstractTileSourceLayer})
+ */
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
+
+/**
+ * Load all tiles.
+ * @since 11950 (extracted from {@link AbstractTileSourceLayer})
+ */
+public class LoadAllTilesAction extends AbstractAction {
+
+ private final AbstractTileSourceLayer<?> layer;
+
+ /**
+ * Constructs a new {@code LoadAllTilesAction}.
+ * @param layer imagery layer
+ */
+ public LoadAllTilesAction(AbstractTileSourceLayer<?> layer) {
+ super(tr("Load all tiles"));
+ this.layer = layer;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent ae) {
+ layer.loadAllTiles(true);
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/LoadErroneousTilesAction.java b/src/org/openstreetmap/josm/gui/layer/imagery/LoadErroneousTilesAction.java
new file mode 100644
index 0000000..5b74b6f
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/LoadErroneousTilesAction.java
@@ -0,0 +1,33 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.imagery;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
+
+/**
+ * Load all error tiles.
+ * @since 11950 (extracted from {@link AbstractTileSourceLayer})
+ */
+public class LoadErroneousTilesAction extends AbstractAction {
+
+ private final AbstractTileSourceLayer<?> layer;
+
+ /**
+ * Constructs a new {@code LoadErroneousTilesAction}.
+ * @param layer imagery layer
+ */
+ public LoadErroneousTilesAction(AbstractTileSourceLayer<?> layer) {
+ super(tr("Load all error tiles"));
+ this.layer = layer;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent ae) {
+ layer.loadAllErrorTiles(true);
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/ReprojectionTile.java b/src/org/openstreetmap/josm/gui/layer/imagery/ReprojectionTile.java
new file mode 100644
index 0000000..1647697
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/ReprojectionTile.java
@@ -0,0 +1,213 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.imagery;
+
+import java.awt.Dimension;
+import java.awt.geom.Point2D;
+import java.awt.image.BufferedImage;
+
+import org.openstreetmap.gui.jmapviewer.Tile;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.ProjectionBounds;
+import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.Projections;
+import org.openstreetmap.josm.tools.ImageWarp;
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * Tile class that stores a reprojected version of the original tile.
+ * @since 11858
+ */
+public class ReprojectionTile extends Tile {
+
+ protected TileAnchor anchor;
+ private double nativeScale;
+ protected boolean maxZoomReached;
+
+ /**
+ * Constructs a new {@code ReprojectionTile}.
+ * @param source sourec tile
+ * @param xtile X coordinate
+ * @param ytile Y coordinate
+ * @param zoom zoom level
+ */
+ public ReprojectionTile(TileSource source, int xtile, int ytile, int zoom) {
+ super(source, xtile, ytile, zoom);
+ }
+
+ /**
+ * Get the position of the tile inside the image.
+ * @return the position of the tile inside the image
+ * @see #getImage()
+ */
+ public TileAnchor getAnchor() {
+ return anchor;
+ }
+
+ /**
+ * Get the scale that was used for reprojecting the tile.
+ *
+ * This is not necessarily the mapview scale, but may be
+ * adjusted to avoid excessively large cache image.
+ * @return the scale that was used for reprojecting the tile
+ */
+ public double getNativeScale() {
+ return nativeScale;
+ }
+
+ /**
+ * Check if it is necessary to refresh the cache to match the current mapview
+ * scale and get optimized image quality.
+ *
+ * When the maximum zoom is exceeded, this method will generally return false.
+ * @param currentScale the current mapview scale
+ * @return true if the tile should be reprojected again from the source image.
+ */
+ public boolean needsUpdate(double currentScale) {
+ if (Utils.equalsEpsilon(nativeScale, currentScale))
+ return false;
+ return !maxZoomReached || currentScale >= nativeScale;
+ }
+
+ @Override
+ public void setImage(BufferedImage image) {
+ if (image == null) {
+ reset();
+ } else {
+ transform(image);
+ }
+ }
+
+ /**
+ * Invalidate tile - mark it as not loaded.
+ */
+ public synchronized void invalidate() {
+ this.loaded = false;
+ this.loading = false;
+ this.error = false;
+ this.error_message = null;
+ }
+
+ private synchronized void reset() {
+ this.image = null;
+ this.anchor = null;
+ this.maxZoomReached = false;
+ }
+
+ /**
+ * Transforms the given image.
+ * @param imageIn tile image to reproject
+ */
+ protected void transform(BufferedImage imageIn) {
+ if (!Main.isDisplayingMapView()) {
+ reset();
+ return;
+ }
+ double scaleMapView = Main.map.mapView.getScale();
+ ImageWarp.Interpolation interpolation;
+ switch (Main.pref.get("imagery.warp.pixel-interpolation", "bilinear")) {
+ case "nearest_neighbor":
+ interpolation = ImageWarp.Interpolation.NEAREST_NEIGHBOR;
+ break;
+ default:
+ interpolation = ImageWarp.Interpolation.BILINEAR;
+ }
+
+ Projection projCurrent = Main.getProjection();
+ Projection projServer = Projections.getProjectionByCode(source.getServerCRS());
+ EastNorth en00Server = new EastNorth(source.tileXYtoProjected(xtile, ytile, zoom));
+ EastNorth en11Server = new EastNorth(source.tileXYtoProjected(xtile + 1, ytile + 1, zoom));
+ ProjectionBounds pbServer = new ProjectionBounds(en00Server);
+ pbServer.extend(en11Server);
+ // find east-north rectangle in current projection, that will fully contain the tile
+ ProjectionBounds pbTarget = projCurrent.getEastNorthBoundsBox(pbServer, projServer);
+
+ double margin = 2;
+ Dimension dim = getDimension(pbMarginAndAlign(pbTarget, scaleMapView, margin), scaleMapView);
+ Integer scaleFix = limitScale(source.getTileSize(), Math.sqrt(dim.getWidth() * dim.getHeight()));
+ double scale = scaleFix == null ? scaleMapView : (scaleMapView * scaleFix);
+ ProjectionBounds pbTargetAligned = pbMarginAndAlign(pbTarget, scale, margin);
+
+ ImageWarp.PointTransform pointTransform = pt -> {
+ EastNorth target = new EastNorth(pbTargetAligned.minEast + pt.getX() * scale,
+ pbTargetAligned.maxNorth - pt.getY() * scale);
+ EastNorth sourceEN = projServer.latlon2eastNorth(projCurrent.eastNorth2latlon(target));
+ double x = source.getTileSize() *
+ (sourceEN.east() - pbServer.minEast) / (pbServer.maxEast - pbServer.minEast);
+ double y = source.getTileSize() *
+ (pbServer.maxNorth - sourceEN.north()) / (pbServer.maxNorth - pbServer.minNorth);
+ return new Point2D.Double(x, y);
+ };
+
+ // pixel coordinates of tile origin and opposite tile corner inside the target image
+ // (tile may be deformed / rotated by reprojection)
+ EastNorth en00Current = projCurrent.latlon2eastNorth(projServer.eastNorth2latlon(en00Server));
+ EastNorth en11Current = projCurrent.latlon2eastNorth(projServer.eastNorth2latlon(en11Server));
+ Point2D p00Img = new Point2D.Double(
+ (en00Current.east() - pbTargetAligned.minEast) / scale,
+ (pbTargetAligned.maxNorth - en00Current.north()) / scale);
+ Point2D p11Img = new Point2D.Double(
+ (en11Current.east() - pbTargetAligned.minEast) / scale,
+ (pbTargetAligned.maxNorth - en11Current.north()) / scale);
+
+ ImageWarp.PointTransform transform;
+ int stride = Main.pref.getInteger("imagery.warp.projection-interpolation.stride", 7);
+ if (stride > 0) {
+ transform = new ImageWarp.GridTransform(pointTransform, stride);
+ } else {
+ transform = pointTransform;
+ }
+ BufferedImage imageOut = ImageWarp.warp(
+ imageIn, getDimension(pbTargetAligned, scale),
+ transform, interpolation);
+ synchronized (this) {
+ this.image = imageOut;
+ this.anchor = new TileAnchor(p00Img, p11Img);
+ this.nativeScale = scale;
+ this.maxZoomReached = scaleFix != null;
+ }
+ }
+
+ // add margin and align to pixel grid
+ private static ProjectionBounds pbMarginAndAlign(ProjectionBounds box, double scale, double margin) {
+ double minEast = Math.floor(box.minEast / scale - margin) * scale;
+ double minNorth = -Math.floor(-(box.minNorth / scale - margin)) * scale;
+ double maxEast = Math.ceil(box.maxEast / scale + margin) * scale;
+ double maxNorth = -Math.ceil(-(box.maxNorth / scale + margin)) * scale;
+ return new ProjectionBounds(minEast, minNorth, maxEast, maxNorth);
+ }
+
+ // dimension in pixel
+ private static Dimension getDimension(ProjectionBounds bounds, double scale) {
+ return new Dimension(
+ (int) Math.round((bounds.maxEast - bounds.minEast) / scale),
+ (int) Math.round((bounds.maxNorth - bounds.minNorth) / scale));
+ }
+
+ /**
+ * Make sure, the image is not scaled up too much.
+ *
+ * This would not give any significant improvement in image quality and may
+ * exceed the user's memory. The correction factor is a power of 2.
+ * @param lenOrig tile size of original image
+ * @param lenNow (averaged) tile size of warped image
+ * @return factor to shrink if limit is exceeded; 1 if it is already at the
+ * limit, but no change needed; null if it is well below the limit and can
+ * still be scaled up by at least a factor of 2.
+ */
+ protected Integer limitScale(double lenOrig, double lenNow) {
+ final double limit = 3;
+ if (lenNow > limit * lenOrig) {
+ int n = (int) Math.ceil((Math.log(lenNow) - Math.log(limit * lenOrig)) / Math.log(2));
+ int f = 1 << n;
+ double lenNowFixed = lenNow / f;
+ if (lenNowFixed > limit * lenOrig) throw new AssertionError();
+ if (lenNowFixed <= limit * lenOrig / 2) throw new AssertionError();
+ return f;
+ }
+ if (lenNow > limit * lenOrig / 2)
+ return 1;
+ return null;
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/ShowErrorsAction.java b/src/org/openstreetmap/josm/gui/layer/imagery/ShowErrorsAction.java
new file mode 100644
index 0000000..a189fe6
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/ShowErrorsAction.java
@@ -0,0 +1,51 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.imagery;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Component;
+import java.awt.event.ActionEvent;
+import java.util.List;
+
+import javax.swing.AbstractAction;
+import javax.swing.JCheckBoxMenuItem;
+
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
+import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.Layer.LayerAction;
+
+/**
+ * Show tile errors.
+ * @since 11950 (extracted from {@link AbstractTileSourceLayer})
+ */
+public class ShowErrorsAction extends AbstractAction implements LayerAction {
+
+ private final AbstractTileSourceLayer<?> layer;
+
+ /**
+ * Constructs a new {@code ShowErrorsAction}.
+ * @param layer imagery layer
+ */
+ public ShowErrorsAction(AbstractTileSourceLayer<?> layer) {
+ super(tr("Show errors"));
+ this.layer = layer;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent ae) {
+ TileSourceDisplaySettings settings = layer.getDisplaySettings();
+ settings.setShowErrors(!settings.isShowErrors());
+ }
+
+ @Override
+ public Component createMenuComponent() {
+ JCheckBoxMenuItem item = new JCheckBoxMenuItem(this);
+ item.setSelected(layer.getDisplaySettings().isShowErrors());
+ return item;
+ }
+
+ @Override
+ public boolean supportLayers(List<Layer> layers) {
+ return AbstractTileSourceLayer.actionSupportLayers(layers);
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/TileAnchor.java b/src/org/openstreetmap/josm/gui/layer/imagery/TileAnchor.java
new file mode 100644
index 0000000..65fd4f9
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/TileAnchor.java
@@ -0,0 +1,79 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.imagery;
+
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Point2D;
+
+import org.openstreetmap.gui.jmapviewer.interfaces.IProjected;
+
+/**
+ * Class that fixes the position of a tile in a given coordinate space.
+ *
+ * This is done by storing the coordinates of the tile origin and the opposite
+ * tile corner.
+ * <p>
+ * It may represent a reprojected tile, i.e. the tile is rotated / deformed in an
+ * arbitrary way. In general, the tile origin cannot be expected to be the
+ * upper left corner of the rectangle that is spanned by the 2 points.
+ * <p>
+ * The coordinate space may be
+ * <ul>
+ * <li>pixel coordinates of the image file</li>
+ * <li>projected coordinates (east / north)</li>
+ * <li>screen pixel coordinates</li>
+ * </ul>
+ * @since 11846
+ */
+public class TileAnchor {
+
+ protected final Point2D tileOrigin, nextTileOrigin;
+
+ /**
+ * Create a new tile anchor.
+ * @param tileOrigin position of the tile origin
+ * @param nextTileOrigin position of the opposite tile corner, i.e. the
+ * origin of the tile with index (x+1,y+1), when current tile has index (x,y)
+ */
+ public TileAnchor(Point2D tileOrigin, Point2D nextTileOrigin) {
+ this.tileOrigin = tileOrigin;
+ this.nextTileOrigin = nextTileOrigin;
+ }
+
+ public TileAnchor(IProjected tileOrigin, IProjected nextTileOrigin) {
+ this.tileOrigin = new Point2D.Double(tileOrigin.getEast(), tileOrigin.getNorth());
+ this.nextTileOrigin = new Point2D.Double(nextTileOrigin.getEast(), nextTileOrigin.getNorth());
+ }
+
+ public Point2D getTileOrigin() {
+ return tileOrigin;
+ }
+
+ public Point2D getNextTileOrigin() {
+ return nextTileOrigin;
+ }
+
+ @Override
+ public String toString() {
+ return "TileAnchor{" + tileOrigin + "; " + nextTileOrigin + '}';
+ }
+
+ /**
+ * Create a transformation that converts points from this coordinate space
+ * to another coordinate space.
+ * @param other tile anchor of the tile in the target coordinate space
+ * @return affine transformation from this coordinate space to the target
+ * coordinate space
+ */
+ public AffineTransform convert(TileAnchor other) {
+ Point2D src1 = this.getTileOrigin();
+ Point2D src2 = this.getNextTileOrigin();
+ Point2D dest1 = other.getTileOrigin();
+ Point2D dest2 = other.getNextTileOrigin();
+
+ double scaleX = (dest2.getX() - dest1.getX()) / (src2.getX() - src1.getX());
+ double scaleY = (dest2.getY() - dest1.getY()) / (src2.getY() - src1.getY());
+ double offsetX0 = dest1.getX() - scaleX * src1.getX();
+ double offsetY0 = dest1.getY() - scaleY * src1.getY();
+ return new AffineTransform(scaleX, 0, 0, scaleY, offsetX0, offsetY0);
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java b/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java
index 8a0b92e..63c9f62 100644
--- a/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/TileCoordinateConverter.java
@@ -1,13 +1,20 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm.gui.layer.imagery;
+import java.awt.Polygon;
+import java.awt.Rectangle;
+import java.awt.Shape;
import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
+import java.util.Objects;
import org.openstreetmap.gui.jmapviewer.Tile;
import org.openstreetmap.gui.jmapviewer.TileXY;
import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
+import org.openstreetmap.gui.jmapviewer.interfaces.IProjected;
import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.data.projection.Projecting;
import org.openstreetmap.josm.data.projection.ShiftedProjecting;
@@ -29,17 +36,32 @@ public class TileCoordinateConverter {
* @param mapView The map view.
* @param tileSource The tile source to use when converting coordinates.
* @param settings displacement settings.
+ * @throws NullPointerException if one argument is null
*/
public TileCoordinateConverter(MapView mapView, TileSource tileSource, TileSourceDisplaySettings settings) {
- this.mapView = mapView;
- this.tileSource = tileSource;
- this.settings = settings;
+ this.mapView = Objects.requireNonNull(mapView, "mapView");
+ this.tileSource = Objects.requireNonNull(tileSource, "tileSource");
+ this.settings = Objects.requireNonNull(settings, "settings");
}
private MapViewPoint pos(ICoordinate ll) {
return mapView.getState().getPointFor(new LatLon(ll)).add(settings.getDisplacement());
}
+ private MapViewPoint pos(IProjected p) {
+ return mapView.getState().getPointFor(new EastNorth(p)).add(settings.getDisplacement());
+ }
+
+ /**
+ * Apply reverse shift to EastNorth coordinate.
+ *
+ * @param en EastNorth coordinate representing a pixel on screen
+ * @return IProjected coordinate as it would e.g. be sent to a WMS server
+ */
+ public IProjected shiftDisplayToServer(EastNorth en) {
+ return en.subtract(settings.getDisplacement()).toProjected();
+ }
+
/**
* Gets the projecting instance to use to convert between latlon and eastnorth coordinates.
* @return The {@link Projecting} instance.
@@ -50,18 +72,46 @@ public class TileCoordinateConverter {
/**
* Gets the top left position of the tile inside the map view.
+ * @param x x tile index
+ * @param y y tile index
+ * @param zoom zoom level
+ * @return the position
+ */
+ public Point2D getPixelForTile(int x, int y, int zoom) {
+ ICoordinate coord = tileSource.tileXYToLatLon(x, y, zoom);
+ return pos(coord).getInView();
+ }
+
+ /**
+ * Gets the top left position of the tile inside the map view.
* @param tile The tile
- * @return The positon.
+ * @return The position.
*/
public Point2D getPixelForTile(Tile tile) {
- ICoordinate coord = tile.getTileSource().tileXYToLatLon(tile);
- return pos(coord).getInView();
+ return getPixelForTile(tile.getXtile(), tile.getYtile(), tile.getZoom());
+ }
+
+ /**
+ * Convert screen pixel coordinate to tile position at certain zoom level.
+ * @param sx x coordinate (screen pixel)
+ * @param sy y coordinate (screen pixel)
+ * @param zoom zoom level
+ * @return the tile
+ */
+ public TileXY getTileforPixel(int sx, int sy, int zoom) {
+ if (requiresReprojection()) {
+ LatLon ll = getProjecting().eastNorth2latlonClamped(mapView.getEastNorth(sx, sy));
+ return tileSource.latLonToTileXY(ll.toCoordinate(), zoom);
+ } else {
+ IProjected p = shiftDisplayToServer(mapView.getEastNorth(sx, sy));
+ return tileSource.projectedToTileXY(p, zoom);
+ }
}
/**
* Gets the position of the tile inside the map view.
* @param tile The tile
- * @return The positon.
+ * @return The positon as a rectangle in screen coordinates
*/
public Rectangle2D getRectangleForTile(Tile tile) {
ICoordinate c1 = tile.getTileSource().tileXYToLatLon(tile);
@@ -71,19 +121,85 @@ public class TileCoordinateConverter {
}
/**
+ * Returns a shape that approximates the outline of the tile in screen coordinates.
+ *
+ * If the tile is rectangular, this will be the exact border of the tile.
+ * The tile may be more oddly shaped due to reprojection, then it is an approximation
+ * of the tile outline.
+ * @param tile the tile
+ * @return tile outline in screen coordinates
+ */
+ public Shape getTileShapeScreen(Tile tile) {
+ if (requiresReprojection()) {
+ Point2D p00 = this.getPixelForTile(tile.getXtile(), tile.getYtile(), tile.getZoom());
+ Point2D p10 = this.getPixelForTile(tile.getXtile() + 1, tile.getYtile(), tile.getZoom());
+ Point2D p11 = this.getPixelForTile(tile.getXtile() + 1, tile.getYtile() + 1, tile.getZoom());
+ Point2D p01 = this.getPixelForTile(tile.getXtile(), tile.getYtile() + 1, tile.getZoom());
+ return new Polygon(new int[] {
+ (int) Math.round(p00.getX()),
+ (int) Math.round(p01.getX()),
+ (int) Math.round(p11.getX()),
+ (int) Math.round(p10.getX())},
+ new int[] {
+ (int) Math.round(p00.getY()),
+ (int) Math.round(p01.getY()),
+ (int) Math.round(p11.getY()),
+ (int) Math.round(p10.getY())}, 4);
+ } else {
+ Point2D p00 = this.getPixelForTile(tile.getXtile(), tile.getYtile(), tile.getZoom());
+ Point2D p11 = this.getPixelForTile(tile.getXtile() + 1, tile.getYtile() + 1, tile.getZoom());
+ return new Rectangle((int) Math.round(p00.getX()), (int) Math.round(p00.getY()),
+ (int) Math.round(p11.getX()) - (int) Math.round(p00.getX()),
+ (int) Math.round(p11.getY()) - (int) Math.round(p00.getY()));
+ }
+ }
+
+ /**
* Returns average number of screen pixels per tile pixel for current mapview
* @param zoom zoom level
* @return average number of screen pixels per tile pixel
*/
public double getScaleFactor(int zoom) {
- LatLon topLeft = mapView.getLatLon(0, 0);
- LatLon botRight = mapView.getLatLon(mapView.getWidth(), mapView.getHeight());
- TileXY t1 = tileSource.latLonToTileXY(topLeft.toCoordinate(), zoom);
- TileXY t2 = tileSource.latLonToTileXY(botRight.toCoordinate(), zoom);
-
+ TileXY t1, t2;
+ if (requiresReprojection()) {
+ LatLon topLeft = mapView.getLatLon(0, 0);
+ LatLon botRight = mapView.getLatLon(mapView.getWidth(), mapView.getHeight());
+ t1 = tileSource.latLonToTileXY(topLeft.toCoordinate(), zoom);
+ t2 = tileSource.latLonToTileXY(botRight.toCoordinate(), zoom);
+ } else {
+ EastNorth topLeftEN = mapView.getEastNorth(0, 0);
+ EastNorth botRightEN = mapView.getEastNorth(mapView.getWidth(), mapView.getHeight());
+ t1 = tileSource.projectedToTileXY(topLeftEN.toProjected(), zoom);
+ t2 = tileSource.projectedToTileXY(botRightEN.toProjected(), zoom);
+ }
int screenPixels = mapView.getWidth()*mapView.getHeight();
double tilePixels = Math.abs((t2.getY()-t1.getY())*(t2.getX()-t1.getX())*tileSource.getTileSize()*tileSource.getTileSize());
if (screenPixels == 0 || tilePixels == 0) return 1;
return screenPixels/tilePixels;
}
+
+ /**
+ * Get {@link TileAnchor} for a tile in screen pixel coordinates.
+ * @param tile the tile
+ * @return position of the tile in screen coordinates
+ */
+ public TileAnchor getScreenAnchorForTile(Tile tile) {
+ if (requiresReprojection()) {
+ ICoordinate c1 = tile.getTileSource().tileXYToLatLon(tile);
+ ICoordinate c2 = tile.getTileSource().tileXYToLatLon(tile.getXtile() + 1, tile.getYtile() + 1, tile.getZoom());
+ return new TileAnchor(pos(c1).getInView(), pos(c2).getInView());
+ } else {
+ IProjected p1 = tileSource.tileXYtoProjected(tile.getXtile(), tile.getYtile(), tile.getZoom());
+ IProjected p2 = tileSource.tileXYtoProjected(tile.getXtile() + 1, tile.getYtile() + 1, tile.getZoom());
+ return new TileAnchor(pos(p1).getInView(), pos(p2).getInView());
+ }
+ }
+
+ /**
+ * Return true if tiles need to be reprojected from server projection to display projection.
+ * @return true if tiles need to be reprojected from server projection to display projection
+ */
+ public boolean requiresReprojection() {
+ return !tileSource.getServerCRS().equals(Main.getProjection().toCode());
+ }
}
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/TilePosition.java b/src/org/openstreetmap/josm/gui/layer/imagery/TilePosition.java
index 23478e7..0f3b298 100644
--- a/src/org/openstreetmap/josm/gui/layer/imagery/TilePosition.java
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/TilePosition.java
@@ -11,7 +11,8 @@ public class TilePosition {
private final int x;
private final int y;
private final int zoom;
- TilePosition(int x, int y, int zoom) {
+
+ public TilePosition(int x, int y, int zoom) {
this.x = x;
this.y = y;
this.zoom = zoom;
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/TileRange.java b/src/org/openstreetmap/josm/gui/layer/imagery/TileRange.java
deleted file mode 100644
index 6fbe067..0000000
--- a/src/org/openstreetmap/josm/gui/layer/imagery/TileRange.java
+++ /dev/null
@@ -1,58 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui.layer.imagery;
-
-import java.util.function.Function;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
-
-import org.openstreetmap.gui.jmapviewer.TileXY;
-
-/**
- * This is a rectangular range of tiles.
- */
-public class TileRange {
- protected int minX;
- protected int maxX;
- protected int minY;
- protected int maxY;
- protected int zoom;
-
- protected TileRange() {
- }
-
- protected TileRange(TileXY t1, TileXY t2, int zoom) {
- minX = (int) Math.floor(Math.min(t1.getX(), t2.getX()));
- minY = (int) Math.floor(Math.min(t1.getY(), t2.getY()));
- maxX = (int) Math.ceil(Math.max(t1.getX(), t2.getX()));
- maxY = (int) Math.ceil(Math.max(t1.getY(), t2.getY()));
- this.zoom = zoom;
- }
-
- protected double tilesSpanned() {
- return Math.sqrt(1.0 * this.size());
- }
-
- /**
- * Returns size
- * @return size
- */
- public int size() {
- int xSpan = maxX - minX + 1;
- int ySpan = maxY - minY + 1;
- return xSpan * ySpan;
- }
-
- /**
- * Gets a stream of all tile positions in this set
- * @return A stream of all positions
- */
- public Stream<TilePosition> tilePositions() {
- if (zoom == 0) {
- return Stream.empty();
- } else {
- return IntStream.rangeClosed(minX, maxX).mapToObj(
- x -> IntStream.rangeClosed(minY, maxY).mapToObj(y -> new TilePosition(x, y, zoom))
- ).flatMap(Function.identity());
- }
- }
-}
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java b/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java
index 435840c..5690afe 100644
--- a/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/TileSourceDisplaySettings.java
@@ -294,18 +294,12 @@ public class TileSourceDisplaySettings {
public boolean equals(Object obj) {
if (this == obj)
return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
+ if (obj == null || getClass() != obj.getClass())
return false;
TileSourceDisplaySettings other = (TileSourceDisplaySettings) obj;
- if (autoLoad != other.autoLoad)
- return false;
- if (autoZoom != other.autoZoom)
- return false;
- if (showErrors != other.showErrors)
- return false;
- return true;
+ return autoLoad == other.autoLoad
+ && autoZoom == other.autoZoom
+ && showErrors == other.showErrors;
}
@Override
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/ZoomToBestAction.java b/src/org/openstreetmap/josm/gui/layer/imagery/ZoomToBestAction.java
new file mode 100644
index 0000000..3c56643
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/ZoomToBestAction.java
@@ -0,0 +1,34 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.imagery;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
+
+/**
+ * Change resolution to best zoom level.
+ * @since 11950 (extracted from {@link AbstractTileSourceLayer})
+ */
+public class ZoomToBestAction extends AbstractAction {
+
+ private final AbstractTileSourceLayer<?> layer;
+
+ /**
+ * Constructs a new {@code ZoomToBestAction}.
+ * @param layer imagery layer
+ */
+ public ZoomToBestAction(AbstractTileSourceLayer<?> layer) {
+ super(tr("Change resolution"));
+ this.layer = layer;
+ setEnabled(!layer.getDisplaySettings().isAutoZoom() && layer.getBestZoom() != layer.currentZoomLevel);
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent ae) {
+ layer.setZoomLevel(layer.getBestZoom());
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/imagery/ZoomToNativeLevelAction.java b/src/org/openstreetmap/josm/gui/layer/imagery/ZoomToNativeLevelAction.java
new file mode 100644
index 0000000..a7412e8
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/imagery/ZoomToNativeLevelAction.java
@@ -0,0 +1,36 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.imagery;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+
+import javax.swing.AbstractAction;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.layer.AbstractTileSourceLayer;
+
+/**
+ * Change resolution to native zoom level.
+ * @since 11950 (extracted from {@link AbstractTileSourceLayer})
+ */
+public class ZoomToNativeLevelAction extends AbstractAction {
+
+ private final AbstractTileSourceLayer<?> layer;
+
+ /**
+ * Constructs a new {@code ZoomToNativeLevelAction}.
+ * @param layer imagery layer
+ */
+ public ZoomToNativeLevelAction(AbstractTileSourceLayer<?> layer) {
+ super(tr("Zoom to native resolution"));
+ this.layer = layer;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent ae) {
+ double newFactor = Math.sqrt(layer.getScaleFactor(layer.currentZoomLevel));
+ Main.map.mapView.zoomToFactor(newFactor);
+ layer.invalidate();
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/DefaultMarkerProducers.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/DefaultMarkerProducers.java
new file mode 100644
index 0000000..5947959
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/DefaultMarkerProducers.java
@@ -0,0 +1,79 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.markerlayer;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Optional;
+
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.gpx.Extensions;
+import org.openstreetmap.josm.data.gpx.GpxConstants;
+import org.openstreetmap.josm.data.gpx.GpxLink;
+import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.tools.Utils;
+
+/**
+ * Marker specifying the default behaviour.
+ * @since 11892 (extracted from Marker)
+ */
+public final class DefaultMarkerProducers implements MarkerProducers {
+
+ @Override
+ public Collection<Marker> createMarkers(WayPoint wpt, File relativePath, MarkerLayer parentLayer, double time,
+ double offset) {
+ String uri = null;
+ // cheapest way to check whether "link" object exists and is a non-empty collection of GpxLink objects...
+ Collection<GpxLink> links = wpt.<GpxLink>getCollection(GpxConstants.META_LINKS);
+ if (links != null) {
+ for (GpxLink oneLink : links) {
+ uri = oneLink.uri;
+ break;
+ }
+ }
+
+ URL url = uriToUrl(uri, relativePath);
+ String urlStr = url == null ? "" : url.toString();
+ String symbolName = Optional.ofNullable(wpt.getString("symbol"))
+ .orElseGet(() -> wpt.getString(GpxConstants.PT_SYM));
+ // text marker is returned in every case, see #10208
+ final Marker marker = new Marker(wpt.getCoor(), wpt, symbolName, parentLayer, time, offset);
+ if (url == null) {
+ return Collections.singleton(marker);
+ } else if (urlStr.endsWith(".wav")) {
+ final AudioMarker audioMarker = new AudioMarker(wpt.getCoor(), wpt, url, parentLayer, time, offset);
+ Extensions exts = (Extensions) wpt.get(GpxConstants.META_EXTENSIONS);
+ if (exts != null && exts.containsKey("offset")) {
+ try {
+ audioMarker.syncOffset = Double.parseDouble(exts.get("sync-offset"));
+ } catch (NumberFormatException nfe) {
+ Main.warn(nfe);
+ }
+ }
+ return Arrays.asList(marker, audioMarker);
+ } else if (urlStr.endsWith(".png") || urlStr.endsWith(".jpg") || urlStr.endsWith(".jpeg")
+ || urlStr.endsWith(".gif")) {
+ return Arrays.asList(marker, new ImageMarker(wpt.getCoor(), url, parentLayer, time, offset));
+ } else {
+ return Arrays.asList(marker, new WebMarker(wpt.getCoor(), url, parentLayer, time, offset));
+ }
+ }
+
+ private static URL uriToUrl(String uri, File relativePath) {
+ URL url = null;
+ if (uri != null) {
+ try {
+ url = new URL(uri);
+ } catch (MalformedURLException e) {
+ // Try a relative file:// url, if the link is not in an URL-compatible form
+ if (relativePath != null) {
+ url = Utils.fileToURL(new File(relativePath.getParentFile(), uri));
+ }
+ }
+ }
+ return url;
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
index 452a5d3..f96c76b 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/Marker.java
@@ -9,20 +9,15 @@ import java.awt.Point;
import java.awt.event.ActionEvent;
import java.awt.image.BufferedImage;
import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Optional;
import java.util.TimeZone;
import javax.swing.ImageIcon;
@@ -33,15 +28,12 @@ import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
import org.openstreetmap.josm.data.coor.CachedLatLon;
import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.gpx.Extensions;
import org.openstreetmap.josm.data.gpx.GpxConstants;
-import org.openstreetmap.josm.data.gpx.GpxLink;
import org.openstreetmap.josm.data.gpx.WayPoint;
import org.openstreetmap.josm.data.preferences.CachedProperty;
import org.openstreetmap.josm.data.preferences.IntegerProperty;
import org.openstreetmap.josm.gui.MapView;
import org.openstreetmap.josm.tools.ImageProvider;
-import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.template_engine.ParseError;
import org.openstreetmap.josm.tools.template_engine.TemplateEngineDataProvider;
import org.openstreetmap.josm.tools.template_engine.TemplateEntry;
@@ -177,63 +169,31 @@ public class Marker implements TemplateEngineDataProvider {
/**
* Plugins can add their Marker creation stuff at the bottom or top of this list
- * (depending on whether they want to override default behaviour or just add new
- * stuff).
+ * (depending on whether they want to override default behaviour or just add new stuff).
*/
- public static final List<MarkerProducers> markerProducers = new LinkedList<>();
+ private static final List<MarkerProducers> markerProducers = new LinkedList<>();
// Add one Marker specifying the default behaviour.
static {
- Marker.markerProducers.add((wpt, relativePath, parentLayer, time, offset) -> {
- String uri = null;
- // cheapest way to check whether "link" object exists and is a non-empty collection of GpxLink objects...
- Collection<GpxLink> links = wpt.<GpxLink>getCollection(GpxConstants.META_LINKS);
- if (links != null) {
- for (GpxLink oneLink : links) {
- uri = oneLink.uri;
- break;
- }
- }
+ Marker.markerProducers.add(new DefaultMarkerProducers());
+ }
- URL url = uriToUrl(uri, relativePath);
- String urlStr = url == null ? "" : url.toString();
- String symbolName = Optional.ofNullable(wpt.getString("symbol")).orElseGet(() -> wpt.getString(GpxConstants.PT_SYM));
- // text marker is returned in every case, see #10208
- final Marker marker = new Marker(wpt.getCoor(), wpt, symbolName, parentLayer, time, offset);
- if (url == null) {
- return Collections.singleton(marker);
- } else if (urlStr.endsWith(".wav")) {
- final AudioMarker audioMarker = new AudioMarker(wpt.getCoor(), wpt, url, parentLayer, time, offset);
- Extensions exts = (Extensions) wpt.get(GpxConstants.META_EXTENSIONS);
- if (exts != null && exts.containsKey("offset")) {
- try {
- audioMarker.syncOffset = Double.parseDouble(exts.get("sync-offset"));
- } catch (NumberFormatException nfe) {
- Main.warn(nfe);
- }
- }
- return Arrays.asList(marker, audioMarker);
- } else if (urlStr.endsWith(".png") || urlStr.endsWith(".jpg") || urlStr.endsWith(".jpeg") || urlStr.endsWith(".gif")) {
- return Arrays.asList(marker, new ImageMarker(wpt.getCoor(), url, parentLayer, time, offset));
- } else {
- return Arrays.asList(marker, new WebMarker(wpt.getCoor(), url, parentLayer, time, offset));
- }
- });
+ /**
+ * Add a new marker producers at the end of the JOSM list.
+ * @param mp a new marker producers
+ * @since 11850
+ */
+ public static void appendMarkerProducer(MarkerProducers mp) {
+ markerProducers.add(mp);
}
- private static URL uriToUrl(String uri, File relativePath) {
- URL url = null;
- if (uri != null) {
- try {
- url = new URL(uri);
- } catch (MalformedURLException e) {
- // Try a relative file:// url, if the link is not in an URL-compatible form
- if (relativePath != null) {
- url = Utils.fileToURL(new File(relativePath.getParentFile(), uri));
- }
- }
- }
- return url;
+ /**
+ * Add a new marker producers at the beginning of the JOSM list.
+ * @param mp a new marker producers
+ * @since 11850
+ */
+ public static void prependMarkerProducer(MarkerProducers mp) {
+ markerProducers.add(0, mp);
}
/**
diff --git a/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java b/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
index 846a674..ade725c 100644
--- a/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
+++ b/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
@@ -50,6 +50,7 @@ import org.openstreetmap.josm.gui.layer.Layer;
import org.openstreetmap.josm.gui.layer.gpx.ConvertToDataLayerAction;
import org.openstreetmap.josm.tools.AudioPlayer;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
/**
* A layer holding markers.
@@ -140,41 +141,7 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
@Override
public LayerPainter attachToMapView(MapViewEvent event) {
- event.getMapView().addMouseListener(new MouseAdapter() {
- @Override
- public void mousePressed(MouseEvent e) {
- if (e.getButton() != MouseEvent.BUTTON1)
- return;
- boolean mousePressedInButton = false;
- for (Marker mkr : data) {
- if (mkr.containsPoint(e.getPoint())) {
- mousePressedInButton = true;
- break;
- }
- }
- if (!mousePressedInButton)
- return;
- mousePressed = true;
- if (isVisible()) {
- invalidate();
- }
- }
-
- @Override
- public void mouseReleased(MouseEvent ev) {
- if (ev.getButton() != MouseEvent.BUTTON1 || !mousePressed)
- return;
- mousePressed = false;
- if (!isVisible())
- return;
- for (Marker mkr : data) {
- if (mkr.containsPoint(ev.getPoint())) {
- mkr.actionPerformed(new ActionEvent(this, 0, null));
- }
- }
- invalidate();
- }
- });
+ event.getMapView().addMouseListener(new MarkerMouseAdapter());
if (event.getMapView().playHeadMarker == null) {
event.getMapView().playHeadMarker = PlayHeadMarker.create();
@@ -246,7 +213,8 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
}
@Override public Object getInfoComponent() {
- return "<html>"+trn("{0} consists of {1} marker", "{0} consists of {1} markers", data.size(), getName(), data.size()) + "</html>";
+ return "<html>"+trn("{0} consists of {1} marker", "{0} consists of {1} markers",
+ data.size(), Utils.escapeReservedCharactersHTML(getName()), data.size()) + "</html>";
}
@Override public Action[] getMenuEntries() {
@@ -472,6 +440,42 @@ public class MarkerLayer extends Layer implements JumpToMarkerLayer {
return "show".equalsIgnoreCase(current);
}
+ private final class MarkerMouseAdapter extends MouseAdapter {
+ @Override
+ public void mousePressed(MouseEvent e) {
+ if (e.getButton() != MouseEvent.BUTTON1)
+ return;
+ boolean mousePressedInButton = false;
+ for (Marker mkr : data) {
+ if (mkr.containsPoint(e.getPoint())) {
+ mousePressedInButton = true;
+ break;
+ }
+ }
+ if (!mousePressedInButton)
+ return;
+ mousePressed = true;
+ if (isVisible()) {
+ invalidate();
+ }
+ }
+
+ @Override
+ public void mouseReleased(MouseEvent ev) {
+ if (ev.getButton() != MouseEvent.BUTTON1 || !mousePressed)
+ return;
+ mousePressed = false;
+ if (!isVisible())
+ return;
+ for (Marker mkr : data) {
+ if (mkr.containsPoint(ev.getPoint())) {
+ mkr.actionPerformed(new ActionEvent(this, 0, null));
+ }
+ }
+ invalidate();
+ }
+ }
+
public static final class ShowHideMarkerText extends AbstractAction implements LayerAction {
private final transient MarkerLayer layer;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java b/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
index 0f4a469..53c0075 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
@@ -183,10 +183,6 @@ public class ElemStyles implements PreferenceChangedListener {
*
* This method does multipolygon handling.
*
- * There are different tagging styles for multipolygons, that have to be respected:
- * - tags on the relation
- * - tags on the outer way (deprecated)
- *
* If the primitive is a way, look for multipolygon parents. In case it
* is indeed member of some multipolygon as role "outer", all area styles
* are removed. (They apply to the multipolygon area.)
@@ -216,6 +212,7 @@ public class ElemStyles implements PreferenceChangedListener {
boolean isOuterWayOfSomeMP = false;
Color wayColor = null;
+ // FIXME: Maybe in the future outer way styles apply to outers ignoring the multipolygon?
for (OsmPrimitive referrer : osm.getReferrers()) {
Relation r = (Relation) referrer;
if (!drawMultipolygon || !r.isMultipolygon() || !r.isUsable()) {
@@ -319,22 +316,7 @@ 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()
- && !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((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;
- }
- }
- }
- return p;
+ return generateStyles(osm, scale, true);
}
return null;
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java
index 69c2c86..aa34d2c 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java
@@ -624,9 +624,7 @@ public final class ConditionFactory {
static boolean closed(Environment e) { // NO_UCD (unused code)
if (e.osm instanceof Way && ((Way) e.osm).isClosed())
return true;
- if (e.osm instanceof Relation && ((Relation) e.osm).isMultipolygon())
- return true;
- return false;
+ return e.osm instanceof Relation && ((Relation) e.osm).isMultipolygon();
}
/**
@@ -696,7 +694,7 @@ public final class ConditionFactory {
* @return {@code true} if the object is a unconnected node
*/
static boolean unconnected(Environment e) { // NO_UCD (unused code)
- return e.osm instanceof Node && OsmPrimitive.getFilteredList(e.osm.getReferrers(), Way.class).isEmpty();
+ return e.osm instanceof Node && ((Node) e.osm).getParentWays().isEmpty();
}
/**
diff --git a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
index 87457cb..9a37c94 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java
@@ -611,7 +611,6 @@ public class MapCSSStyleSource extends StyleSource {
@Override
public void apply(MultiCascade mc, OsmPrimitive osm, double scale, boolean pretendWayIsClosed) {
- Environment env = new Environment(osm, mc, null, this);
MapCSSRuleIndex matchingRuleIndex;
if (osm instanceof Node) {
matchingRuleIndex = nodeRules;
@@ -633,6 +632,7 @@ public class MapCSSStyleSource extends StyleSource {
throw new IllegalArgumentException("Unsupported type: " + osm);
}
+ Environment env = new Environment(osm, mc, null, this);
// the declaration indices are sorted, so it suffices to save the last used index
int lastDeclUsed = -1;
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java
index 97708a5..8727479 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/NodeElement.java
@@ -78,21 +78,19 @@ public class NodeElement extends StyleElement {
}
private static NodeElement create(Environment env, float defaultMajorZindex, boolean allowDefault) {
- Cascade c = env.mc.getCascade(env.layer);
-
MapImage mapImage = createIcon(env);
Symbol symbol = null;
if (mapImage == null) {
symbol = createSymbol(env);
}
- RotationAngle rotationAngle = createRotationAngle(env);
-
// optimization: if we neither have a symbol, nor a mapImage
// we don't have to check for the remaining style properties and we don't
// have to allocate a node element style.
if (!allowDefault && symbol == null && mapImage == null) return null;
+ Cascade c = env.mc.getCascade(env.layer);
+ RotationAngle rotationAngle = createRotationAngle(env);
return new NodeElement(c, mapImage, symbol, defaultMajorZindex, rotationAngle);
}
diff --git a/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextElement.java b/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextElement.java
index 9987940..ffea73b 100644
--- a/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextElement.java
+++ b/src/org/openstreetmap/josm/gui/mappaint/styleelement/TextElement.java
@@ -32,11 +32,10 @@ public class TextElement extends StyleElement {
* @return The text element or <code>null</code> if it could not be created.
*/
public static TextElement create(final Environment env) {
- final Cascade c = env.mc.getCascade(env.layer);
-
TextLabel text = TextLabel.create(env, PaintColors.TEXT.get(), false);
if (text == null)
return null;
+ final Cascade c = env.mc.getCascade(env.layer);
return new TextElement(c, text);
}
diff --git a/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
index 6cd8254..f4c5462 100644
--- a/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
+++ b/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
@@ -49,6 +49,7 @@ import org.openstreetmap.josm.io.auth.CredentialsAgent;
import org.openstreetmap.josm.io.auth.CredentialsAgentException;
import org.openstreetmap.josm.io.auth.CredentialsManager;
import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Utils;
import org.xml.sax.SAXException;
/**
@@ -455,7 +456,7 @@ public class FullyAutomaticAuthorizationUI extends AbstractAuthorizationUI {
+ "Please check username and password and try again."
+"</html>",
loginUrl,
- getOsmUserName()),
+ Utils.escapeReservedCharactersHTML(getOsmUserName())),
tr("OAuth authorization failed"),
JOptionPane.ERROR_MESSAGE,
HelpUtil.ht("/Dialog/OAuthAuthorisationWizard#FullyAutomaticProcessFailed")
diff --git a/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java b/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java
index 18b1e3a..09acd49 100644
--- a/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java
+++ b/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java
@@ -146,7 +146,7 @@ public class TestAccessTokenTask extends PleaseWaitRunnable {
+ "</html>",
token.getKey(),
apiUrl,
- userInfo.getDisplayName(),
+ Utils.escapeReservedCharactersHTML(userInfo.getDisplayName()),
userInfo.getId()
),
tr("Success"),
diff --git a/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java b/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
index 94e44e9..2677b5d 100644
--- a/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
+++ b/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java
@@ -461,13 +461,14 @@ public final class PreferenceTabbedPane extends JTabbedPane implements MouseWhee
}
}
- private void insertGUITabsForSetting(Icon icon, TabPreferenceSetting tps, int index) {
+ private int insertGUITabsForSetting(Icon icon, TabPreferenceSetting tps, int index) {
int position = index;
for (PreferenceTab tab : tabs) {
if (tab.getTabPreferenceSetting().equals(tps)) {
insertTab(null, icon, tab.getComponent(), tps.getTooltip(), position++);
}
}
+ return position - 1;
}
private void addGUITabs(boolean clear) {
@@ -594,8 +595,9 @@ public final class PreferenceTabbedPane extends JTabbedPane implements MouseWhee
}
Icon icon = getIconAt(index);
remove(index);
- insertGUITabsForSetting(icon, preferenceSettings, index);
- setSelectedIndex(index);
+ if (index <= insertGUITabsForSetting(icon, preferenceSettings, index)) {
+ setSelectedIndex(index);
+ }
} catch (SecurityException ex) {
Main.error(ex);
} catch (RuntimeException ex) { // NOPMD
diff --git a/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java b/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
index 2395d93..7caf949 100644
--- a/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
+++ b/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java
@@ -825,7 +825,7 @@ public abstract class SourceEditor extends JPanel {
}
private static void appendRow(StringBuilder s, String th, String td) {
- s.append("<tr><th>").append(th).append("</th><td>").append(td).append("</td</tr>");
+ s.append("<tr><th>").append(th).append("</th><td>").append(Utils.escapeReservedCharactersHTML(td)).append("</td</tr>");
}
/**
@@ -1620,7 +1620,7 @@ public abstract class SourceEditor extends JPanel {
return null;
StringBuilder s = new StringBuilder(128).append("<html><b>");
if (entry.title != null) {
- s.append(entry.title).append("</b> <span color=\"gray\">");
+ s.append(Utils.escapeReservedCharactersHTML(entry.title)).append("</b> <span color=\"gray\">");
}
s.append(entry.url);
if (entry.title != null) {
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java b/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java
index f30f46d..90ae2c2 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/CommonSettingsPanel.java
@@ -117,8 +117,10 @@ public class CommonSettingsPanel extends JPanel {
File directory = new File(path);
File[] cacheFiles = directory.listFiles((FilenameFilter) (dir, name) -> name.endsWith(".data") || name.endsWith(".key"));
JCSCacheManager.shutdown(); // shutdown Cache - so files can by safely deleted
- for (File cacheFile: cacheFiles) {
- Utils.deleteFile(cacheFile);
+ if (cacheFiles != null) {
+ for (File cacheFile: cacheFiles) {
+ Utils.deleteFile(cacheFile);
+ }
}
}
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java b/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
index 3f946e5..8c97d2d 100644
--- a/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java
@@ -38,6 +38,7 @@ import javax.swing.JTabbedPane;
import javax.swing.JTable;
import javax.swing.JToolBar;
import javax.swing.UIManager;
+import javax.swing.event.HyperlinkEvent.EventType;
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.table.DefaultTableCellRenderer;
@@ -64,10 +65,12 @@ import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
import org.openstreetmap.josm.gui.preferences.PreferenceTabbedPane;
import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.HtmlPanel;
import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.LanguageInfo;
+import org.openstreetmap.josm.tools.OpenBrowser;
/**
* Imagery preferences, including imagery providers, settings and offsets.
@@ -362,6 +365,15 @@ public final class ImageryPreference extends DefaultTabPreferenceSetting {
defaultToolbar.add(new ReloadAction());
add(defaultToolbar, GBC.eol().anchor(GBC.SOUTH).insets(0, 0, 5, 0));
+ HtmlPanel help = new HtmlPanel(tr("New default entries can be added in the <a href=\"{0}\">Wiki</a>.",
+ Main.getJOSMWebsite()+"/wiki/Maps"));
+ help.getEditorPane().addHyperlinkListener(e -> {
+ if (e.getEventType() == EventType.ACTIVATED) {
+ OpenBrowser.displayUrl(e.getURL().toString());
+ }
+ });
+ add(help, GBC.eol().insets(10, 0, 0, 10).fill(GBC.HORIZONTAL));
+
ActivateAction activate = new ActivateAction();
defaultTable.getSelectionModel().addListSelectionListener(activate);
JButton btnActivate = new JButton(activate);
diff --git a/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java b/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
index e91bcd6..5ede4d1 100644
--- a/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
+++ b/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java
@@ -34,6 +34,7 @@ import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
import org.openstreetmap.josm.gui.tagging.presets.TaggingPresetReader;
import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Utils;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -88,22 +89,22 @@ public final class TaggingPresetPreference implements SubPreferenceSetting {
if (canLoad) {
errorMessage = tr("<html>Tagging preset source {0} can be loaded but it contains errors. " +
"Do you really want to use it?<br><br><table width=600>Error is: [{1}:{2}] {3}</table></html>",
- source, e.getLineNumber(), e.getColumnNumber(), e.getMessage());
+ source, e.getLineNumber(), e.getColumnNumber(), Utils.escapeReservedCharactersHTML(e.getMessage()));
} else {
errorMessage = tr("<html>Unable to parse tagging preset source: {0}. " +
"Do you really want to use it?<br><br><table width=400>Error is: [{1}:{2}] {3}</table></html>",
- source, e.getLineNumber(), e.getColumnNumber(), e.getMessage());
+ source, e.getLineNumber(), e.getColumnNumber(), Utils.escapeReservedCharactersHTML(e.getMessage()));
}
Main.warn(e, errorMessage);
} catch (SAXException e) {
if (canLoad) {
errorMessage = tr("<html>Tagging preset source {0} can be loaded but it contains errors. " +
"Do you really want to use it?<br><br><table width=600>Error is: {1}</table></html>",
- source, e.getMessage());
+ source, Utils.escapeReservedCharactersHTML(e.getMessage()));
} else {
errorMessage = tr("<html>Unable to parse tagging preset source: {0}. " +
"Do you really want to use it?<br><br><table width=600>Error is: {1}</table></html>",
- source, e.getMessage());
+ source, Utils.escapeReservedCharactersHTML(e.getMessage()));
}
Main.warn(e, errorMessage);
}
diff --git a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginCheckBox.java b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginCheckBox.java
index 6cb3f41..9efa9fe 100644
--- a/src/org/openstreetmap/josm/gui/preferences/plugin/PluginCheckBox.java
+++ b/src/org/openstreetmap/josm/gui/preferences/plugin/PluginCheckBox.java
@@ -87,7 +87,7 @@ public class PluginCheckBox extends JCheckBox implements ActionListener {
.append(trn("Plugin {0} is still required by this plugin:",
"Plugin {0} is still required by these {1} plugins:",
otherPlugins.size(),
- plugin,
+ Utils.escapeReservedCharactersHTML(plugin),
otherPlugins.size()))
.append(Utils.joinAsHtmlUnorderedList(otherPlugins))
.append("</html>");
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java
index ea59de8..cef4ed9 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReader.java
@@ -42,6 +42,7 @@ import org.openstreetmap.josm.gui.tagging.presets.items.Space;
import org.openstreetmap.josm.gui.tagging.presets.items.Text;
import org.openstreetmap.josm.io.CachedFile;
import org.openstreetmap.josm.io.UTFInputStreamReader;
+import org.openstreetmap.josm.tools.Utils;
import org.openstreetmap.josm.tools.XmlObjectParser;
import org.xml.sax.SAXException;
@@ -376,7 +377,8 @@ public final class TaggingPresetReader {
Main.error(source);
JOptionPane.showMessageDialog(
Main.parent,
- "<html>" + tr("Error parsing {0}: ", source) + "<br><br><table width=600>" + e.getMessage() + "</table></html>",
+ "<html>" + tr("Error parsing {0}: ", source) + "<br><br><table width=600>" +
+ Utils.escapeReservedCharactersHTML(e.getMessage()) + "</table></html>",
tr("Error"),
JOptionPane.ERROR_MESSAGE
);
diff --git a/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java b/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java
index a9cddc2..a91e9c6 100644
--- a/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java
+++ b/src/org/openstreetmap/josm/gui/tagging/presets/items/Roles.java
@@ -28,6 +28,8 @@ public class Roles extends TaggingPresetItem {
public Set<TaggingPresetType> types; // NOSONAR
/** Role name used in a relation */
public String key; // NOSONAR
+ /** Is the role name a regular expression */
+ public boolean regexp; // NOSONAR
/** The text to display */
public String text; // NOSONAR
/** The context used for translating {@link #text} */
@@ -36,8 +38,9 @@ public class Roles extends TaggingPresetItem {
public String locale_text; // NOSONAR
/** An expression (cf. search dialog) for objects of this role */
public SearchCompiler.Match memberExpression; // NOSONAR
-
+ /** Is this role required at least once in the relation? */
public boolean required; // NOSONAR
+ /** How often must the element appear */
private long count;
public void setType(String types) throws SAXException {
@@ -51,6 +54,13 @@ public class Roles extends TaggingPresetItem {
throw new SAXException(tr("Unknown requisite: {0}", str));
}
+ public void setRegexp(String str) throws SAXException {
+ if ("true".equals(str)) {
+ regexp = true;
+ } else if (!"false".equals(str))
+ throw new SAXException(tr("Unknown regexp value: {0}", str));
+ }
+
public void setMember_expression(String memberExpression) throws SAXException {
try {
final SearchAction.SearchSetting searchSetting = new SearchAction.SearchSetting();
@@ -84,6 +94,20 @@ public class Roles extends TaggingPresetItem {
return c != 0 ? c : 1;
}
+ /**
+ * Check if the given role matches this class (required to check regexp role types)
+ * @param role role to check
+ * @return <code>true</code> if role matches
+ * @since 11989
+ */
+ public boolean isRole(String role) {
+ if (regexp && role != null) { // pass null through, it will anyway fail
+
+ return role.matches(this.key);
+ }
+ return this.key.equals(role);
+ }
+
public boolean addToPanel(JPanel p) {
String cstring;
if (count > 0 && !required) {
diff --git a/src/org/openstreetmap/josm/gui/util/RotationAngle.java b/src/org/openstreetmap/josm/gui/util/RotationAngle.java
index 0419956..01b303b 100644
--- a/src/org/openstreetmap/josm/gui/util/RotationAngle.java
+++ b/src/org/openstreetmap/josm/gui/util/RotationAngle.java
@@ -56,15 +56,8 @@ public interface RotationAngle {
if (this == obj) {
return true;
}
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- return true;
+ return obj != null && getClass() == obj.getClass();
}
-
}
/**
@@ -91,8 +84,7 @@ public interface RotationAngle {
public int hashCode() {
final int prime = 31;
int result = 1;
- long temp;
- temp = Double.doubleToLongBits(angle);
+ long temp = Double.doubleToLongBits(angle);
result = prime * result + (int) (temp ^ (temp >>> 32));
return result;
}
@@ -102,17 +94,11 @@ public interface RotationAngle {
if (this == obj) {
return true;
}
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
+ if (obj == null || getClass() != obj.getClass()) {
return false;
}
StaticRotationAngle other = (StaticRotationAngle) obj;
- if (Double.doubleToLongBits(angle) != Double.doubleToLongBits(other.angle)) {
- return false;
- }
- return true;
+ return Double.doubleToLongBits(angle) == Double.doubleToLongBits(other.angle);
}
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java b/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java
index 616eee5..12d43d6 100644
--- a/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java
+++ b/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java
@@ -151,15 +151,11 @@ public class BoundingBoxSelectionPanel extends JPanel {
@Override
public boolean isValid() {
- double value = 0;
try {
- value = Double.parseDouble(getComponent().getText());
+ return LatLon.isValidLat(Double.parseDouble(getComponent().getText()));
} catch (NumberFormatException ex) {
return false;
}
- if (!LatLon.isValidLat(value))
- return false;
- return true;
}
}
@@ -191,15 +187,11 @@ public class BoundingBoxSelectionPanel extends JPanel {
@Override
public boolean isValid() {
- double value = 0;
try {
- value = Double.parseDouble(getComponent().getText());
+ return LatLon.isValidLon(Double.parseDouble(getComponent().getText()));
} catch (NumberFormatException ex) {
return false;
}
- if (!LatLon.isValidLon(value))
- return false;
- return true;
}
}
diff --git a/src/org/openstreetmap/josm/gui/widgets/DateEditorWithSlider.java b/src/org/openstreetmap/josm/gui/widgets/DateEditorWithSlider.java
index 6295e4e..6ea13b4 100644
--- a/src/org/openstreetmap/josm/gui/widgets/DateEditorWithSlider.java
+++ b/src/org/openstreetmap/josm/gui/widgets/DateEditorWithSlider.java
@@ -90,16 +90,16 @@ public class DateEditorWithSlider extends JPanel {
}
public void setRange(Date dateMin, Date dateMax) {
- this.dateMin = dateMin;
- this.dateMax = dateMax;
+ this.dateMin = DateUtils.cloneDate(dateMin);
+ this.dateMax = DateUtils.cloneDate(dateMax);
}
public void setDate(Date date) {
- spinner.setValue(date);
+ spinner.setValue(DateUtils.cloneDate(date));
}
public Date getDate() {
- return (Date) spinner.getValue();
+ return DateUtils.cloneDate((Date) spinner.getValue());
}
public void addDateListener(ChangeListener l) {
diff --git a/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java b/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
index a811364..4e7a7c3 100644
--- a/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
+++ b/src/org/openstreetmap/josm/gui/widgets/MultiSplitLayout.java
@@ -654,30 +654,29 @@ public class MultiSplitLayout implements LayoutManager {
double y = bounds.getY();
while (splitChildren.hasNext()) {
Node splitChild = splitChildren.next();
- Divider dividerChild =
- splitChildren.hasNext() ? (Divider) splitChildren.next() : null;
-
- double childHeight;
- if (getFloatingDividers()) {
- childHeight = preferredNodeSize(splitChild).getHeight();
+ Node nodeChild = splitChildren.hasNext() ? splitChildren.next() : null;
+ Divider dividerChild = nodeChild instanceof Divider ? (Divider) nodeChild : null;
+ double childHeight;
+ if (getFloatingDividers()) {
+ childHeight = preferredNodeSize(splitChild).getHeight();
+ } else {
+ if (dividerChild != null) {
+ childHeight = dividerChild.getBounds().getY() - y;
} else {
- if (dividerChild != null) {
- childHeight = dividerChild.getBounds().getY() - y;
- } else {
- childHeight = split.getBounds().getMaxY() - y;
- }
+ childHeight = split.getBounds().getMaxY() - y;
}
- childBounds = boundsWithYandHeight(bounds, y, childHeight);
- layout1(splitChild, childBounds);
+ }
+ childBounds = boundsWithYandHeight(bounds, y, childHeight);
+ layout1(splitChild, childBounds);
- if (getFloatingDividers() && (dividerChild != null)) {
- double dividerY = childBounds.getMaxY();
- Rectangle dividerBounds = boundsWithYandHeight(bounds, dividerY, dividerSize);
- dividerChild.setBounds(dividerBounds);
- }
- if (dividerChild != null) {
- y = dividerChild.getBounds().getMaxY();
- }
+ if (getFloatingDividers() && (dividerChild != null)) {
+ double dividerY = childBounds.getMaxY();
+ Rectangle dividerBounds = boundsWithYandHeight(bounds, dividerY, dividerSize);
+ dividerChild.setBounds(dividerBounds);
+ }
+ if (dividerChild != null) {
+ y = dividerChild.getBounds().getMaxY();
+ }
}
}
/* The bounds of the Split node root are set to be just
@@ -830,12 +829,19 @@ public class MultiSplitLayout implements LayoutManager {
/**
* Base class for the nodes that model a MultiSplitLayout.
*/
- public abstract static class Node {
+ public static class Node {
private Split parent;
private Rectangle bounds = new Rectangle();
private double weight;
/**
+ * Constructs a new {@code Node}.
+ */
+ protected Node() {
+ // Default constructor for subclasses only
+ }
+
+ /**
* Returns the Split parent of this Node, or null.
*
* This method isn't called getParent(), in order to avoid problems
diff --git a/src/org/openstreetmap/josm/gui/widgets/ScrollableTable.java b/src/org/openstreetmap/josm/gui/widgets/ScrollableTable.java
new file mode 100644
index 0000000..aaa140e
--- /dev/null
+++ b/src/org/openstreetmap/josm/gui/widgets/ScrollableTable.java
@@ -0,0 +1,46 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.widgets;
+
+import java.awt.Container;
+import java.awt.Point;
+import java.awt.Rectangle;
+
+import javax.swing.JTable;
+import javax.swing.JViewport;
+import javax.swing.table.TableModel;
+
+/**
+ * Table offering easier scroll to a given row/column.
+ * @since 11881
+ */
+public class ScrollableTable extends JTable {
+
+ /**
+ * Constructs a <code>ScrollableTable</code> that is initialized with
+ * <code>dm</code> as the data model, a default column model,
+ * and a default selection model.
+ *
+ * @param dm the data model for the table
+ * @see #createDefaultColumnModel
+ * @see #createDefaultSelectionModel
+ */
+ public ScrollableTable(TableModel dm) {
+ super(dm);
+ }
+
+ /**
+ * Scrolls this table to make sure the (row,col) is visible.
+ * @param row row index
+ * @param col column index
+ */
+ public void scrollToVisible(int row, int col) {
+ Container parent = getParent();
+ if (parent instanceof JViewport) {
+ JViewport viewport = (JViewport) parent;
+ Rectangle rect = getCellRect(row, col, true);
+ Point pt = viewport.getViewPosition();
+ rect.setLocation(rect.x - pt.x, rect.y - pt.y);
+ viewport.scrollRectToVisible(rect);
+ }
+ }
+}
diff --git a/src/org/openstreetmap/josm/gui/widgets/VerticallyScrollablePanel.java b/src/org/openstreetmap/josm/gui/widgets/VerticallyScrollablePanel.java
index f9b05e8..11b6295 100644
--- a/src/org/openstreetmap/josm/gui/widgets/VerticallyScrollablePanel.java
+++ b/src/org/openstreetmap/josm/gui/widgets/VerticallyScrollablePanel.java
@@ -20,14 +20,29 @@ public class VerticallyScrollablePanel extends JPanel implements Scrollable {
super();
}
+ /**
+ * Constructs a new {@code VerticallyScrollablePanel}.
+ * @param isDoubleBuffered a boolean, true for double-buffering, which
+ * uses additional memory space to achieve fast, flicker-free updates
+ */
public VerticallyScrollablePanel(boolean isDoubleBuffered) {
super(isDoubleBuffered);
}
+ /**
+ * Constructs a new {@code VerticallyScrollablePanel}.
+ * @param layout the LayoutManager to use
+ * @param isDoubleBuffered a boolean, true for double-buffering, which
+ * uses additional memory space to achieve fast, flicker-free updates
+ */
public VerticallyScrollablePanel(LayoutManager layout, boolean isDoubleBuffered) {
super(layout, isDoubleBuffered);
}
+ /**
+ * Constructs a new {@code VerticallyScrollablePanel}.
+ * @param layout the LayoutManager to use
+ */
public VerticallyScrollablePanel(LayoutManager layout) {
super(layout);
}
@@ -62,7 +77,7 @@ public class VerticallyScrollablePanel extends JPanel implements Scrollable {
}
@Override
- public int getScrollableUnitIncrement(Rectangle arg0, int arg1, int arg2) {
+ public int getScrollableUnitIncrement(Rectangle visibleRect, int orientation, int direction) {
return 10;
}
}
diff --git a/src/org/openstreetmap/josm/io/AbstractReader.java b/src/org/openstreetmap/josm/io/AbstractReader.java
index 5f73c1a..7cd6dd5 100644
--- a/src/org/openstreetmap/josm/io/AbstractReader.java
+++ b/src/org/openstreetmap/josm/io/AbstractReader.java
@@ -3,6 +3,7 @@ package org.openstreetmap.josm.io;
import static org.openstreetmap.josm.tools.I18n.tr;
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
@@ -22,6 +23,7 @@ import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.RelationMemberData;
import org.openstreetmap.josm.data.osm.SimplePrimitiveId;
import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
/**
* Abstract Reader, allowing other implementations than OsmReader (PbfReader in PBF plugin for example)
@@ -201,4 +203,6 @@ public abstract class AbstractReader {
ds.endUpdate();
}
}
+
+ protected abstract DataSet doParseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException;
}
diff --git a/src/org/openstreetmap/josm/io/CacheCustomContent.java b/src/org/openstreetmap/josm/io/CacheCustomContent.java
index 938c202..ab2939e 100644
--- a/src/org/openstreetmap/josm/io/CacheCustomContent.java
+++ b/src/org/openstreetmap/josm/io/CacheCustomContent.java
@@ -11,6 +11,7 @@ import java.nio.charset.StandardCharsets;
import java.util.concurrent.TimeUnit;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.tools.Utils;
/**
* Use this class if you want to cache and store a single file that gets updated regularly.
@@ -135,7 +136,7 @@ public abstract class CacheCustomContent<T extends Throwable> {
* @return Returns the data
* @throws T if an error occurs
*/
- public byte[] updateForce() throws T {
+ private byte[] updateForce() throws T {
this.data = updateData();
saveToDisk();
Main.pref.putInteger("cache." + ident, (int) (TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis())));
@@ -161,7 +162,7 @@ public abstract class CacheCustomContent<T extends Throwable> {
if (data == null) {
loadFromDisk();
}
- return data;
+ return Utils.copyArray(data);
}
/**
diff --git a/src/org/openstreetmap/josm/io/CachedFile.java b/src/org/openstreetmap/josm/io/CachedFile.java
index 63f251a..176b5dc 100644
--- a/src/org/openstreetmap/josm/io/CachedFile.java
+++ b/src/org/openstreetmap/josm/io/CachedFile.java
@@ -3,7 +3,6 @@ package org.openstreetmap.josm.io;
import static org.openstreetmap.josm.tools.I18n.tr;
-import java.io.BufferedInputStream;
import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
@@ -482,8 +481,8 @@ public class CachedFile implements Closeable {
} else if (con.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) {
throw new IOException(tr("The requested URL {0} was not found", urlStr));
}
- try (InputStream bis = new BufferedInputStream(con.getContent())) {
- Files.copy(bis, destDirFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
+ try (InputStream is = con.getContent()) {
+ Files.copy(is, destDirFile.toPath(), StandardCopyOption.REPLACE_EXISTING);
}
activeConnection = null;
localFile = new File(destDir, localPath);
diff --git a/src/org/openstreetmap/josm/io/CertificateAmendment.java b/src/org/openstreetmap/josm/io/CertificateAmendment.java
index a0a8c30..1454421 100644
--- a/src/org/openstreetmap/josm/io/CertificateAmendment.java
+++ b/src/org/openstreetmap/josm/io/CertificateAmendment.java
@@ -15,6 +15,9 @@ import java.security.InvalidAlgorithmParameterException;
import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
import java.security.cert.CertificateFactory;
import java.security.cert.PKIXParameters;
import java.security.cert.TrustAnchor;
@@ -39,14 +42,53 @@ import org.openstreetmap.josm.tools.Utils;
*/
public final class CertificateAmendment {
- private static final String[] CERT_AMEND = {
- "resource://data/security/DST_Root_CA_X3.pem",
- "resource://data/security/StartCom_Certification_Authority.pem"
+ /**
+ * A certificate amendment.
+ * @since 11943
+ */
+ public static class CertAmend {
+ private final String id;
+ private final String sha256;
+
+ CertAmend(String path, String sha256) {
+ this.id = path;
+ this.sha256 = sha256;
+ }
+
+ /**
+ * Returns the certificate identifier.
+ * @return path for JOSM embedded certificate, alias for platform certificate
+ */
+ public final String getId() {
+ return id;
+ }
+
+ /**
+ * Returns the SHA-256 hash.
+ * @return the SHA-256 hash, in hexadecimal
+ */
+ public final String getSha256() {
+ return sha256;
+ }
+ }
+
+ /**
+ * Certificates embedded in JOSM
+ */
+ private static final CertAmend[] CERT_AMEND = {
+ new CertAmend("resource://data/security/DST_Root_CA_X3.pem",
+ "0687260331a72403d909f105e69bcf0d32e1bd2493ffc6d9206d11bcd6770739")
};
- private static final String[] SHA_HASHES = {
- "0687260331a72403d909f105e69bcf0d32e1bd2493ffc6d9206d11bcd6770739",
- "c766a9bef2d4071c863a31aa4920e813b2d198608cb7b7cfe21143b836df09ea"
+ /**
+ * Certificates looked into platform native keystore and not embedded in JOSM.
+ * Identifiers must match Windows keystore aliases for efficient search.
+ */
+ private static final CertAmend[] PLATFORM_CERT_AMEND = {
+ new CertAmend("Staat der Nederlanden Root CA - G2",
+ "668c83947da63b724bece1743c31a0e6aed0db8ec5b31be377bb784f91b6716f"),
+ new CertAmend("Government of Netherlands G3",
+ "3c4fb0b95ab8b30032f432b86f535fe172c185d0fd39865837cf36187fa6f428")
};
private CertificateAmendment() {
@@ -67,32 +109,30 @@ public final class CertificateAmendment {
keyStore.load(is, "changeit".toCharArray());
}
+ MessageDigest md = MessageDigest.getInstance("SHA-256");
CertificateFactory cf = CertificateFactory.getInstance("X.509");
boolean certificateAdded = false;
- for (int i = 0; i < CERT_AMEND.length; i++) {
- try (CachedFile certCF = new CachedFile(CERT_AMEND[i])) {
- byte[] certBytes = certCF.getByteContent();
- ByteArrayInputStream certIS = new ByteArrayInputStream(certBytes);
- X509Certificate cert = (X509Certificate) cf.generateCertificate(certIS);
- MessageDigest md = MessageDigest.getInstance("SHA-256");
- String sha1 = Utils.toHexString(md.digest(cert.getEncoded()));
- if (!SHA_HASHES[i].equals(sha1)) {
- throw new IllegalStateException(
- tr("Error adding certificate {0} - certificate fingerprint mismatch. Expected {1}, was {2}",
- CERT_AMEND[i],
- SHA_HASHES[i],
- sha1
- ));
+ // Add embedded certificates. Exit in case of error
+ for (CertAmend certAmend : CERT_AMEND) {
+ try (CachedFile certCF = new CachedFile(certAmend.id)) {
+ X509Certificate cert = (X509Certificate) cf.generateCertificate(
+ new ByteArrayInputStream(certCF.getByteContent()));
+ if (checkAndAddCertificate(md, cert, certAmend, keyStore)) {
+ certificateAdded = true;
}
- if (certificateIsMissing(keyStore, cert)) {
- if (Main.isDebugEnabled()) {
- Main.debug(tr("Adding certificate for TLS connections: {0}", cert.getSubjectX500Principal().getName()));
- }
- String alias = "josm:" + new File(CERT_AMEND[i]).getName();
- keyStore.setCertificateEntry(alias, cert);
+ }
+ }
+
+ try {
+ // Try to add platform certificates. Do not exit in case of error (embedded certificates may be OK)
+ for (CertAmend certAmend : PLATFORM_CERT_AMEND) {
+ X509Certificate cert = Main.platform.getX509Certificate(certAmend);
+ if (checkAndAddCertificate(md, cert, certAmend, keyStore)) {
certificateAdded = true;
}
}
+ } catch (KeyStoreException | NoSuchAlgorithmException | CertificateException | IOException | IllegalStateException e) {
+ Main.error(e);
}
if (certificateAdded) {
@@ -104,6 +144,27 @@ public final class CertificateAmendment {
}
}
+ private static boolean checkAndAddCertificate(MessageDigest md, X509Certificate cert, CertAmend certAmend, KeyStore keyStore)
+ throws CertificateEncodingException, KeyStoreException, InvalidAlgorithmParameterException {
+ if (cert != null) {
+ String sha256 = Utils.toHexString(md.digest(cert.getEncoded()));
+ if (!certAmend.sha256.equals(sha256)) {
+ throw new IllegalStateException(
+ tr("Error adding certificate {0} - certificate fingerprint mismatch. Expected {1}, was {2}",
+ certAmend.id, certAmend.sha256, sha256));
+ }
+ if (certificateIsMissing(keyStore, cert)) {
+ if (Main.isDebugEnabled()) {
+ Main.debug(tr("Adding certificate for TLS connections: {0}", cert.getSubjectX500Principal().getName()));
+ }
+ String alias = "josm:" + new File(certAmend.id).getName();
+ keyStore.setCertificateEntry(alias, cert);
+ return true;
+ }
+ }
+ return false;
+ }
+
/**
* Check if the certificate is missing and needs to be added to the keystore.
* @param keyStore the keystore
diff --git a/src/org/openstreetmap/josm/io/ChangesetClosedException.java b/src/org/openstreetmap/josm/io/ChangesetClosedException.java
index 7ab2d3e..a110816 100644
--- a/src/org/openstreetmap/josm/io/ChangesetClosedException.java
+++ b/src/org/openstreetmap/josm/io/ChangesetClosedException.java
@@ -120,7 +120,7 @@ public class ChangesetClosedException extends OsmTransferException {
super("");
this.source = source == null ? Source.UNSPECIFIED : source;
this.changesetId = changesetId;
- this.closedOn = closedOn;
+ this.closedOn = DateUtils.cloneDate(closedOn);
}
/**
@@ -138,7 +138,7 @@ public class ChangesetClosedException extends OsmTransferException {
* @return the date the changeset was closed. May be null if the date isn't known.
*/
public Date getClosedOn() {
- return closedOn;
+ return DateUtils.cloneDate(closedOn);
}
/**
diff --git a/src/org/openstreetmap/josm/io/ChangesetQuery.java b/src/org/openstreetmap/josm/io/ChangesetQuery.java
index 5d943a7..dfcda3a 100644
--- a/src/org/openstreetmap/josm/io/ChangesetQuery.java
+++ b/src/org/openstreetmap/josm/io/ChangesetQuery.java
@@ -183,7 +183,7 @@ public class ChangesetQuery {
*/
public ChangesetQuery closedAfter(Date d) {
CheckParameterUtil.ensureParameterNotNull(d, "d");
- this.closedAfter = d;
+ this.closedAfter = DateUtils.cloneDate(d);
return this;
}
@@ -201,8 +201,8 @@ public class ChangesetQuery {
public ChangesetQuery closedAfterAndCreatedBefore(Date closedAfter, Date createdBefore) {
CheckParameterUtil.ensureParameterNotNull(closedAfter, "closedAfter");
CheckParameterUtil.ensureParameterNotNull(createdBefore, "createdBefore");
- this.closedAfter = closedAfter;
- this.createdBefore = createdBefore;
+ this.closedAfter = DateUtils.cloneDate(closedAfter);
+ this.createdBefore = DateUtils.cloneDate(createdBefore);
return this;
}
diff --git a/src/org/openstreetmap/josm/io/FileImporter.java b/src/org/openstreetmap/josm/io/FileImporter.java
index 08980f4..706db98 100644
--- a/src/org/openstreetmap/josm/io/FileImporter.java
+++ b/src/org/openstreetmap/josm/io/FileImporter.java
@@ -15,6 +15,7 @@ import org.openstreetmap.josm.gui.HelpAwareOptionPane;
import org.openstreetmap.josm.gui.Notification;
import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.tools.Utils;
/**
* Abstract file importer.
@@ -107,7 +108,8 @@ public abstract class FileImporter implements Comparable<FileImporter> {
Main.error(e);
HelpAwareOptionPane.showMessageDialogInEDT(
Main.parent,
- tr("<html>Could not read file ''{0}''.<br>Error is:<br>{1}</html>", f.getName(), e.getMessage()),
+ tr("<html>Could not read file ''{0}''.<br>Error is:<br>{1}</html>",
+ f.getName(), Utils.escapeReservedCharactersHTML(e.getMessage())),
tr("Error"),
JOptionPane.ERROR_MESSAGE, null
);
@@ -137,7 +139,7 @@ public abstract class FileImporter implements Comparable<FileImporter> {
Main.error(e);
HelpAwareOptionPane.showMessageDialogInEDT(
Main.parent,
- tr("<html>Could not read files.<br>Error is:<br>{0}</html>", e.getMessage()),
+ tr("<html>Could not read files.<br>Error is:<br>{0}</html>", Utils.escapeReservedCharactersHTML(e.getMessage())),
tr("Error"),
JOptionPane.ERROR_MESSAGE, null
);
diff --git a/src/org/openstreetmap/josm/io/MessageNotifier.java b/src/org/openstreetmap/josm/io/MessageNotifier.java
index 45e5f42..5189af0 100644
--- a/src/org/openstreetmap/josm/io/MessageNotifier.java
+++ b/src/org/openstreetmap/josm/io/MessageNotifier.java
@@ -56,27 +56,33 @@ public final class MessageNotifier {
private static class Worker implements Runnable {
private int lastUnreadCount;
+ private long lastTimeInMillis;
@Override
public void run() {
try {
- final UserInfo userInfo = new OsmServerUserInfoReader().fetchUserInfo(NullProgressMonitor.INSTANCE,
- tr("get number of unread messages"));
- final int unread = userInfo.getUnreadMessages();
- if (unread > 0 && unread != lastUnreadCount) {
- GuiHelper.runInEDT(() -> {
- JPanel panel = new JPanel(new GridBagLayout());
- panel.add(new JLabel(trn("You have {0} unread message.", "You have {0} unread messages.", unread, unread)),
- GBC.eol());
- panel.add(new UrlLabel(Main.getBaseUserUrl() + '/' + userInfo.getDisplayName() + "/inbox",
- tr("Click here to see your inbox.")), GBC.eol());
- panel.setOpaque(false);
- new Notification().setContent(panel)
- .setIcon(JOptionPane.INFORMATION_MESSAGE)
- .setDuration(Notification.TIME_LONG)
- .show();
- });
- lastUnreadCount = unread;
+ long currentTime = System.currentTimeMillis();
+ // See #14671 - Make sure we don't run the API call many times after system wakeup
+ if (currentTime >= lastTimeInMillis + TimeUnit.MINUTES.toMillis(PROP_INTERVAL.get())) {
+ lastTimeInMillis = currentTime;
+ final UserInfo userInfo = new OsmServerUserInfoReader().fetchUserInfo(NullProgressMonitor.INSTANCE,
+ tr("get number of unread messages"));
+ final int unread = userInfo.getUnreadMessages();
+ if (unread > 0 && unread != lastUnreadCount) {
+ GuiHelper.runInEDT(() -> {
+ JPanel panel = new JPanel(new GridBagLayout());
+ panel.add(new JLabel(trn("You have {0} unread message.", "You have {0} unread messages.", unread, unread)),
+ GBC.eol());
+ panel.add(new UrlLabel(Main.getBaseUserUrl() + '/' + userInfo.getDisplayName() + "/inbox",
+ tr("Click here to see your inbox.")), GBC.eol());
+ panel.setOpaque(false);
+ new Notification().setContent(panel)
+ .setIcon(JOptionPane.INFORMATION_MESSAGE)
+ .setDuration(Notification.TIME_LONG)
+ .show();
+ });
+ lastUnreadCount = unread;
+ }
}
} catch (OsmTransferException e) {
Main.warn(e);
diff --git a/src/org/openstreetmap/josm/io/OsmExporter.java b/src/org/openstreetmap/josm/io/OsmExporter.java
index ee87f4c..6b76585 100644
--- a/src/org/openstreetmap/josm/io/OsmExporter.java
+++ b/src/org/openstreetmap/josm/io/OsmExporter.java
@@ -93,7 +93,8 @@ public class OsmExporter extends FileExporter {
Main.error(e);
JOptionPane.showMessageDialog(
Main.parent,
- tr("<html>An error occurred while saving.<br>Error is:<br>{0}</html>", e.getMessage()),
+ tr("<html>An error occurred while saving.<br>Error is:<br>{0}</html>",
+ Utils.escapeReservedCharactersHTML(e.getMessage())),
tr("Error"),
JOptionPane.ERROR_MESSAGE
);
@@ -107,7 +108,8 @@ public class OsmExporter extends FileExporter {
Main.error(e2);
JOptionPane.showMessageDialog(
Main.parent,
- tr("<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</html>", e2.getMessage()),
+ tr("<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</html>",
+ Utils.escapeReservedCharactersHTML(e2.getMessage())),
tr("Error"),
JOptionPane.ERROR_MESSAGE
);
diff --git a/src/org/openstreetmap/josm/io/OsmReader.java b/src/org/openstreetmap/josm/io/OsmReader.java
index 890b108..355eabd 100644
--- a/src/org/openstreetmap/josm/io/OsmReader.java
+++ b/src/org/openstreetmap/josm/io/OsmReader.java
@@ -584,6 +584,7 @@ public class OsmReader extends AbstractReader {
}
}
+ @Override
protected DataSet doParseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException {
if (progressMonitor == null) {
progressMonitor = NullProgressMonitor.INSTANCE;
diff --git a/src/org/openstreetmap/josm/io/OsmWriter.java b/src/org/openstreetmap/josm/io/OsmWriter.java
index d9ddcc5..31dd453 100644
--- a/src/org/openstreetmap/josm/io/OsmWriter.java
+++ b/src/org/openstreetmap/josm/io/OsmWriter.java
@@ -7,6 +7,7 @@ import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
+import java.util.Date;
import java.util.List;
import java.util.Map.Entry;
@@ -31,16 +32,18 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.tools.date.DateUtils;
/**
- * Save the dataset into a stream as osm intern xml format. This is not using any
- * xml library for storing.
+ * Save the dataset into a stream as osm intern xml format. This is not using any xml library for storing.
* @author imi
+ * @since 59
*/
public class OsmWriter extends XmlWriter implements PrimitiveVisitor {
+ /** Default OSM API version */
public static final String DEFAULT_API_VERSION = "0.6";
private final boolean osmConform;
private boolean withBody = true;
+ private boolean withVisible = true;
private boolean isOsmChange;
private String version;
private Changeset changeset;
@@ -58,10 +61,23 @@ public class OsmWriter extends XmlWriter implements PrimitiveVisitor {
this.version = version == null ? DEFAULT_API_VERSION : version;
}
+ /**
+ * Sets whether body must be written.
+ * @param wb if {@code true} body will be written.
+ */
public void setWithBody(boolean wb) {
this.withBody = wb;
}
+ /**
+ * Sets whether 'visible' attribute must be written.
+ * @param wv if {@code true} 'visible' attribute will be written.
+ * @since 12019
+ */
+ public void setWithVisible(boolean wv) {
+ this.withVisible = wv;
+ }
+
public void setIsOsmChange(boolean isOsmChange) {
this.isOsmChange = isOsmChange;
}
@@ -125,6 +141,7 @@ public class OsmWriter extends XmlWriter implements PrimitiveVisitor {
* @param ds The dataset to write
*/
public void writeContent(DataSet ds) {
+ setWithVisible(UploadPolicy.NORMAL.equals(ds.getUploadPolicy()));
writeNodes(ds.getNodes());
writeWays(ds.getWays());
writeRelations(ds.getRelations());
@@ -241,11 +258,13 @@ public class OsmWriter extends XmlWriter implements PrimitiveVisitor {
out.print(" user='"+ XmlWriter.encode(cs.getUser().getName()) +'\'');
out.print(" uid='"+cs.getUser().getId() +'\'');
}
- if (cs.getCreatedAt() != null) {
- out.print(" created_at='"+DateUtils.fromDate(cs.getCreatedAt()) +'\'');
+ Date createdDate = cs.getCreatedAt();
+ if (createdDate != null) {
+ out.print(" created_at='"+DateUtils.fromDate(createdDate) +'\'');
}
- if (cs.getClosedAt() != null) {
- out.print(" closed_at='"+DateUtils.fromDate(cs.getClosedAt()) +'\'');
+ Date closedDate = cs.getClosedAt();
+ if (closedDate != null) {
+ out.print(" closed_at='"+DateUtils.fromDate(closedDate) +'\'');
}
out.print(" open='"+ (cs.isOpen() ? "true" : "false") +'\'');
if (cs.getMin() != null) {
@@ -318,7 +337,9 @@ public class OsmWriter extends XmlWriter implements PrimitiveVisitor {
out.print(" user='"+XmlWriter.encode(osm.getUser().getName())+'\'');
}
}
- out.print(" visible='"+osm.isVisible()+'\'');
+ if (withVisible) {
+ out.print(" visible='"+osm.isVisible()+'\'');
+ }
}
if (osm.getVersion() != 0) {
out.print(" version='"+osm.getVersion()+'\'');
diff --git a/src/org/openstreetmap/josm/io/OsmWriterFactory.java b/src/org/openstreetmap/josm/io/OsmWriterFactory.java
index 3dad553..b23c9d0 100644
--- a/src/org/openstreetmap/josm/io/OsmWriterFactory.java
+++ b/src/org/openstreetmap/josm/io/OsmWriterFactory.java
@@ -2,6 +2,7 @@
package org.openstreetmap.josm.io;
import java.io.PrintWriter;
+import java.util.Objects;
/**
* This factory is called by everyone who needs an OsmWriter object,
@@ -16,7 +17,15 @@ import java.io.PrintWriter;
*/
public class OsmWriterFactory {
- public static volatile OsmWriterFactory theFactory;
+ private static volatile OsmWriterFactory theFactory;
+
+ /**
+ * Creates new {@code OsmWriter}.
+ * @param out print writer
+ * @param osmConform if {@code true}, prevents modification attributes to be written to the common part
+ * @param version OSM API version (0.6)
+ * @return new {@code OsmWriter}
+ */
public static OsmWriter createOsmWriter(PrintWriter out, boolean osmConform, String version) {
// pre-set factory with this default implementation; can still be overwritten
// later. note that the default factory may already be used for constructing
@@ -27,6 +36,22 @@ public class OsmWriterFactory {
return theFactory.createOsmWriterImpl(out, osmConform, version);
}
+ /**
+ * Sets the default factory.
+ * @param factory new default factory
+ * @since 11851
+ */
+ public static void setDefaultFactory(OsmWriterFactory factory) {
+ theFactory = Objects.requireNonNull(factory);
+ }
+
+ /**
+ * Creates new {@code OsmWriter}.
+ * @param out print writer
+ * @param osmConform if {@code true}, prevents modification attributes to be written to the common part
+ * @param version OSM API version (0.6)
+ * @return new {@code OsmWriter}
+ */
protected OsmWriter createOsmWriterImpl(PrintWriter out, boolean osmConform, String version) {
return new OsmWriter(out, osmConform, version);
}
diff --git a/src/org/openstreetmap/josm/io/OverpassDownloadReader.java b/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
index a37d57b..2da3f0f 100644
--- a/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
+++ b/src/org/openstreetmap/josm/io/OverpassDownloadReader.java
@@ -6,7 +6,10 @@ import static org.openstreetmap.josm.tools.I18n.tr;
import java.io.IOException;
import java.io.InputStream;
import java.util.EnumMap;
+import java.util.Map;
import java.util.NoSuchElementException;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -45,6 +48,58 @@ public class OverpassDownloadReader extends BoundingBoxDownloader {
}
}
+ /**
+ * Possible Overpass API output format, with the {@code [out:<directive>]} statement.
+ * @since 11916
+ */
+ public enum OverpassOutpoutFormat {
+ /** Default output format: plain OSM XML */
+ OSM_XML("xml"),
+ /** OSM JSON format (not GeoJson) */
+ OSM_JSON("json"),
+ /** CSV, see https://wiki.openstreetmap.org/wiki/Overpass_API/Overpass_QL#Output_Format_.28out.29 */
+ CSV("csv"),
+ /** Custom, see https://overpass-api.de/output_formats.html#custom */
+ CUSTOM("custom"),
+ /** Popup, see https://overpass-api.de/output_formats.html#popup */
+ POPUP("popup"),
+ /** PBF, see https://josm.openstreetmap.de/ticket/14653 */
+ PBF("pbf");
+
+ private final String directive;
+
+ OverpassOutpoutFormat(String directive) {
+ this.directive = directive;
+ }
+
+ /**
+ * Returns the directive used in {@code [out:<directive>]} statement.
+ * @return the directive used in {@code [out:<directive>]} statement
+ */
+ public String getDirective() {
+ return directive;
+ }
+
+ /**
+ * Returns the {@code OverpassOutpoutFormat} matching the given directive.
+ * @param directive directive used in {@code [out:<directive>]} statement
+ * @return {@code OverpassOutpoutFormat} matching the given directive
+ * @throws IllegalArgumentException in case of invalid directive
+ */
+ static OverpassOutpoutFormat from(String directive) {
+ for (OverpassOutpoutFormat oof : values()) {
+ if (oof.directive.equals(directive)) {
+ return oof;
+ }
+ }
+ throw new IllegalArgumentException(directive);
+ }
+ }
+
+ static final Pattern OUTPUT_FORMAT_STATEMENT = Pattern.compile(".*\\[out:([a-z]{3,})\\].*", Pattern.DOTALL);
+
+ static final Map<OverpassOutpoutFormat, Class<? extends AbstractReader>> outputFormatReaders = new ConcurrentHashMap<>();
+
final String overpassServer;
final String overpassQuery;
@@ -61,6 +116,21 @@ public class OverpassDownloadReader extends BoundingBoxDownloader {
this.overpassQuery = overpassQuery.trim();
}
+ /**
+ * Registers an OSM reader for the given Overpass output format.
+ * @param format Overpass output format
+ * @param readerClass OSM reader class
+ * @return the previous value associated with {@code format}, or {@code null} if there was no mapping
+ */
+ public static final Class<? extends AbstractReader> registerOverpassOutpoutFormatReader(
+ OverpassOutpoutFormat format, Class<? extends AbstractReader> readerClass) {
+ return outputFormatReaders.put(Objects.requireNonNull(format), Objects.requireNonNull(readerClass));
+ }
+
+ static {
+ registerOverpassOutpoutFormatReader(OverpassOutpoutFormat.OSM_XML, OverpassOsmReader.class);
+ }
+
@Override
protected String getBaseUrl() {
return overpassServer;
@@ -130,8 +200,7 @@ public class OverpassDownloadReader extends BoundingBoxDownloader {
if (ex.getMessage() != null && ex.getMessage().contains(errorIndicator)) {
final String errorPlusRest = ex.getMessage().split(errorIndicator)[1];
if (errorPlusRest != null) {
- final String error = errorPlusRest.split("</")[0];
- ex.setErrorHeader(error);
+ ex.setErrorHeader(errorPlusRest.split("</")[0].replaceAll(".*::request_read_and_idx::", ""));
}
}
throw ex;
@@ -159,7 +228,22 @@ public class OverpassDownloadReader extends BoundingBoxDownloader {
@Override
protected DataSet parseDataSet(InputStream source, ProgressMonitor progressMonitor) throws IllegalDataException {
- return new OverpassOsmReader().doParseDataSet(source, progressMonitor);
+ AbstractReader reader = null;
+ Matcher m = OUTPUT_FORMAT_STATEMENT.matcher(overpassQuery);
+ if (m.matches()) {
+ Class<? extends AbstractReader> readerClass = outputFormatReaders.get(OverpassOutpoutFormat.from(m.group(1)));
+ if (readerClass != null) {
+ try {
+ reader = readerClass.getDeclaredConstructor().newInstance();
+ } catch (ReflectiveOperationException | IllegalArgumentException | SecurityException e) {
+ Main.error(e);
+ }
+ }
+ }
+ if (reader == null) {
+ reader = new OverpassOsmReader();
+ }
+ return reader.doParseDataSet(source, progressMonitor);
}
@Override
diff --git a/src/org/openstreetmap/josm/io/auth/CredentialsAgentResponse.java b/src/org/openstreetmap/josm/io/auth/CredentialsAgentResponse.java
index ce771ee..45d82d7 100644
--- a/src/org/openstreetmap/josm/io/auth/CredentialsAgentResponse.java
+++ b/src/org/openstreetmap/josm/io/auth/CredentialsAgentResponse.java
@@ -39,7 +39,7 @@ public class CredentialsAgentResponse {
* @return The password in plain text
*/
public char[] getPassword() {
- return password;
+ return Utils.copyArray(password);
}
/**
diff --git a/src/org/openstreetmap/josm/io/imagery/ImageryReader.java b/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
index 6e0a1e9..5ce0b13 100644
--- a/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
+++ b/src/org/openstreetmap/josm/io/imagery/ImageryReader.java
@@ -97,6 +97,11 @@ public class ImageryReader implements Closeable {
}
private static class Parser extends DefaultHandler {
+ private static final String MAX_ZOOM = "max-zoom";
+ private static final String MIN_ZOOM = "min-zoom";
+ private static final String TILE_SIZE = "tile-size";
+ private static final String TRUE = "true";
+
private StringBuilder accumulator = new StringBuilder();
private Stack<State> states;
@@ -154,7 +159,7 @@ public class ImageryReader implements Closeable {
noTileChecksums = new MultiMap<>();
metadataHeaders = new HashMap<>();
String best = atts.getValue("eli-best");
- if ("true".equals(best)) {
+ if (TRUE.equals(best)) {
entry.setBestMarked(true);
}
}
@@ -163,9 +168,9 @@ public class ImageryReader implements Closeable {
if (Arrays.asList(new String[] {
"type",
"url",
- "min-zoom",
- "max-zoom",
- "tile-size",
+ MIN_ZOOM,
+ MAX_ZOOM,
+ TILE_SIZE,
}).contains(qName)) {
newState = State.MIRROR_ATTRIBUTE;
lang = atts.getValue("lang");
@@ -183,20 +188,20 @@ public class ImageryReader implements Closeable {
"default",
"url",
"eula",
- "min-zoom",
- "max-zoom",
+ MIN_ZOOM,
+ MAX_ZOOM,
"attribution-text",
"attribution-url",
"logo-image",
"logo-url",
"terms-of-use-text",
"terms-of-use-url",
+ "permission-ref",
"country-code",
"icon",
"date",
- "tile-size",
+ TILE_SIZE,
"valid-georeference",
- "epsg4326to3857Supported",
}).contains(qName)) {
newState = State.ENTRY_ATTRIBUTE;
lang = atts.getValue("lang");
@@ -264,7 +269,7 @@ public class ImageryReader implements Closeable {
newState = State.UNKNOWN;
}
states.push(newState);
- if (newState == State.UNKNOWN && "true".equals(atts.getValue("mandatory"))) {
+ if (newState == State.UNKNOWN && TRUE.equals(atts.getValue("mandatory"))) {
skipEntry = true;
}
}
@@ -319,8 +324,8 @@ public class ImageryReader implements Closeable {
case "url":
mirrorEntry.setUrl(accumulator.toString());
break;
- case "min-zoom":
- case "max-zoom":
+ case MIN_ZOOM:
+ case MAX_ZOOM:
Integer val = null;
try {
val = Integer.valueOf(accumulator.toString());
@@ -330,14 +335,14 @@ public class ImageryReader implements Closeable {
if (val == null) {
mirrorEntry = null;
} else {
- if ("min-zoom".equals(qName)) {
+ if (MIN_ZOOM.equals(qName)) {
mirrorEntry.setDefaultMinZoom(val);
} else {
mirrorEntry.setDefaultMaxZoom(val);
}
}
break;
- case "tile-size":
+ case TILE_SIZE:
Integer tileSize = null;
try {
tileSize = Integer.valueOf(accumulator.toString());
@@ -383,7 +388,7 @@ public class ImageryReader implements Closeable {
break;
case "default":
switch (accumulator.toString()) {
- case "true":
+ case TRUE:
entry.setDefaultEntry(true);
break;
case "false":
@@ -399,8 +404,8 @@ public class ImageryReader implements Closeable {
case "eula":
entry.setEulaAcceptanceRequired(accumulator.toString());
break;
- case "min-zoom":
- case "max-zoom":
+ case MIN_ZOOM:
+ case MAX_ZOOM:
Integer val = null;
try {
val = Integer.valueOf(accumulator.toString());
@@ -410,7 +415,7 @@ public class ImageryReader implements Closeable {
if (val == null) {
skipEntry = true;
} else {
- if ("min-zoom".equals(qName)) {
+ if (MIN_ZOOM.equals(qName)) {
entry.setDefaultMinZoom(val);
} else {
entry.setDefaultMaxZoom(val);
@@ -432,6 +437,9 @@ public class ImageryReader implements Closeable {
case "terms-of-use-text":
entry.setTermsOfUseText(accumulator.toString());
break;
+ case "permission-ref":
+ entry.setPermissionReferenceURL(accumulator.toString());
+ break;
case "terms-of-use-url":
entry.setTermsOfUseURL(accumulator.toString());
break;
@@ -441,7 +449,7 @@ public class ImageryReader implements Closeable {
case "icon":
entry.setIcon(accumulator.toString());
break;
- case "tile-size":
+ case TILE_SIZE:
Integer tileSize = null;
try {
tileSize = Integer.valueOf(accumulator.toString());
@@ -457,9 +465,6 @@ public class ImageryReader implements Closeable {
case "valid-georeference":
entry.setGeoreferenceValid(Boolean.parseBoolean(accumulator.toString()));
break;
- case "epsg4326to3857Supported":
- entry.setEpsg4326To3857Supported(Boolean.parseBoolean(accumulator.toString()));
- break;
default: // Do nothing
}
break;
diff --git a/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java b/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
index 67c7e10..61b267b 100644
--- a/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
+++ b/src/org/openstreetmap/josm/io/remotecontrol/RequestProcessor.java
@@ -224,7 +224,13 @@ public class RequestProcessor extends Thread {
String websiteDoc = HelpUtil.getWikiBaseHelpUrl() +"/Help/Preferences/RemoteControl";
String help = "No command specified! The following commands are available:<ul>" + usage
+ "</ul>" + "See <a href=\""+websiteDoc+"\">"+websiteDoc+"</a> for complete documentation.";
- sendBadRequest(out, help);
+ sendHeader(out, "400 Bad Request", "text/html", true);
+ out.write(String.format(
+ RESPONSE_TEMPLATE,
+ "<title>Bad Request</title>",
+ "<h1>HTTP Error 400: Bad Request</h1>" +
+ "<p>" + help + "</p>"));
+ out.flush();
} else {
// create handler object
RequestHandler handler = handlerClass.getConstructor().newInstance();
@@ -329,12 +335,9 @@ public class RequestProcessor extends Thread {
/**
* Sends a 400 error: bad request
*
- * @param out
- * The writer where the error is written
- * @param help
- * Optional HTML help content to display, can be null
- * @throws IOException
- * If the error can not be written
+ * @param out The writer where the error is written
+ * @param help Optional help content to display, can be null
+ * @throws IOException If the error can not be written
*/
private static void sendBadRequest(Writer out, String help) throws IOException {
sendHeader(out, "400 Bad Request", "text/html", true);
diff --git a/src/org/openstreetmap/josm/io/session/SessionReader.java b/src/org/openstreetmap/josm/io/session/SessionReader.java
index e92cdc0..cd2fcdc 100644
--- a/src/org/openstreetmap/josm/io/session/SessionReader.java
+++ b/src/org/openstreetmap/josm/io/session/SessionReader.java
@@ -506,7 +506,9 @@ public class SessionReader {
CancelOrContinueDialog dialog = new CancelOrContinueDialog();
dialog.show(
tr("Error loading layer"),
- tr("<html>Could not load layer {0} ''{1}''.<br>Error is:<br>{2}</html>", idx, name, exception.getMessage()),
+ tr("<html>Could not load layer {0} ''{1}''.<br>Error is:<br>{2}</html>", idx,
+ Utils.escapeReservedCharactersHTML(name),
+ Utils.escapeReservedCharactersHTML(exception.getMessage())),
JOptionPane.ERROR_MESSAGE,
progressMonitor
);
diff --git a/src/org/openstreetmap/josm/plugins/PluginHandler.java b/src/org/openstreetmap/josm/plugins/PluginHandler.java
index 046a235..c542645 100644
--- a/src/org/openstreetmap/josm/plugins/PluginHandler.java
+++ b/src/org/openstreetmap/josm/plugins/PluginHandler.java
@@ -135,6 +135,7 @@ public final class PluginHandler {
new DeprecatedPlugin("josm-geojson", tr("replaced by new {0} plugin", "geojson")),
new DeprecatedPlugin("proj4j", inCore),
new DeprecatedPlugin("OpenStreetView", tr("replaced by new {0} plugin", "OpenStreetCam")),
+ new DeprecatedPlugin("imageryadjust", inCore),
});
}
@@ -142,6 +143,43 @@ public final class PluginHandler {
// Hide default constructor for utils classes
}
+ static final class PluginInformationAction extends AbstractAction {
+ private final PluginInformation info;
+
+ PluginInformationAction(PluginInformation info) {
+ super(tr("Information"));
+ this.info = info;
+ }
+
+ /**
+ * Returns plugin information text.
+ * @return plugin information text
+ */
+ public String getText() {
+ StringBuilder b = new StringBuilder();
+ for (Entry<String, String> e : info.attr.entrySet()) {
+ b.append(e.getKey());
+ b.append(": ");
+ b.append(e.getValue());
+ b.append('\n');
+ }
+ return b.toString();
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent event) {
+ String text = getText();
+ JosmTextArea a = new JosmTextArea(10, 40);
+ a.setEditable(false);
+ a.setText(text);
+ a.setCaretPosition(0);
+ if (!GraphicsEnvironment.isHeadless()) {
+ JOptionPane.showMessageDialog(Main.parent, new JScrollPane(a), tr("Plugin information"),
+ JOptionPane.INFORMATION_MESSAGE);
+ }
+ }
+ }
+
/**
* Description of a deprecated plugin
*/
@@ -280,6 +318,10 @@ public final class PluginHandler {
return pluginList.stream().map(PluginProxy::getPluginInformation).collect(Collectors.toList());
}
+ /**
+ * Returns all ClassLoaders whose resource should be searched.
+ * @return all ClassLoaders whose resource should be searched
+ */
public static Collection<ClassLoader> getResourceClassLoaders() {
return Collections.unmodifiableCollection(sources);
}
@@ -349,7 +391,8 @@ public final class PluginHandler {
}
String msg = tr("<html>Loading of the plugin \"{0}\" was requested."
+ "<br>This plugin is no longer developed and very likely will produce errors."
- +"<br>It should be disabled.<br>Delete from preferences?</html>", unmaintained);
+ +"<br>It should be disabled.<br>Delete from preferences?</html>",
+ Utils.escapeReservedCharactersHTML(unmaintained));
if (confirmDisablePlugin(parent, msg, unmaintained)) {
Main.pref.removeFromCollection("plugins", unmaintained);
plugins.remove(unmaintained);
@@ -505,7 +548,7 @@ public final class PluginHandler {
.append(trn("Plugin {0} requires a plugin which was not found. The missing plugin is:",
"Plugin {0} requires {1} plugins which were not found. The missing plugins are:",
missingRequiredPlugin.size(),
- plugin,
+ Utils.escapeReservedCharactersHTML(plugin),
missingRequiredPlugin.size()))
.append(Utils.joinAsHtmlUnorderedList(missingRequiredPlugin))
.append("</html>");
@@ -714,7 +757,7 @@ public final class PluginHandler {
Main.info(tr("loading plugin ''{0}'' (version {1})", plugin.name, plugin.localversion));
PluginProxy pluginProxy = plugin.load(klass);
pluginList.add(pluginProxy);
- Main.addMapFrameListener(pluginProxy, true);
+ Main.addAndFireMapFrameListener(pluginProxy);
}
msg = null;
} catch (PluginException e) {
@@ -722,7 +765,7 @@ public final class PluginHandler {
Main.error(e);
if (e.getCause() instanceof ClassNotFoundException) {
msg = tr("<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' was not found.<br>"
- + "Delete from preferences?</html>", plugin.name, plugin.className);
+ + "Delete from preferences?</html>", Utils.escapeReservedCharactersHTML(plugin.name), plugin.className);
}
} catch (RuntimeException e) { // NOPMD
pluginLoadingExceptions.put(plugin.name, e);
@@ -918,7 +961,7 @@ public final class PluginHandler {
plugins.size()))
.append("<ul>");
for (PluginInformation pi: plugins) {
- sb.append("<li>").append(pi.name).append("</li>");
+ sb.append("<li>").append(Utils.escapeReservedCharactersHTML(pi.name)).append("</li>");
}
sb.append("</ul>")
.append(trn(
@@ -1269,10 +1312,12 @@ public final class PluginHandler {
final StringBuilder msg = new StringBuilder(256);
msg.append("<html>")
- .append(tr("An unexpected exception occurred that may have come from the ''{0}'' plugin.", plugin.getPluginInformation().name))
+ .append(tr("An unexpected exception occurred that may have come from the ''{0}'' plugin.",
+ Utils.escapeReservedCharactersHTML(plugin.getPluginInformation().name)))
.append("<br>");
if (plugin.getPluginInformation().author != null) {
- msg.append(tr("According to the information within the plugin, the author is {0}.", plugin.getPluginInformation().author))
+ msg.append(tr("According to the information within the plugin, the author is {0}.",
+ Utils.escapeReservedCharactersHTML(plugin.getPluginInformation().author)))
.append("<br>");
}
msg.append(tr("Try updating to the newest version of this plugin before reporting a bug."))
@@ -1399,24 +1444,7 @@ public final class PluginHandler {
+ (info.version != null && !info.version.isEmpty() ? " Version: " + info.version : "");
pluginTab.add(new JLabel(name), GBC.std());
pluginTab.add(Box.createHorizontalGlue(), GBC.std().fill(GBC.HORIZONTAL));
- pluginTab.add(new JButton(new AbstractAction(tr("Information")) {
- @Override
- public void actionPerformed(ActionEvent event) {
- StringBuilder b = new StringBuilder();
- for (Entry<String, String> e : info.attr.entrySet()) {
- b.append(e.getKey());
- b.append(": ");
- b.append(e.getValue());
- b.append('\n');
- }
- JosmTextArea a = new JosmTextArea(10, 40);
- a.setEditable(false);
- a.setText(b.toString());
- a.setCaretPosition(0);
- JOptionPane.showMessageDialog(Main.parent, new JScrollPane(a), tr("Plugin information"),
- JOptionPane.INFORMATION_MESSAGE);
- }
- }), GBC.eol());
+ pluginTab.add(new JButton(new PluginInformationAction(info)), GBC.eol());
JosmTextArea description = new JosmTextArea(info.description == null ? tr("no description available")
: info.description);
diff --git a/src/org/openstreetmap/josm/plugins/PluginInformation.java b/src/org/openstreetmap/josm/plugins/PluginInformation.java
index eb20c7a..8e40943 100644
--- a/src/org/openstreetmap/josm/plugins/PluginInformation.java
+++ b/src/org/openstreetmap/josm/plugins/PluginInformation.java
@@ -297,7 +297,7 @@ public class PluginInformation {
public String getDescriptionAsHtml() {
StringBuilder sb = new StringBuilder(128);
sb.append("<html><body>")
- .append(description == null ? tr("no description available") : description);
+ .append(description == null ? tr("no description available") : Utils.escapeReservedCharactersHTML(description));
if (link != null) {
sb.append(" <a href=\"").append(link).append("\">").append(tr("More info...")).append("</a>");
}
@@ -429,9 +429,7 @@ public class PluginInformation {
if (this.downloadlink == null) return false;
if (this.version == null && referenceVersion != null)
return true;
- if (this.version != null && !this.version.equals(referenceVersion))
- return true;
- return false;
+ return this.version != null && !this.version.equals(referenceVersion);
}
/**
diff --git a/src/org/openstreetmap/josm/tools/HttpClient.java b/src/org/openstreetmap/josm/tools/HttpClient.java
index a45ecfd..7b7d134 100644
--- a/src/org/openstreetmap/josm/tools/HttpClient.java
+++ b/src/org/openstreetmap/josm/tools/HttpClient.java
@@ -557,7 +557,7 @@ public final class HttpClient {
* @return {@code this}
*/
public HttpClient setRequestBody(byte[] requestBody) {
- this.requestBody = requestBody;
+ this.requestBody = Utils.copyArray(requestBody);
return this;
}
diff --git a/src/org/openstreetmap/josm/tools/ImageWarp.java b/src/org/openstreetmap/josm/tools/ImageWarp.java
new file mode 100644
index 0000000..5e25912
--- /dev/null
+++ b/src/org/openstreetmap/josm/tools/ImageWarp.java
@@ -0,0 +1,202 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import java.awt.Dimension;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.openstreetmap.josm.Main;
+
+/**
+ * Image warping algorithm.
+ *
+ * Deforms an image geometrically according to a given transformation formula.
+ * @since 11858
+ */
+public class ImageWarp {
+
+ /**
+ * Transformation that translates the pixel coordinates.
+ */
+ public interface PointTransform {
+ /**
+ * Translates pixel coordinates.
+ * @param pt pixel coordinates
+ * @return transformed pixel coordinates
+ */
+ Point2D transform(Point2D pt);
+ }
+
+ /**
+ * Wrapper that optimizes a given {@link ImageWarp.PointTransform}.
+ *
+ * It does so by spanning a grid with certain step size. It will invoke the
+ * potentially expensive master transform only at those grid points and use
+ * bilinear interpolation to approximate transformed values in between.
+ * <p>
+ * For memory optimization, this class assumes that rows are more or less scanned
+ * one-by-one as is done in {@link ImageWarp#warp}. I.e. this transform is <em>not</em>
+ * random access in the y coordinate.
+ */
+ public static class GridTransform implements ImageWarp.PointTransform {
+
+ private final double stride;
+ private final ImageWarp.PointTransform trfm;
+
+ private final Map<Integer, Map<Integer, Point2D>> cache;
+
+ private final boolean consistencyTest;
+ private final Set<Integer> deletedRows;
+
+ /**
+ * Create a new GridTransform.
+ * @param trfm the master transform, that needs to be optimized
+ * @param stride step size
+ */
+ public GridTransform(ImageWarp.PointTransform trfm, double stride) {
+ this.trfm = trfm;
+ this.stride = stride;
+ this.cache = new HashMap<>();
+ this.consistencyTest = Main.isDebugEnabled();
+ if (consistencyTest) {
+ deletedRows = new HashSet<>();
+ } else {
+ deletedRows = null;
+ }
+ }
+
+ @Override
+ public Point2D transform(Point2D pt) {
+ int xIdx = (int) Math.floor(pt.getX() / stride);
+ int yIdx = (int) Math.floor(pt.getY() / stride);
+ double dx = pt.getX() / stride - xIdx;
+ double dy = pt.getY() / stride - yIdx;
+ Point2D value00 = getValue(xIdx, yIdx);
+ Point2D value01 = getValue(xIdx, yIdx + 1);
+ Point2D value10 = getValue(xIdx + 1, yIdx);
+ Point2D value11 = getValue(xIdx + 1, yIdx + 1);
+ double valueX = (value00.getX() * (1-dx) + value10.getX() * dx) * (1-dy) +
+ (value01.getX() * (1-dx) + value11.getX() * dx) * dy;
+ double valueY = (value00.getY() * (1-dx) + value10.getY() * dx) * (1-dy) +
+ (value01.getY() * (1-dx) + value11.getY() * dx) * dy;
+ return new Point2D.Double(valueX, valueY);
+ }
+
+ private Point2D getValue(int xIdx, int yIdx) {
+ Map<Integer, Point2D> row = getRow(yIdx);
+ Point2D val = row.get(xIdx);
+ if (val == null) {
+ val = trfm.transform(new Point2D.Double(xIdx * stride, yIdx * stride));
+ row.put(xIdx, val);
+ }
+ return val;
+ }
+
+ private Map<Integer, Point2D> getRow(int yIdx) {
+ cleanUp(yIdx - 3);
+ Map<Integer, Point2D> row = cache.get(yIdx);
+ if (row == null) {
+ row = new HashMap<>();
+ cache.put(yIdx, row);
+ if (consistencyTest) {
+ // should not create a row that has been deleted before
+ if (deletedRows.contains(yIdx)) throw new AssertionError();
+ // only ever cache 3 rows at once
+ if (cache.size() > 3) throw new AssertionError();
+ }
+ }
+ return row;
+ }
+
+ // remove rows from cache that will no longer be used
+ private void cleanUp(int yIdx) {
+ Map<Integer, Point2D> del = cache.remove(yIdx);
+ if (consistencyTest && del != null) {
+ // should delete each row only once
+ if (deletedRows.contains(yIdx)) throw new AssertionError();
+ deletedRows.add(yIdx);
+ }
+ }
+ }
+
+ /**
+ * Interpolation method.
+ */
+ public enum Interpolation {
+ /**
+ * Nearest neighbor.
+ *
+ * Simplest possible method. Faster, but not very good quality.
+ */
+ NEAREST_NEIGHBOR,
+
+ /**
+ * Bilinear.
+ *
+ * Decent quality.
+ */
+ BILINEAR;
+ }
+
+ /**
+ * Warp an image.
+ * @param srcImg the original image
+ * @param targetDim dimension of the target image
+ * @param invTransform inverse transformation (translates pixel coordinates
+ * of the target image to pixel coordinates of the original image)
+ * @param interpolation the interpolation method
+ * @return the warped image
+ */
+ public static BufferedImage warp(BufferedImage srcImg, Dimension targetDim, PointTransform invTransform, Interpolation interpolation) {
+ BufferedImage imgTarget = new BufferedImage(targetDim.width, targetDim.height, BufferedImage.TYPE_INT_ARGB);
+ Rectangle2D srcRect = new Rectangle2D.Double(0, 0, srcImg.getWidth(), srcImg.getHeight());
+ for (int j = 0; j < imgTarget.getHeight(); j++) {
+ for (int i = 0; i < imgTarget.getWidth(); i++) {
+ Point2D srcCoord = invTransform.transform(new Point2D.Double(i, j));
+ if (srcRect.contains(srcCoord)) {
+ int rgba;
+ switch (interpolation) {
+ case NEAREST_NEIGHBOR:
+ rgba = getColor((int) Math.round(srcCoord.getX()), (int) Math.round(srcCoord.getY()), srcImg);
+ break;
+ case BILINEAR:
+ int x0 = (int) Math.floor(srcCoord.getX());
+ double dx = srcCoord.getX() - x0;
+ int y0 = (int) Math.floor(srcCoord.getY());
+ double dy = srcCoord.getY() - y0;
+ int c00 = getColor(x0, y0, srcImg);
+ int c01 = getColor(x0, y0 + 1, srcImg);
+ int c10 = getColor(x0 + 1, y0, srcImg);
+ int c11 = getColor(x0 + 1, y0 + 1, srcImg);
+ rgba = 0;
+ // loop over color components: blue, green, red, alpha
+ for (int ch = 0; ch <= 3; ch++) {
+ int shift = 8 * ch;
+ int chVal = (int) Math.round(
+ (((c00 >> shift) & 0xff) * (1-dx) + ((c10 >> shift) & 0xff) * dx) * (1-dy) +
+ (((c01 >> shift) & 0xff) * (1-dx) + ((c11 >> shift) & 0xff) * dx) * dy);
+ rgba |= chVal << shift;
+ }
+ break;
+ default:
+ throw new AssertionError();
+ }
+ imgTarget.setRGB(i, j, rgba);
+ }
+ }
+ }
+ return imgTarget;
+ }
+
+ private static int getColor(int x, int y, BufferedImage img) {
+ // border strategy: continue with the color of the outermost pixel,
+ return img.getRGB(
+ Utils.clamp(x, 0, img.getWidth() - 1),
+ Utils.clamp(y, 0, img.getHeight() - 1));
+ }
+}
diff --git a/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java b/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
index 3ec8294..239e335 100644
--- a/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
+++ b/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
@@ -77,12 +77,11 @@ public final class OsmUrlToBounds {
b = new Bounds(minlat, minlon, maxlat, maxlon);
} else {
String z = map.get("zoom");
- b = positionToBounds(parseDouble(map, "lat"),
- parseDouble(map, "lon"),
+ b = positionToBounds(parseDouble(map, "lat"), parseDouble(map, "lon"),
z == null ? 18 : Integer.parseInt(z));
}
- } catch (NumberFormatException | ArrayIndexOutOfBoundsException ex) {
- Main.error(ex);
+ } catch (IllegalArgumentException | ArrayIndexOutOfBoundsException ex) {
+ Main.error(ex, url);
}
return b;
}
@@ -131,7 +130,9 @@ public final class OsmUrlToBounds {
private static double parseDouble(Map<String, String> map, String key) {
if (map.containsKey(key))
return Double.parseDouble(map.get(key));
- return Double.parseDouble(map.get('m'+key));
+ if (map.containsKey('m'+key))
+ return Double.parseDouble(map.get('m'+key));
+ throw new IllegalArgumentException(map.toString() + " does not contain " + key);
}
private static final char[] SHORTLINK_CHARS = {
diff --git a/src/org/openstreetmap/josm/tools/PlatformHook.java b/src/org/openstreetmap/josm/tools/PlatformHook.java
index 1dee41f..3f3328f 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHook.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHook.java
@@ -8,8 +8,11 @@ import java.security.KeyStore;
import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
import java.util.List;
+import org.openstreetmap.josm.io.CertificateAmendment.CertAmend;
+
/**
* This interface allows platform (operating system) dependent code
* to be bundled into self-contained classes.
@@ -153,6 +156,21 @@ public interface PlatformHook {
}
/**
+ * Returns the {@code X509Certificate} matching the given certificate amendment information.
+ * @param certAmend certificate amendment
+ * @return the {@code X509Certificate} matching the given certificate amendment information, or {@code null}
+ * @throws KeyStoreException in case of error
+ * @throws IOException in case of error
+ * @throws CertificateException in case of error
+ * @throws NoSuchAlgorithmException in case of error
+ * @since 11943
+ */
+ default X509Certificate getX509Certificate(CertAmend certAmend)
+ throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {
+ return null;
+ }
+
+ /**
* Returns the platform-dependent default cache directory.
* @return the platform-dependent default cache directory
* @since 7829
diff --git a/src/org/openstreetmap/josm/tools/PlatformHookWindows.java b/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
index 1d51666..b652c53 100644
--- a/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
+++ b/src/org/openstreetmap/josm/tools/PlatformHookWindows.java
@@ -44,11 +44,14 @@ import java.security.InvalidKeyException;
import java.security.KeyFactory;
import java.security.KeyStore;
import java.security.KeyStoreException;
+import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.security.NoSuchProviderException;
import java.security.PublicKey;
import java.security.SignatureException;
+import java.security.cert.Certificate;
import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
import java.security.spec.InvalidKeySpecException;
import java.security.spec.X509EncodedKeySpec;
import java.util.ArrayList;
@@ -63,11 +66,12 @@ import javax.swing.JOptionPane;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.io.CertificateAmendment.CertAmend;
/**
- * {@code PlatformHook} implementation for Microsoft Windows systems.
- * @since 1023
- */
+ * {@code PlatformHook} implementation for Microsoft Windows systems.
+ * @since 1023
+ */
public class PlatformHookWindows implements PlatformHook {
/**
@@ -353,6 +357,28 @@ public class PlatformHookWindows implements PlatformHook {
}
@Override
+ public X509Certificate getX509Certificate(CertAmend certAmend)
+ throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {
+ KeyStore ks = getRootKeystore();
+ // Search by alias (fast)
+ Certificate result = ks.getCertificate(certAmend.getId());
+ if (result instanceof X509Certificate) {
+ return (X509Certificate) result;
+ }
+ // If not found, search by SHA-256 (slower)
+ MessageDigest md = MessageDigest.getInstance("SHA-256");
+ for (Enumeration<String> aliases = ks.aliases(); aliases.hasMoreElements();) {
+ result = ks.getCertificate(aliases.nextElement());
+ if (result instanceof X509Certificate
+ && certAmend.getSha256().equalsIgnoreCase(Utils.toHexString(md.digest(result.getEncoded())))) {
+ return (X509Certificate) result;
+ }
+ }
+ // Not found
+ return null;
+ }
+
+ @Override
public File getDefaultCacheDirectory() {
String p = System.getenv("LOCALAPPDATA");
if (p == null || p.isEmpty()) {
@@ -533,11 +559,13 @@ public class PlatformHookWindows implements PlatformHook {
def.add(new FontEntry("myanmar", "Myanmar Text", "MMRTEXT.TTF")); // ISO 639: my
def.add(new FontEntry("nirmala", "Nirmala UI", "NIRMALA.TTF")); // ISO 639: sat,srb
def.add(new FontEntry("segoeui", "Segoe UI", "SEGOEUI.TTF")); // ISO 639: lis
+ def.add(new FontEntry("emoji", "Segoe UI Emoji", "SEGUIEMJ.TTF")); // emoji symbol characters
// Windows 7 and later
def.add(new FontEntry("nko_tifinagh_vai_osmanya", "Ebrima", "EBRIMA.TTF")); // ISO 639: ber. Nko only since Win 8
def.add(new FontEntry("khmer1", "Khmer UI", "KHMERUI.TTF")); // ISO 639: km
def.add(new FontEntry("lao1", "Lao UI", "LAOUI.TTF")); // ISO 639: lo
+ def.add(new FontEntry("symbol", "Segoe UI Symbol", "SEGUISYM.TTF")); // subset of Unicode-encoded symbols
def.add(new FontEntry("tai_le", "Microsoft Tai Le", "TAILE.TTF")); // ISO 639: khb
def.add(new FontEntry("new_tai_lue", "Microsoft New Tai Lue", "NTHAILU.TTF")); // ISO 639: khb
diff --git a/src/org/openstreetmap/josm/tools/StreamUtils.java b/src/org/openstreetmap/josm/tools/StreamUtils.java
index 274406f..a5787d5 100644
--- a/src/org/openstreetmap/josm/tools/StreamUtils.java
+++ b/src/org/openstreetmap/josm/tools/StreamUtils.java
@@ -15,7 +15,9 @@ public final class StreamUtils {
/**
* Utility class
*/
- private StreamUtils() {}
+ private StreamUtils() {
+ // Hide default constructor for utility classes
+ }
/**
* Returns a sequential {@code Stream} with the iterable as its source.
diff --git a/src/org/openstreetmap/josm/tools/Utils.java b/src/org/openstreetmap/josm/tools/Utils.java
index 293d9b7..f10aee7 100644
--- a/src/org/openstreetmap/josm/tools/Utils.java
+++ b/src/org/openstreetmap/josm/tools/Utils.java
@@ -92,6 +92,10 @@ public final class Utils {
private static final String[] SIZE_UNITS = {"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"};
+ // Constants backported from Java 9, see https://bugs.openjdk.java.net/browse/JDK-4477961
+ private static final double TO_DEGREES = 180.0 / Math.PI;
+ private static final double TO_RADIANS = Math.PI / 180.0;
+
private Utils() {
// Hide default constructor for utils classes
}
@@ -356,6 +360,19 @@ public final class Utils {
}
/**
+ * Copies the given array. Unlike {@link Arrays#copyOf}, this method is null-safe.
+ * @param array The array to copy
+ * @return A copy of the original array, or {@code null} if {@code array} is null
+ * @since 11879
+ */
+ public static byte[] copyArray(byte... array) {
+ if (array != null) {
+ return Arrays.copyOf(array, array.length);
+ }
+ return array;
+ }
+
+ /**
* Simple file copy function that will overwrite the target file.
* @param in The source file
* @param out The destination file
@@ -1178,9 +1195,7 @@ public final class Utils {
* @since 7356
*/
public static boolean isLocalUrl(String url) {
- if (url == null || url.startsWith("http://") || url.startsWith("https://") || url.startsWith("resource://"))
- return false;
- return true;
+ return url != null && !url.startsWith("http://") && !url.startsWith("https://") && !url.startsWith("resource://");
}
/**
@@ -1274,7 +1289,6 @@ public final class Utils {
* Returns a new secure DOM builder, supporting XML namespaces.
* @return a new secure DOM builder, supporting XML namespaces
* @throws ParserConfigurationException if a parser cannot be created which satisfies the requested configuration.
- * @throws ParserConfigurationException if a parser cannot be created which satisfies the requested configuration.
* @since 10404
*/
public static DocumentBuilder newSafeDOMBuilder() throws ParserConfigurationException {
@@ -1541,4 +1555,34 @@ public final class Utils {
return val;
}
}
+
+ /**
+ * Convert angle from radians to degrees.
+ *
+ * Replacement for {@link Math#toDegrees(double)} to match the Java 9
+ * version of that method. (Can be removed when JOSM support for Java 8 ends.)
+ * Only relevant in relation to ProjectionRegressionTest.
+ * @param angleRad an angle in radians
+ * @return the same angle in degrees
+ * @see <a href="https://josm.openstreetmap.de/ticket/11889">#11889</a>
+ * @since 12013
+ */
+ public static double toDegrees(double angleRad) {
+ return angleRad * TO_DEGREES;
+ }
+
+ /**
+ * Convert angle from degrees to radians.
+ *
+ * Replacement for {@link Math#toRadians(double)} to match the Java 9
+ * version of that method. (Can be removed when JOSM support for Java 8 ends.)
+ * Only relevant in relation to ProjectionRegressionTest.
+ * @param angleDeg an angle in degrees
+ * @return the same angle in radians
+ * @see <a href="https://josm.openstreetmap.de/ticket/11889">#11889</a>
+ * @since 12013
+ */
+ public static double toRadians(double angleDeg) {
+ return angleDeg * TO_RADIANS;
+ }
}
diff --git a/src/org/openstreetmap/josm/tools/date/DateUtils.java b/src/org/openstreetmap/josm/tools/date/DateUtils.java
index 481d6b1..a196879 100644
--- a/src/org/openstreetmap/josm/tools/date/DateUtils.java
+++ b/src/org/openstreetmap/josm/tools/date/DateUtils.java
@@ -58,7 +58,7 @@ public final class DateUtils {
/**
* Constructs a new {@code DateUtils}.
*/
- protected DateUtils() {
+ private DateUtils() {
// Hide default constructor for utils classes
}
@@ -162,6 +162,16 @@ public final class DateUtils {
return DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(temporal);
}
+ /**
+ * Null-safe date cloning method.
+ * @param d date to clone, or null
+ * @return cloned date, or null
+ * @since 11878
+ */
+ public static Date cloneDate(Date d) {
+ return d != null ? (Date) d.clone() : null;
+ }
+
private static boolean checkLayout(String text, String pattern) {
if (text.length() != pattern.length())
return false;
diff --git a/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java b/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java
index 55ef71c..23517e4 100644
--- a/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java
+++ b/src/org/openstreetmap/josm/tools/template_engine/ContextSwitchTemplate.java
@@ -20,6 +20,11 @@ import org.openstreetmap.josm.data.osm.Relation;
import org.openstreetmap.josm.data.osm.RelationMember;
import org.openstreetmap.josm.data.osm.Way;
+/**
+ * The context switch offers possibility to use tags of referenced primitive when constructing primitive name.
+ * @author jttt
+ * @since 4546
+ */
public class ContextSwitchTemplate implements TemplateEntry {
private static final TemplateEngineDataProvider EMPTY_PROVIDER = new TemplateEngineDataProvider() {
@@ -243,6 +248,13 @@ public class ContextSwitchTemplate implements TemplateEntry {
return m;
}
+ /**
+ * Constructs a new {@code ContextSwitchTemplate}.
+ * @param match match
+ * @param template template
+ * @param searchExpressionPosition search expression position
+ * @throws ParseError if a parse error occurs, or if the match transformation returns the same primitive
+ */
public ContextSwitchTemplate(Match match, TemplateEntry template, int searchExpressionPosition) throws ParseError {
Match m = transform(match, searchExpressionPosition);
if (!(m instanceof ContextProvider))
diff --git a/src/org/openstreetmap/josm/tools/template_engine/TemplateParser.java b/src/org/openstreetmap/josm/tools/template_engine/TemplateParser.java
index c003aa7..ff73536 100644
--- a/src/org/openstreetmap/josm/tools/template_engine/TemplateParser.java
+++ b/src/org/openstreetmap/josm/tools/template_engine/TemplateParser.java
@@ -94,12 +94,13 @@ public class TemplateParser {
check(TokenType.APOSTROPHE);
condition = parseExpression(CONDITION_WITH_APOSTROPHES_END_TOKENS);
check(TokenType.APOSTROPHE);
- if (searchExpression.getText().trim().isEmpty()) {
+ String searchText = searchExpression.getText().trim();
+ if (searchText.isEmpty()) {
result.getEntries().add(condition);
} else {
try {
result.getEntries().add(new SearchExpressionCondition(
- SearchCompiler.compile(searchExpression.getText()), condition));
+ SearchCompiler.compile(searchText), condition));
} catch (SearchCompiler.ParseError e) {
throw new ParseError(searchExpression.getPosition(), e);
}
@@ -124,11 +125,12 @@ public class TemplateParser {
TemplateEntry template = parseExpression(CONDITION_WITH_APOSTROPHES_END_TOKENS);
check(TokenType.APOSTROPHE);
ContextSwitchTemplate result;
- if (searchExpression.getText().trim().isEmpty())
+ String searchText = searchExpression.getText().trim();
+ if (searchText.isEmpty())
throw new ParseError(tr("Expected search expression"));
else {
try {
- Match match = SearchCompiler.compile(searchExpression.getText());
+ Match match = SearchCompiler.compile(searchText);
result = new ContextSwitchTemplate(match, template, searchExpression.getPosition());
} catch (SearchCompiler.ParseError e) {
throw new ParseError(searchExpression.getPosition(), e);
diff --git a/styles/standard/elemstyles.mapcss b/styles/standard/elemstyles.mapcss
index 36cdfe1..c44bc6d 100644
--- a/styles/standard/elemstyles.mapcss
+++ b/styles/standard/elemstyles.mapcss
@@ -1819,6 +1819,9 @@ node[advertising=column] {
icon-image: "presets/leisure/advertising_column.svg";
set icon_z17;
}
+area[advertising=column] {
+ fill-color: advertising#880000;
+}
node[advertising=billboard] {
icon-image: "presets/leisure/billboard.svg";
set icon_z17;
diff --git a/test/data/create_multipolygon.osm b/test/data/create_multipolygon.osm
index f616baf..098f63e 100644
--- a/test/data/create_multipolygon.osm
+++ b/test/data/create_multipolygon.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-38' action='modify' visible='true' lat='47.265124621055826' lon='11.28482073183536' />
<node id='-36' action='modify' visible='true' lat='47.253175055149' lon='11.261554365976664' />
<node id='-34' action='modify' visible='true' lat='47.23274480805068' lon='11.301709059176806' />
diff --git a/test/data/multipolygon.osm b/test/data/multipolygon.osm
index 82c5363..a68f47d 100644
--- a/test/data/multipolygon.osm
+++ b/test/data/multipolygon.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-11' action='modify' visible='true' lat='47.26512462106' lon='11.28482073184' />
<node id='-13' action='modify' visible='true' lat='47.25317505515' lon='11.26155436598' />
<node id='-15' action='modify' visible='true' lat='47.23274480805' lon='11.30170905918' />
diff --git a/test/data/orthogonalize.osm b/test/data/orthogonalize.osm
index 3512c88..e0ff9a5 100644
--- a/test/data/orthogonalize.osm
+++ b/test/data/orthogonalize.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='false' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-164' action='modify' visible='true' lat='8.53882631502' lon='55.72982273659' />
<node id='-166' action='modify' visible='true' lat='8.53692765033' lon='55.73148512506' />
<node id='-168' action='modify' visible='true' lat='8.53901816563' lon='55.7313279173' />
diff --git a/test/data/regress/10511/10511_mini.osm b/test/data/regress/10511/10511_mini.osm
index a8d4e4c..a953cf4 100644
--- a/test/data/regress/10511/10511_mini.osm
+++ b/test/data/regress/10511/10511_mini.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-68' action='modify' visible='true' lat='55.18135539257' lon='-7.98285399308'>
<tag k='ref' v='D' />
</node>
diff --git a/test/data/regress/11957/data.osm b/test/data/regress/11957/data.osm
index 0182601..a290850 100644
--- a/test/data/regress/11957/data.osm
+++ b/test/data/regress/11957/data.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='30203000' timestamp='2012-06-04T07:43:48Z' uid='207581' user='Hjart' visible='true' version='4' changeset='11793732' lat='55.510607' lon='8.4295289' />
<node id='30203008' timestamp='2010-12-04T12:37:53Z' uid='207581' user='Hjart' visible='true' version='4' changeset='6537026' lat='55.5078651' lon='8.4287936' />
<node id='35213705' timestamp='2010-12-04T10:40:06Z' uid='80543' user='findvej' visible='true' version='2' changeset='6535476' lat='55.507892' lon='8.4307184' />
diff --git a/test/data/regress/11992/shapes.osm b/test/data/regress/11992/shapes.osm
index 2390548..7bbae3d 100644
--- a/test/data/regress/11992/shapes.osm
+++ b/test/data/regress/11992/shapes.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-1233' action='modify' visible='true' lat='32.74435355378' lon='-98.11030215517' />
<node id='-1231' action='modify' visible='true' lat='32.74435355378' lon='-98.11179283942' />
<node id='-1229' action='modify' visible='true' lat='32.74989438578' lon='-98.10903651443' />
diff --git a/test/data/regress/12038/data.osm b/test/data/regress/12038/data.osm
index 0792950..dea1dfb 100644
--- a/test/data/regress/12038/data.osm
+++ b/test/data/regress/12038/data.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='2267121941' timestamp='2013-04-14T15:30:32Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8861199' lon='-0.4203613' />
<node id='2267121957' timestamp='2013-04-14T15:30:32Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8849974' lon='-0.404549' />
<node id='2267121963' timestamp='2013-04-14T15:30:33Z' uid='30525' user='The Maarssen Mapper' visible='true' version='1' changeset='15726107' lat='50.8885628' lon='-0.4263867' />
diff --git a/test/data/regress/12436/example.osm b/test/data/regress/12436/example.osm
index a3bdcf6..f80911e 100644
--- a/test/data/regress/12436/example.osm
+++ b/test/data/regress/12436/example.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<bounds minlat='-22.3688439' minlon='-48.7448984' maxlat='-22.3679077' maxlon='-48.7435258' origin='CGImap 0.4.0 (6997 thorn-01.openstreetmap.org)' />
<bounds minlat='-22.3688439' minlon='-48.7448984' maxlat='-22.3679077' maxlon='-48.7435258' origin='OpenStreetMap server' />
<node id='-25' action='modify' visible='true' lat='-22.36825791811' lon='-48.74347164191' />
diff --git a/test/data/regress/12464/example.osm b/test/data/regress/12464/example.osm
index 8da5870..80f7d1b 100644
--- a/test/data/regress/12464/example.osm
+++ b/test/data/regress/12464/example.osm
@@ -1,4 +1,4 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-30' action='modify' visible='true' lat='-22.36830614198' lon='-48.7442054335' />
</osm>
diff --git a/test/data/regress/12627/overlapping.osm b/test/data/regress/12627/overlapping.osm
index e409c4f..6319320 100644
--- a/test/data/regress/12627/overlapping.osm
+++ b/test/data/regress/12627/overlapping.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-25' action='modify' visible='true' lat='-22.58401175177' lon='-47.41447678914' />
<node id='-28' action='modify' visible='true' lat='-22.58366442745' lon='-47.41407254727' />
<node id='-32' action='modify' visible='true' lat='-22.58386141747' lon='-47.4137890165' />
diff --git a/test/data/regress/14199/emptytag.osm b/test/data/regress/14199/emptytag.osm
index de7943a..2c9c6e6 100644
--- a/test/data/regress/14199/emptytag.osm
+++ b/test/data/regress/14199/emptytag.osm
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<osm version="0.6" generator="CGImap 0.5.8 (19275 thorn-01.openstreetmap.org)" copyright="OpenStreetMap and contributors" attribution="http://www.openstreetmap.org/copyright" license="http://opendatacommons.org/licenses/odbl/1-0/">
+<osm version="0.6" upload='never' generator="CGImap 0.5.8 (19275 thorn-01.openstreetmap.org)" copyright="OpenStreetMap and contributors" attribution="http://www.openstreetmap.org/copyright" license="http://opendatacommons.org/licenses/odbl/1-0/">
<node id="4577848024" visible="true" version="1" changeset="44736411" timestamp="2016-12-28T17:22:56Z" user="Winterstein" uid="5037969" lat="50.3679419" lon="8.6680577"/>
<node id="4577848025" visible="true" version="1" changeset="44736411" timestamp="2016-12-28T17:22:56Z" user="Winterstein" uid="5037969" lat="50.3680086" lon="8.6682089"/>
<node id="4577848026" visible="true" version="1" changeset="44736411" timestamp="2016-12-28T17:22:56Z" user="Winterstein" uid="5037969" lat="50.3679112" lon="8.6683148"/>
diff --git a/test/data/regress/14287/example.osm b/test/data/regress/14287/example.osm
index cf3fef6..63fd766 100644
--- a/test/data/regress/14287/example.osm
+++ b/test/data/regress/14287/example.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-30910' action='modify' visible='true' lat='-23.50408988778' lon='-51.13765049621' />
<node id='-30911' action='modify' visible='true' lat='-23.50516007238' lon='-51.13802724884' />
<node id='-30913' action='modify' visible='true' lat='-23.50562134566' lon='-51.13646913871' />
diff --git a/test/data/regress/14289/example2.osm b/test/data/regress/14289/example2.osm
index 242dd6c..a1e6590 100644
--- a/test/data/regress/14289/example2.osm
+++ b/test/data/regress/14289/example2.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-30485' action='modify' visible='true' lat='-23.2277275943' lon='-51.12651457665' />
<node id='-30487' action='modify' visible='true' lat='-23.22434907439' lon='-51.12226912293' />
<node id='-30489' action='modify' visible='true' lat='-23.22804935364' lon='-51.12318824177' />
diff --git a/test/data/renderer/area-fill-color/data.osm b/test/data/renderer/area-fill-color/data.osm
index 58b9129..b3c5ffd 100644
--- a/test/data/renderer/area-fill-color/data.osm
+++ b/test/data/renderer/area-fill-color/data.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-38186' action='modify' visible='true' lat='0.1' lon='0.1'>
<tag k='test' v='yes' />
</node>
diff --git a/test/data/renderer/area-fill-color/reference.png b/test/data/renderer/area-fill-color/reference.png
index 7c2c9ec..6675b2d 100644
Binary files a/test/data/renderer/area-fill-color/reference.png and b/test/data/renderer/area-fill-color/reference.png differ
diff --git a/test/data/renderer/area-fill-image/data.osm b/test/data/renderer/area-fill-image/data.osm
index 58b9129..b3c5ffd 100644
--- a/test/data/renderer/area-fill-image/data.osm
+++ b/test/data/renderer/area-fill-image/data.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-38186' action='modify' visible='true' lat='0.1' lon='0.1'>
<tag k='test' v='yes' />
</node>
diff --git a/test/data/renderer/area-icon/data.osm b/test/data/renderer/area-icon/data.osm
index 8db51d1..61c8e33 100644
--- a/test/data/renderer/area-icon/data.osm
+++ b/test/data/renderer/area-icon/data.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-39682' action='modify' visible='true' lat='0.1' lon='0.1'>
<tag k='test' v='yes' />
</node>
diff --git a/test/data/renderer/area-icon/reference.png b/test/data/renderer/area-icon/reference.png
index ce8663c..557010e 100644
Binary files a/test/data/renderer/area-icon/reference.png and b/test/data/renderer/area-icon/reference.png differ
diff --git a/test/data/renderer/area-text/data.osm b/test/data/renderer/area-text/data.osm
index 30c4b99..12771d8 100644
--- a/test/data/renderer/area-text/data.osm
+++ b/test/data/renderer/area-text/data.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-34148' action='modify' visible='true' lat='0.1' lon='0.1'>
<tag k='test' v='yes' />
</node>
diff --git a/test/data/renderer/area-text/reference.png b/test/data/renderer/area-text/reference.png
index be40bdb..92e0101 100644
Binary files a/test/data/renderer/area-text/reference.png and b/test/data/renderer/area-text/reference.png differ
diff --git a/test/data/renderer/node-shapes/data.osm b/test/data/renderer/node-shapes/data.osm
index 5243a9b..d0e6c28 100644
--- a/test/data/renderer/node-shapes/data.osm
+++ b/test/data/renderer/node-shapes/data.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-30470' action='modify' visible='true' lat='0.1' lon='0.1'>
<tag k='test' v='heptagon' />
</node>
diff --git a/test/data/renderer/node-shapes/reference.png b/test/data/renderer/node-shapes/reference.png
index 59728d9..124260d 100644
Binary files a/test/data/renderer/node-shapes/reference.png and b/test/data/renderer/node-shapes/reference.png differ
diff --git a/test/data/renderer/node-text/data.osm b/test/data/renderer/node-text/data.osm
index 6c212e1..c033b12 100644
--- a/test/data/renderer/node-text/data.osm
+++ b/test/data/renderer/node-text/data.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-30552' action='modify' visible='true' lat='0.1' lon='0.1' >
<tag k='test' v='n21' />
</node>
diff --git a/test/data/renderer/node-text/reference.png b/test/data/renderer/node-text/reference.png
index 9456c24..8c7cc3a 100644
Binary files a/test/data/renderer/node-text/reference.png and b/test/data/renderer/node-text/reference.png differ
diff --git a/test/data/renderer/order/data.osm b/test/data/renderer/order/data.osm
index 3faa8fe..33c992b 100644
--- a/test/data/renderer/order/data.osm
+++ b/test/data/renderer/order/data.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-38186' action='modify' visible='true' lat='0.08142622568' lon='0.07081260365'>
<tag k='color' v='EndNode' />
</node>
diff --git a/test/data/renderer/order/reference.png b/test/data/renderer/order/reference.png
index 87bc4f7..94cacf0 100644
Binary files a/test/data/renderer/order/reference.png and b/test/data/renderer/order/reference.png differ
diff --git a/test/data/renderer/way-color/data.osm b/test/data/renderer/way-color/data.osm
index fe110d2..47465a7 100644
--- a/test/data/renderer/way-color/data.osm
+++ b/test/data/renderer/way-color/data.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-30552' action='modify' visible='true' lat='0.1' lon='0.1' />
<node id='-30554' action='modify' visible='true' lat='0.15' lon='0.3' />
<node id='-30556' action='modify' visible='true' lat='0.1' lon='0.5' />
diff --git a/test/data/renderer/way-color/reference.png b/test/data/renderer/way-color/reference.png
index f446a99..0224522 100644
Binary files a/test/data/renderer/way-color/reference.png and b/test/data/renderer/way-color/reference.png differ
diff --git a/test/data/renderer/way-dashes/data.osm b/test/data/renderer/way-dashes/data.osm
index fe110d2..47465a7 100644
--- a/test/data/renderer/way-dashes/data.osm
+++ b/test/data/renderer/way-dashes/data.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-30552' action='modify' visible='true' lat='0.1' lon='0.1' />
<node id='-30554' action='modify' visible='true' lat='0.15' lon='0.3' />
<node id='-30556' action='modify' visible='true' lat='0.1' lon='0.5' />
diff --git a/test/data/renderer/way-dashes/reference.png b/test/data/renderer/way-dashes/reference.png
index f109f97..b4f336f 100644
Binary files a/test/data/renderer/way-dashes/reference.png and b/test/data/renderer/way-dashes/reference.png differ
diff --git a/test/data/renderer/way-width/data.osm b/test/data/renderer/way-width/data.osm
index e99dc1a..652d199 100644
--- a/test/data/renderer/way-width/data.osm
+++ b/test/data/renderer/way-width/data.osm
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
<node id='-30552' action='modify' visible='true' lat='0.1' lon='0.1' />
<node id='-30554' action='modify' visible='true' lat='0.1' lon='0.3' />
<node id='-30556' action='modify' visible='true' lat='0.1' lon='0.5' />
diff --git a/test/data/renderer/way-width/reference.png b/test/data/renderer/way-width/reference.png
index 1adbda7..4ff9451 100644
Binary files a/test/data/renderer/way-width/reference.png and b/test/data/renderer/way-width/reference.png differ
diff --git a/test/data/sessions/data.osm b/test/data/sessions/data.osm
index 05d78aa..a7fcecf 100644
--- a/test/data/sessions/data.osm
+++ b/test/data/sessions/data.osm
@@ -1,3 +1,3 @@
<?xml version='1.0' encoding='UTF-8'?>
-<osm version='0.6' upload='true' generator='JOSM'>
+<osm version='0.6' upload='never' generator='JOSM'>
</osm>
diff --git a/test/unit/org/CustomMatchers.java b/test/unit/org/CustomMatchers.java
index 1b20636..33b0cce 100644
--- a/test/unit/org/CustomMatchers.java
+++ b/test/unit/org/CustomMatchers.java
@@ -3,6 +3,7 @@ package org;
import java.awt.geom.Point2D;
import java.util.Collection;
+import java.util.Objects;
import java.util.function.Predicate;
import org.hamcrest.CustomTypeSafeMatcher;
@@ -87,7 +88,7 @@ public final class CustomMatchers {
* @return matcher for a point at a given location
*/
public static Matcher<? super Point2D> is(final Point2D expected) {
- return new CustomTypeSafeMatcher<Point2D>("the same Point2D") {
+ return new CustomTypeSafeMatcher<Point2D>(Objects.toString(expected)) {
@Override
protected boolean matchesSafely(Point2D actual) {
return expected.distance(actual) <= 0.0000001;
@@ -101,7 +102,7 @@ public final class CustomMatchers {
* @return matcher for a point at a given location
*/
public static Matcher<? super LatLon> is(final LatLon expected) {
- return new CustomTypeSafeMatcher<LatLon>("the same LatLon") {
+ return new CustomTypeSafeMatcher<LatLon>(Objects.toString(expected)) {
@Override
protected boolean matchesSafely(LatLon actual) {
return Math.abs(expected.getX() - actual.getX()) <= LatLon.MAX_SERVER_PRECISION
@@ -116,7 +117,7 @@ public final class CustomMatchers {
* @return matcher for a point at a given location
*/
public static Matcher<? super EastNorth> is(final EastNorth expected) {
- return new CustomTypeSafeMatcher<EastNorth>("the same EastNorth") {
+ return new CustomTypeSafeMatcher<EastNorth>(Objects.toString(expected)) {
@Override
protected boolean matchesSafely(EastNorth actual) {
return Math.abs(expected.getX() - actual.getX()) <= LatLon.MAX_SERVER_PRECISION
diff --git a/test/unit/org/openstreetmap/josm/JOSMFixture.java b/test/unit/org/openstreetmap/josm/JOSMFixture.java
index 800af7c..7d33bd0 100644
--- a/test/unit/org/openstreetmap/josm/JOSMFixture.java
+++ b/test/unit/org/openstreetmap/josm/JOSMFixture.java
@@ -21,6 +21,7 @@ import org.openstreetmap.josm.gui.util.GuiHelper;
import org.openstreetmap.josm.io.CertificateAmendment;
import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.tools.I18n;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.Logging;
/**
@@ -110,7 +111,7 @@ public class JOSMFixture {
try {
CertificateAmendment.addMissingCertificates();
} catch (IOException | GeneralSecurityException ex) {
- throw new RuntimeException(ex);
+ throw new JosmRuntimeException(ex);
}
// init projection
diff --git a/test/unit/org/openstreetmap/josm/MainTest.java b/test/unit/org/openstreetmap/josm/MainTest.java
index ab3b39e..05bb0bd 100644
--- a/test/unit/org/openstreetmap/josm/MainTest.java
+++ b/test/unit/org/openstreetmap/josm/MainTest.java
@@ -2,18 +2,36 @@
package org.openstreetmap.josm;
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 java.awt.event.KeyEvent;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.file.Paths;
import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
import javax.swing.UIManager;
import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.Main.DownloadParamType;
+import org.openstreetmap.josm.Main.InitStatusListener;
+import org.openstreetmap.josm.Main.InitializationTask;
+import org.openstreetmap.josm.actions.AboutAction;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.MapFrameListener;
+import org.openstreetmap.josm.gui.ProgramArguments;
+import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.io.OnlineResource;
import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Shortcut;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -27,7 +45,7 @@ public class MainTest {
*/
@Rule
@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
- public JOSMTestRules test = new JOSMTestRules().platform();
+ public JOSMTestRules test = new JOSMTestRules().platform().devAPI();
/**
* Unit test of {@link DownloadParamType#paramType} method.
@@ -54,18 +72,22 @@ public class MainTest {
// Correct behaviour with errors
Main.error(new Exception("exception_error"));
Main.error("Error message on one line");
+ Main.error("Error message with {0}", "param");
Main.error("First line of error message on several lines\nline2\nline3\nline4");
Collection<String> errors = Main.getLastErrorAndWarnings();
assertTrue(errors.contains("E: java.lang.Exception: exception_error"));
+ assertTrue(errors.contains("E: Error message with param"));
assertTrue(errors.contains("E: Error message on one line"));
assertTrue(errors.contains("E: First line of error message on several lines"));
// Correct behaviour with warnings
Main.warn(new Exception("exception_warn", new Exception("root_cause")));
+ Main.warn(new Exception("exception_warn_bool"), true);
Main.warn("Warning message on one line");
Main.warn("First line of warning message on several lines\nline2\nline3\nline4");
Collection<String> warnings = Main.getLastErrorAndWarnings();
assertTrue(warnings.contains("W: java.lang.Exception: exception_warn. Cause: java.lang.Exception: root_cause"));
+ assertTrue(warnings.contains("W: java.lang.Exception: exception_warn_bool"));
assertTrue(warnings.contains("W: Warning message on one line"));
assertTrue(warnings.contains("W: First line of warning message on several lines"));
}
@@ -80,4 +102,190 @@ public class MainTest {
assertEquals(Main.pref.get("laf", Main.platform.getDefaultStyle()), UIManager.getLookAndFeel().getClass().getCanonicalName());
assertNotNull(Main.toolbar);
}
+
+ /**
+ * Unit test of {@link Main#postConstructorProcessCmdLine} - empty case.
+ */
+ @Test
+ public void testPostConstructorProcessCmdLineEmpty() {
+ // Check the method accepts no arguments
+ Main.postConstructorProcessCmdLine(new ProgramArguments(new String[0]));
+ }
+
+ private static void doTestPostConstructorProcessCmdLine(String download, String downloadGps, boolean gpx) {
+ assertNull(Main.getLayerManager().getEditDataSet());
+ for (Future<?> f : Main.postConstructorProcessCmdLine(new ProgramArguments(new String[]{
+ "--download=" + download,
+ "--downloadgps=" + downloadGps,
+ "--selection=type: node"}))) {
+ try {
+ f.get();
+ } catch (InterruptedException | ExecutionException e) {
+ Main.error(e);
+ }
+ }
+ DataSet ds = Main.getLayerManager().getEditDataSet();
+ assertNotNull(ds);
+ assertFalse(ds.getSelected().isEmpty());
+ Main.getLayerManager().removeLayer(Main.getLayerManager().getEditLayer());
+ if (gpx) {
+ List<GpxLayer> gpxLayers = Main.getLayerManager().getLayersOfType(GpxLayer.class);
+ assertEquals(1, gpxLayers.size());
+ Main.getLayerManager().removeLayer(gpxLayers.iterator().next());
+ }
+ }
+
+ /**
+ * Unit test of {@link Main#postConstructorProcessCmdLine} - nominal case with bounds.
+ * This test assumes the DEV API contains nodes around 0,0 and GPX tracks around London
+ */
+ @Test
+ public void testPostConstructorProcessCmdLineBounds() {
+ doTestPostConstructorProcessCmdLine(
+ "0.01,0.01,0.05,0.05",
+ "51.35,-0.4,51.60,0.2", true);
+ }
+
+ /**
+ * Unit test of {@link Main#postConstructorProcessCmdLine} - nominal case with http/https URLs.
+ * This test assumes the DEV API contains nodes around 0,0 and GPX tracks around London
+ */
+ @Test
+ public void testPostConstructorProcessCmdLineHttpUrl() {
+ doTestPostConstructorProcessCmdLine(
+ "http://api06.dev.openstreetmap.org/api/0.6/map?bbox=0.01,0.01,0.05,0.05",
+ "https://master.apis.dev.openstreetmap.org/api/0.6/trackpoints?bbox=-0.4,51.35,0.2,51.6&page=0", true);
+ }
+
+ /**
+ * Unit test of {@link Main#postConstructorProcessCmdLine} - nominal case with file URLs.
+ * @throws MalformedURLException if an error occurs
+ */
+ @Test
+ public void testPostConstructorProcessCmdLineFileUrl() throws MalformedURLException {
+ doTestPostConstructorProcessCmdLine(
+ Paths.get(TestUtils.getTestDataRoot() + "multipolygon.osm").toUri().toURL().toExternalForm(),
+ Paths.get(TestUtils.getTestDataRoot() + "minimal.gpx").toUri().toURL().toExternalForm(), false);
+ }
+
+ /**
+ * Unit test of {@link Main#postConstructorProcessCmdLine} - nominal case with file names.
+ * @throws MalformedURLException if an error occurs
+ */
+ @Test
+ public void testPostConstructorProcessCmdLineFilename() throws MalformedURLException {
+ doTestPostConstructorProcessCmdLine(
+ Paths.get(TestUtils.getTestDataRoot() + "multipolygon.osm").toFile().getAbsolutePath(),
+ Paths.get(TestUtils.getTestDataRoot() + "minimal.gpx").toFile().getAbsolutePath(), false);
+ }
+
+ /**
+ * Unit test of {@link DownloadParamType} enum.
+ */
+ @Test
+ public void testEnumDownloadParamType() {
+ TestUtils.superficialEnumCodeCoverage(DownloadParamType.class);
+ }
+
+ /**
+ * Unit test of {@link Main#getBaseUserUrl}.
+ */
+ @Test
+ public void testGetBaseUserUrl() {
+ assertEquals("http://api06.dev.openstreetmap.org/user", Main.getBaseUserUrl());
+ }
+
+ /**
+ * Unit test of {@link Main#addNetworkError}, {@link Main#getNetworkErrors} and {@link Main#clearNetworkErrors}.
+ * @throws MalformedURLException if any error occurs
+ */
+ @Test
+ public void testNetworkErrors() throws MalformedURLException {
+ Main.clearNetworkErrors();
+ assertTrue(Main.getNetworkErrors().isEmpty());
+ Main.addNetworkError("http://url1", new Exception("exception_1"));
+ Main.addNetworkError(new URL("http://url2"), new Exception("exception_2"));
+ Map<String, Throwable> errors = Main.getNetworkErrors();
+ assertEquals(2, errors.size());
+ assertEquals("exception_1", errors.get("http://url1").getMessage());
+ assertEquals("exception_2", errors.get("http://url2").getMessage());
+ Main.clearNetworkErrors();
+ assertTrue(Main.getNetworkErrors().isEmpty());
+ }
+
+ /**
+ * Unit test of {@link Main#setOffline} and {@link Main#getOfflineResources}.
+ */
+ @Test
+ public void testOfflineRessources() {
+ Main.setOnline(OnlineResource.ALL);
+ assertTrue(Main.getOfflineResources().isEmpty());
+ assertFalse(Main.isOffline(OnlineResource.JOSM_WEBSITE));
+ Main.setOffline(OnlineResource.JOSM_WEBSITE);
+ assertTrue(Main.isOffline(OnlineResource.JOSM_WEBSITE));
+ Main.setOnline(OnlineResource.JOSM_WEBSITE);
+ assertFalse(Main.isOffline(OnlineResource.JOSM_WEBSITE));
+ Main.setOffline(OnlineResource.ALL);
+ assertTrue(Main.isOffline(OnlineResource.JOSM_WEBSITE));
+ assertTrue(Main.isOffline(OnlineResource.OSM_API));
+ Main.setOnline(OnlineResource.ALL);
+ }
+
+ /**
+ * Unit test of {@link Main#getRegisteredActionShortcut}.
+ */
+ @Test
+ public void testGetRegisteredActionShortcut() {
+ Shortcut noKeystroke = Shortcut.registerShortcut("no", "keystroke", 0, 0);
+ assertNull(noKeystroke.getKeyStroke());
+ assertNull(Main.getRegisteredActionShortcut(noKeystroke));
+ Shortcut noAction = Shortcut.registerShortcut("foo", "bar", KeyEvent.VK_AMPERSAND, Shortcut.SHIFT);
+ assertNotNull(noAction.getKeyStroke());
+ assertNull(Main.getRegisteredActionShortcut(noAction));
+ AboutAction about = new AboutAction();
+ assertEquals(about, Main.getRegisteredActionShortcut(about.getShortcut()));
+ }
+
+ /**
+ * Unit test of {@link Main#addMapFrameListener} and {@link Main#removeMapFrameListener}.
+ */
+ @Test
+ public void testMapFrameListener() {
+ MapFrameListener listener = (o, n) -> { };
+ assertTrue(Main.addMapFrameListener(listener));
+ assertFalse(Main.addMapFrameListener(null));
+ assertTrue(Main.removeMapFrameListener(listener));
+ assertFalse(Main.removeMapFrameListener(null));
+ }
+
+ private static class InitStatusListenerStub implements InitStatusListener {
+
+ boolean updated;
+ boolean finished;
+
+ @Override
+ public Object updateStatus(String event) {
+ updated = true;
+ return null;
+ }
+
+ @Override
+ public void finish(Object status) {
+ finished = true;
+ }
+ }
+
+ /**
+ * Unit test of {@link Main#setInitStatusListener}.
+ */
+ @Test
+ public void testSetInitStatusListener() {
+ InitStatusListenerStub listener = new InitStatusListenerStub();
+ Main.setInitStatusListener(listener);
+ assertFalse(listener.updated);
+ assertFalse(listener.finished);
+ new InitializationTask("", () -> { }).call();
+ assertTrue(listener.updated);
+ assertTrue(listener.finished);
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/TestUtils.java b/test/unit/org/openstreetmap/josm/TestUtils.java
index 2f6e290..45edb13 100644
--- a/test/unit/org/openstreetmap/josm/TestUtils.java
+++ b/test/unit/org/openstreetmap/josm/TestUtils.java
@@ -1,6 +1,7 @@
// License: GPL. For details, see LICENSE file.
package org.openstreetmap.josm;
+import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
import java.awt.Component;
@@ -9,6 +10,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Field;
+import java.lang.reflect.Method;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Arrays;
@@ -28,6 +30,8 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor;
import org.openstreetmap.josm.gui.progress.ProgressTaskId;
import org.openstreetmap.josm.io.Compression;
import org.openstreetmap.josm.testutils.FakeGraphics;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.Utils;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -285,4 +289,21 @@ public final class TestUtils {
}
};
}
+
+ /**
+ * Ensures 100% code coverage for enums.
+ * @param enumClass enum class to cover
+ */
+ public static void superficialEnumCodeCoverage(Class<? extends Enum<?>> enumClass) {
+ try {
+ Method values = enumClass.getMethod("values");
+ Method valueOf = enumClass.getMethod("valueOf", String.class);
+ Utils.setObjectsAccessible(values, valueOf);
+ for (Object o : (Object[]) values.invoke(null)) {
+ assertEquals(o, valueOf.invoke(null, ((Enum<?>) o).name()));
+ }
+ } catch (IllegalArgumentException | ReflectiveOperationException | SecurityException e) {
+ throw new JosmRuntimeException(e);
+ }
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/actions/ExtensionFileFilterTest.java b/test/unit/org/openstreetmap/josm/actions/ExtensionFileFilterTest.java
index 619ee5e..460691b 100644
--- a/test/unit/org/openstreetmap/josm/actions/ExtensionFileFilterTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/ExtensionFileFilterTest.java
@@ -4,6 +4,8 @@ package org.openstreetmap.josm.actions;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.actions.ExtensionFileFilter.AddArchiveExtension;
import nl.jqno.equalsverifier.EqualsVerifier;
import nl.jqno.equalsverifier.Warning;
@@ -46,4 +48,12 @@ public class ExtensionFileFilterTest {
.suppress(Warning.ANNOTATION) // FIXME: remove it after https://github.com/jqno/equalsverifier/issues/152 is fixed
.verify();
}
+
+ /**
+ * Unit test of {@link AddArchiveExtension} enum.
+ */
+ @Test
+ public void testEnumAddArchiveExtension() {
+ TestUtils.superficialEnumCodeCoverage(AddArchiveExtension.class);
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/actions/MergeLayerActionTest.java b/test/unit/org/openstreetmap/josm/actions/MergeLayerActionTest.java
new file mode 100644
index 0000000..c9fb7c1
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/actions/MergeLayerActionTest.java
@@ -0,0 +1,81 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.gui.layer.LayerManagerTest.TestLayer;
+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 MergeLayerAction}.
+ */
+public class MergeLayerActionTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules().platform().commands();
+
+ private MergeLayerAction action;
+
+ /**
+ * Setup test.
+ */
+ @Before
+ public void setUp() {
+ if (action == null) {
+ action = new MergeLayerAction();
+ }
+ for (TestLayer testLayer : Main.getLayerManager().getLayersOfType(TestLayer.class)) {
+ Main.getLayerManager().removeLayer(testLayer);
+ }
+ }
+
+ /**
+ * Tests that no error occurs when no source layer exists.
+ */
+ @Test
+ public void testMergeNoSourceLayer() {
+ assertNull(Main.getLayerManager().getActiveLayer());
+ action.actionPerformed(null);
+ assertEquals(0, Main.getLayerManager().getLayers().size());
+ }
+
+ /**
+ * Tests that no error occurs when no target layer exists.
+ */
+ @Test
+ public void testMergeNoTargetLayer() {
+ OsmDataLayer layer = new OsmDataLayer(new DataSet(), "", null);
+ Main.getLayerManager().addLayer(layer);
+ assertEquals(1, Main.getLayerManager().getLayers().size());
+ assertNull(action.merge(layer));
+ assertEquals(1, Main.getLayerManager().getLayers().size());
+ }
+
+ /**
+ * Tests that the merge is done with two empty layers.
+ * @throws Exception if any error occurs
+ */
+ @Test
+ public void testMergeTwoEmptyLayers() throws Exception {
+ OsmDataLayer layer1 = new OsmDataLayer(new DataSet(), "1", null);
+ OsmDataLayer layer2 = new OsmDataLayer(new DataSet(), "2", null);
+ Main.getLayerManager().addLayer(layer1);
+ Main.getLayerManager().addLayer(layer2);
+ assertEquals(2, Main.getLayerManager().getLayers().size());
+ action.merge(layer2).get();
+ assertEquals(1, Main.getLayerManager().getLayers().size());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/actions/MoveActionTest.java b/test/unit/org/openstreetmap/josm/actions/MoveActionTest.java
new file mode 100644
index 0000000..72c9f59
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/actions/MoveActionTest.java
@@ -0,0 +1,20 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions;
+
+import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.actions.MoveAction.Direction;
+
+/**
+ * Unit tests for class {@link ExtensionFileFilter}.
+ */
+public class MoveActionTest {
+
+ /**
+ * Unit test of {@link Direction} enum.
+ */
+ @Test
+ public void testEnumDirection() {
+ TestUtils.superficialEnumCodeCoverage(Direction.class);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/actions/OrthogonalizeActionTest.java b/test/unit/org/openstreetmap/josm/actions/OrthogonalizeActionTest.java
index 6a02129..22b2005 100644
--- a/test/unit/org/openstreetmap/josm/actions/OrthogonalizeActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/OrthogonalizeActionTest.java
@@ -10,21 +10,22 @@ import java.util.List;
import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.actions.OrthogonalizeAction.Direction;
import org.openstreetmap.josm.actions.search.SearchCompiler;
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.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.io.OsmReader;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import org.openstreetmap.josm.tools.Geometry;
import org.openstreetmap.josm.tools.SubclassFilteredCollection;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
/**
- * Unit tests for class {@link OsmDataLayer}.
+ * Unit tests for class {@link OrthogonalizeAction}.
*/
public class OrthogonalizeActionTest {
@@ -33,7 +34,7 @@ public class OrthogonalizeActionTest {
*/
@Rule
@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
- public JOSMTestRules test = new JOSMTestRules();
+ public JOSMTestRules test = new JOSMTestRules().projection();
@Test(expected = OrthogonalizeAction.InvalidUserInputException.class)
public void testNoSelection() throws Exception {
@@ -83,6 +84,15 @@ public class OrthogonalizeActionTest {
assertEquals(new LatLon(8.5320550, 55.7306805), nodes.get(3).getCoor().getRoundedToOsmPrecision());
}
+ /**
+ * Tests that {@code OrthogonalizeAction.EN} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(OrthogonalizeAction.EN.class);
+ }
+
DataSet performTest(String... search) throws Exception {
try (FileInputStream in = new FileInputStream(TestUtils.getTestDataRoot() + "orthogonalize.osm")) {
final DataSet ds = OsmReader.parseDataSet(in, null);
@@ -100,4 +110,12 @@ public class OrthogonalizeActionTest {
way.getNode(i - 1).getEastNorth(), way.getNode(i).getEastNorth(), way.getNode(i + 1).getEastNorth()), 1e-6);
}
}
+
+ /**
+ * Unit test of {@link Direction} enum.
+ */
+ @Test
+ public void testEnumDirection() {
+ TestUtils.superficialEnumCodeCoverage(Direction.class);
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/actions/SelectByInternalPointActionTest.java b/test/unit/org/openstreetmap/josm/actions/SelectByInternalPointActionTest.java
index c5ff722..72c46de 100644
--- a/test/unit/org/openstreetmap/josm/actions/SelectByInternalPointActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/SelectByInternalPointActionTest.java
@@ -20,6 +20,7 @@ import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
/**
* Unit tests for class {@link SelectByInternalPointAction}.
@@ -34,6 +35,15 @@ public final class SelectByInternalPointActionTest {
public JOSMTestRules rules = new JOSMTestRules().preferences().projection();
/**
+ * Tests that {@code SelectByInternalPointAction} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(SelectByInternalPointAction.class);
+ }
+
+ /**
* Unit test - no dataset.
*/
@Test
diff --git a/test/unit/org/openstreetmap/josm/actions/mapmode/DeleteActionTest.java b/test/unit/org/openstreetmap/josm/actions/mapmode/DeleteActionTest.java
index 2961299..f51b2b7 100644
--- a/test/unit/org/openstreetmap/josm/actions/mapmode/DeleteActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/mapmode/DeleteActionTest.java
@@ -7,6 +7,8 @@ import static org.junit.Assert.assertTrue;
import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.actions.mapmode.DeleteAction.DeleteMode;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -42,4 +44,12 @@ public class DeleteActionTest {
Main.getLayerManager().removeLayer(layer);
}
}
+
+ /**
+ * Unit test of {@link DeleteMode} enum.
+ */
+ @Test
+ public void testEnumDeleteMode() {
+ TestUtils.superficialEnumCodeCoverage(DeleteMode.class);
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java b/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java
index 13ffa36..98f9fac 100644
--- a/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/mapmode/DrawActionTest.java
@@ -21,11 +21,9 @@ 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.Way;
-import org.openstreetmap.josm.gui.MapFrame;
import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.testutils.JOSMTestRules;
-import org.openstreetmap.josm.tools.Utils;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -55,9 +53,8 @@ public class DrawActionTest {
OsmDataLayer layer = new OsmDataLayer(dataSet, OsmDataLayer.createNewName(), null);
Main.getLayerManager().addLayer(layer);
- Field mapView = MapFrame.class.getDeclaredField("mapView");
- Utils.setObjectsAccessible(mapView);
- mapView.set(Main.map, new MapViewMock());
+ // fix map view position
+ Main.map.mapView.zoomTo(new EastNorth(0, 0), 1);
Node n1 = new Node(new EastNorth(0, 0));
Node n2 = new Node(new EastNorth(100, 0));
diff --git a/test/unit/org/openstreetmap/josm/actions/mapmode/ExtrudeActionTest.java b/test/unit/org/openstreetmap/josm/actions/mapmode/ExtrudeActionTest.java
index 24de8a2..9679f8b 100644
--- a/test/unit/org/openstreetmap/josm/actions/mapmode/ExtrudeActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/mapmode/ExtrudeActionTest.java
@@ -7,6 +7,8 @@ import static org.junit.Assert.assertTrue;
import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.actions.mapmode.ExtrudeAction.Mode;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -42,4 +44,12 @@ public class ExtrudeActionTest {
Main.getLayerManager().removeLayer(layer);
}
}
+
+ /**
+ * Unit test of {@link Mode} enum.
+ */
+ @Test
+ public void testEnumMode() {
+ TestUtils.superficialEnumCodeCoverage(Mode.class);
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyActionTest.java b/test/unit/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyActionTest.java
index b6559ba..f008179 100644
--- a/test/unit/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyActionTest.java
@@ -7,6 +7,8 @@ import static org.junit.Assert.assertTrue;
import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.actions.mapmode.ImproveWayAccuracyAction.State;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -42,4 +44,12 @@ public class ImproveWayAccuracyActionTest {
Main.getLayerManager().removeLayer(layer);
}
}
+
+ /**
+ * Unit test of {@link State} enum.
+ */
+ @Test
+ public void testEnumState() {
+ TestUtils.superficialEnumCodeCoverage(State.class);
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/actions/mapmode/MapViewMock.java b/test/unit/org/openstreetmap/josm/actions/mapmode/MapViewMock.java
index e066b37..0d5512f 100644
--- a/test/unit/org/openstreetmap/josm/actions/mapmode/MapViewMock.java
+++ b/test/unit/org/openstreetmap/josm/actions/mapmode/MapViewMock.java
@@ -8,10 +8,15 @@ import java.awt.geom.Point2D;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.coor.EastNorth;
import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.layer.MainLayerManager;
class MapViewMock extends MapView {
MapViewMock() {
- super(Main.getLayerManager(), null);
+ this(Main.getLayerManager());
+ }
+
+ MapViewMock(MainLayerManager layerManager) {
+ super(layerManager, null);
}
@Override
diff --git a/test/unit/org/openstreetmap/josm/actions/mapmode/ParallelWayActionTest.java b/test/unit/org/openstreetmap/josm/actions/mapmode/ParallelWayActionTest.java
index 8c856ee..97fa064 100644
--- a/test/unit/org/openstreetmap/josm/actions/mapmode/ParallelWayActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/mapmode/ParallelWayActionTest.java
@@ -7,6 +7,9 @@ import static org.junit.Assert.assertTrue;
import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.actions.mapmode.ParallelWayAction.Mode;
+import org.openstreetmap.josm.actions.mapmode.ParallelWayAction.Modifier;
import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -42,4 +45,20 @@ public class ParallelWayActionTest {
Main.getLayerManager().removeLayer(layer);
}
}
+
+ /**
+ * Unit test of {@link Mode} enum.
+ */
+ @Test
+ public void testEnumMode() {
+ TestUtils.superficialEnumCodeCoverage(Mode.class);
+ }
+
+ /**
+ * Unit test of {@link Modifier} enum.
+ */
+ @Test
+ public void testEnumModifier() {
+ TestUtils.superficialEnumCodeCoverage(Modifier.class);
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java b/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java
index ba77937..f69cd24 100644
--- a/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java
@@ -14,11 +14,15 @@ import java.util.Collection;
import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.actions.mapmode.SelectAction.Mode;
+import org.openstreetmap.josm.actions.mapmode.SelectAction.SelectActionCursor;
import org.openstreetmap.josm.data.coor.EastNorth;
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.gui.MapFrame;
+import org.openstreetmap.josm.gui.layer.MainLayerManager;
import org.openstreetmap.josm.gui.layer.OsmDataLayer;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import org.openstreetmap.josm.tools.Utils;
@@ -37,7 +41,7 @@ public class SelectActionTest {
super(mapFrame);
Field mv = SelectAction.class.getDeclaredField("mv");
Utils.setObjectsAccessible(mv);
- mv.set(this, new MapViewMock());
+ mv.set(this, new MapViewMock(new MainLayerManager()));
}
@Override
@@ -141,4 +145,20 @@ public class SelectActionTest {
Main.getLayerManager().removeLayer(layer);
}
}
+
+ /**
+ * Unit test of {@link Mode} enum.
+ */
+ @Test
+ public void testEnumMode() {
+ TestUtils.superficialEnumCodeCoverage(Mode.class);
+ }
+
+ /**
+ * Unit test of {@link SelectActionCursor} enum.
+ */
+ @Test
+ public void testEnumSelectActionCursor() {
+ TestUtils.superficialEnumCodeCoverage(SelectActionCursor.class);
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/actions/search/PushbackTokenizerTest.java b/test/unit/org/openstreetmap/josm/actions/search/PushbackTokenizerTest.java
new file mode 100644
index 0000000..3368159
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/actions/search/PushbackTokenizerTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.search;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.actions.search.PushbackTokenizer.Token;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests for class {@link SearchCompiler}.
+ */
+public class PushbackTokenizerTest {
+
+ /**
+ * Setup rules.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of {@link Token} enum.
+ */
+ @Test
+ public void testEnumToken() {
+ TestUtils.superficialEnumCodeCoverage(Token.class);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/actions/search/SearchActionTest.java b/test/unit/org/openstreetmap/josm/actions/search/SearchActionTest.java
new file mode 100644
index 0000000..89481a2
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/actions/search/SearchActionTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.actions.search;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests for class {@link SearchCompiler}.
+ */
+public class SearchActionTest {
+
+ /**
+ * Setup rules.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of {@link SearchMode} enum.
+ */
+ @Test
+ public void testEnumSearchMode() {
+ TestUtils.superficialEnumCodeCoverage(SearchMode.class);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java b/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
index 5dc1488..b0daaea 100644
--- a/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
+++ b/test/unit/org/openstreetmap/josm/actions/search/SearchCompilerTest.java
@@ -15,6 +15,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.TestUtils;
import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
+import org.openstreetmap.josm.actions.search.SearchCompiler.ExactKeyValue;
import org.openstreetmap.josm.actions.search.SearchCompiler.Match;
import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
import org.openstreetmap.josm.data.coor.LatLon;
@@ -481,4 +482,12 @@ public class SearchCompilerTest {
assertNotNull(SearchCompiler.compile(new String(Files.readAllBytes(
Paths.get(TestUtils.getRegressionDataFile(14217, "filter.txt"))), StandardCharsets.UTF_8)));
}
+
+ /**
+ * Unit test of {@link SearchCompiler.ExactKeyValue.Mode} enum.
+ */
+ @Test
+ public void testEnumExactKeyValueMode() {
+ TestUtils.superficialEnumCodeCoverage(ExactKeyValue.Mode.class);
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/command/SequenceCommandTest.java b/test/unit/org/openstreetmap/josm/command/SequenceCommandTest.java
index 90a0686..0de085d 100644
--- a/test/unit/org/openstreetmap/josm/command/SequenceCommandTest.java
+++ b/test/unit/org/openstreetmap/josm/command/SequenceCommandTest.java
@@ -121,8 +121,7 @@ public class SequenceCommandTest {
TestCommand command1 = new TestCommand(null);
FailingCommand command2 = new FailingCommand();
TestCommand command3 = new TestCommand(null);
- SequenceCommand command = new SequenceCommand("seq", Arrays.<Command>asList(command1, command2, command3));
- command.continueOnError = true;
+ SequenceCommand command = new SequenceCommand("seq", Arrays.<Command>asList(command1, command2, command3), true);
assertTrue(command.executeCommand());
assertTrue(command1.executed);
assertTrue(command3.executed);
diff --git a/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java b/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java
index 7b15f6c..fdb8b33 100644
--- a/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java
+++ b/test/unit/org/openstreetmap/josm/corrector/ReverseWayTagCorrectorTest.java
@@ -18,6 +18,7 @@ import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
/**
* Unit tests of {@link ReverseWayTagCorrector} class.
@@ -32,6 +33,15 @@ public class ReverseWayTagCorrectorTest {
public JOSMTestRules test = new JOSMTestRules();
/**
+ * Tests that {@code ReverseWayTagCorrector.TagSwitcher} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(ReverseWayTagCorrector.TagSwitcher.class);
+ }
+
+ /**
* Test of {@link ReverseWayTagCorrector.TagSwitcher#apply} method.
*/
@Test
diff --git a/test/unit/org/openstreetmap/josm/data/CustomConfiguratorTest.java b/test/unit/org/openstreetmap/josm/data/CustomConfiguratorTest.java
index 2f2034c..108c233 100644
--- a/test/unit/org/openstreetmap/josm/data/CustomConfiguratorTest.java
+++ b/test/unit/org/openstreetmap/josm/data/CustomConfiguratorTest.java
@@ -17,10 +17,12 @@ import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.CustomConfigurator.PreferencesUtils;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import org.openstreetmap.josm.tools.Utils;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
/**
* Unit tests for class {@link CustomConfigurator}.
@@ -117,4 +119,13 @@ public class CustomConfiguratorTest {
assertFalse(log, log.contains("Error"));
assertEquals(9, pref.getCollection("lorem_ipsum").size());
}
+
+ /**
+ * Tests that {@code PreferencesUtils} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(PreferencesUtils.class);
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/data/VersionTest.java b/test/unit/org/openstreetmap/josm/data/VersionTest.java
index 690f464..cc81b94 100644
--- a/test/unit/org/openstreetmap/josm/data/VersionTest.java
+++ b/test/unit/org/openstreetmap/josm/data/VersionTest.java
@@ -1,8 +1,12 @@
// 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.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+
import org.junit.BeforeClass;
import org.junit.Test;
import org.openstreetmap.josm.JOSMFixture;
@@ -26,10 +30,34 @@ public class VersionTest {
@Test
public void testGetAgentString() {
String v = Version.getInstance().getAgentString(false);
- assertTrue(v.startsWith("JOSM/1.5 ("));
- assertTrue(v.endsWith(" en)"));
+ assertTrue(v, v.matches("JOSM/1\\.5 \\([1-9][0-9]* SVN en\\)"));
v = Version.getInstance().getAgentString(true);
- assertTrue(v.startsWith("JOSM/1.5 ("));
- assertTrue(v.contains(" en) "));
+ assertTrue(v, v.matches("JOSM/1\\.5 \\([1-9][0-9]* SVN en\\).*"));
+ }
+
+ /**
+ * Unit test of {@link Version#initFromRevisionInfo} - null case.
+ */
+ @Test
+ public void testInitFromRevisionInfoNull() {
+ Version v = new Version();
+ v.initFromRevisionInfo(null);
+ assertEquals(Version.JOSM_UNKNOWN_VERSION, v.getVersion());
+ }
+
+ /**
+ * Unit test of {@link Version#initFromRevisionInfo} - local build.
+ */
+ @Test
+ public void testInitFromRevisionInfoLocal() {
+ Version v = new Version();
+ v.initFromRevisionInfo(new ByteArrayInputStream(("\n" +
+ "Revision: 11885\n" +
+ "Is-Local-Build: true\n" +
+ "Build-Date: 2017-04-12 02:08:29\n"
+ ).getBytes(StandardCharsets.UTF_8)));
+ assertEquals(11885, v.getVersion());
+ assertEquals("11885", v.getVersionString());
+ assertTrue(v.isLocalBuild());
}
}
diff --git a/test/unit/org/openstreetmap/josm/data/cache/JCSCacheManagerTest.java b/test/unit/org/openstreetmap/josm/data/cache/JCSCacheManagerTest.java
index 5c1c075..ebfe25e 100644
--- a/test/unit/org/openstreetmap/josm/data/cache/JCSCacheManagerTest.java
+++ b/test/unit/org/openstreetmap/josm/data/cache/JCSCacheManagerTest.java
@@ -15,6 +15,7 @@ import org.junit.Test;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
/**
* Unit tests for class {@link JCSCacheManager}.
@@ -29,6 +30,15 @@ public class JCSCacheManagerTest {
public JOSMTestRules test = new JOSMTestRules().preferences();
/**
+ * Tests that {@code JCSCacheManager} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(JCSCacheManager.class);
+ }
+
+ /**
* Non-regression test for <a href="https://josm.openstreetmap.de/ticket/12054">Bug #12054</a>.
* @throws IOException if any I/O error occurs
*/
diff --git a/test/unit/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelperTest.java b/test/unit/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelperTest.java
new file mode 100644
index 0000000..07b47cf
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/imagery/GetCapabilitiesParseHelperTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.imagery;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
+
+/**
+ * Unit tests for class {@link GetCapabilitiesParseHelper}.
+ */
+public class GetCapabilitiesParseHelperTest {
+
+ /**
+ * Setup tests
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Tests that {@code GetCapabilitiesParseHelper} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(GetCapabilitiesParseHelper.class);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java b/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java
index a379279..c183407 100644
--- a/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java
+++ b/test/unit/org/openstreetmap/josm/data/imagery/TemplatedWMSTileSourceTest.java
@@ -14,6 +14,7 @@ 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.CustomProjection;
+import org.openstreetmap.josm.data.projection.Projection;
import org.openstreetmap.josm.data.projection.Projections;
import org.openstreetmap.josm.testutils.JOSMTestRules;
@@ -24,8 +25,8 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
*/
public class TemplatedWMSTileSourceTest {
- private ImageryInfo testImageryWMS = new ImageryInfo("test imagery", "http://localhost", "wms", null, null);
- private ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null);
+ private final ImageryInfo testImageryWMS = new ImageryInfo("test imagery", "http://localhost", "wms", null, null);
+ private final ImageryInfo testImageryTMS = new ImageryInfo("test imagery", "http://localhost", "tms", null, null);
/**
* Setup test.
@@ -39,8 +40,9 @@ public class TemplatedWMSTileSourceTest {
*/
@Test
public void testEPSG3857() {
- Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
- TemplatedWMSTileSource source = new TemplatedWMSTileSource(testImageryWMS);
+ Projection projection = Projections.getProjectionByCode("EPSG:3857");
+ Main.setProjection(projection);
+ TemplatedWMSTileSource source = new TemplatedWMSTileSource(testImageryWMS, projection);
verifyMercatorTile(source, 0, 0, 1);
verifyMercatorTile(source, 0, 0, 2);
verifyMercatorTile(source, 0, 1, 2);
@@ -63,8 +65,9 @@ public class TemplatedWMSTileSourceTest {
*/
@Test
public void testEPSG4326() {
- Main.setProjection(Projections.getProjectionByCode("EPSG:4326"));
- TemplatedWMSTileSource source = getSource();
+ Projection projection = Projections.getProjectionByCode("EPSG:4326");
+ Main.setProjection(projection);
+ TemplatedWMSTileSource source = getSource(projection);
verifyLocation(source, new LatLon(53.5937132, 19.5652017));
verifyLocation(source, new LatLon(53.501565692302854, 18.54455233898721));
@@ -78,8 +81,9 @@ public class TemplatedWMSTileSourceTest {
*/
@Test
public void testEPSG4326widebounds() {
- Main.setProjection(new CustomProjection("+proj=lonlat +datum=WGS84 +axis=neu +bounds=-180,53,180,54"));
- TemplatedWMSTileSource source = getSource();
+ Projection projection = new CustomProjection("+proj=lonlat +datum=WGS84 +axis=neu +bounds=-180,53,180,54");
+ Main.setProjection(projection);
+ TemplatedWMSTileSource source = getSource(projection);
verifyLocation(source, new LatLon(53.5937132, 19.5652017));
verifyLocation(source, new LatLon(53.501565692302854, 18.54455233898721));
@@ -90,8 +94,9 @@ public class TemplatedWMSTileSourceTest {
*/
@Test
public void testEPSG4326narrowbounds() {
- Main.setProjection(new CustomProjection("+proj=lonlat +datum=WGS84 +axis=neu +bounds=18,-90,20,90"));
- TemplatedWMSTileSource source = getSource();
+ Projection projection = new CustomProjection("+proj=lonlat +datum=WGS84 +axis=neu +bounds=18,-90,20,90");
+ Main.setProjection(projection);
+ TemplatedWMSTileSource source = getSource(projection);
verifyLocation(source, new LatLon(53.5937132, 19.5652017));
verifyLocation(source, new LatLon(53.501565692302854, 18.54455233898721));
@@ -102,8 +107,9 @@ public class TemplatedWMSTileSourceTest {
*/
@Test
public void testEPSG2180() {
- Main.setProjection(Projections.getProjectionByCode("EPSG:2180"));
- TemplatedWMSTileSource source = getSource();
+ Projection projection = Projections.getProjectionByCode("EPSG:2180");
+ Main.setProjection(projection);
+ TemplatedWMSTileSource source = getSource(projection);
verifyLocation(source, new LatLon(53.5937132, 19.5652017));
verifyLocation(source, new LatLon(53.501565692302854, 18.54455233898721));
@@ -118,10 +124,11 @@ public class TemplatedWMSTileSourceTest {
*/
@Test
public void testEPSG3006withbounds() {
- Main.setProjection(
+ Projection projection =
new CustomProjection("+proj=utm +zone=33 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 "
- + "+units=m +no_defs +axis=neu +wmssrs=EPSG:3006 +bounds=10.5700,55.2000,24.1800,69.1000 "));
- TemplatedWMSTileSource source = getSource();
+ + "+units=m +no_defs +axis=neu +wmssrs=EPSG:3006 +bounds=10.5700,55.2000,24.1800,69.1000 ");
+ Main.setProjection(projection);
+ TemplatedWMSTileSource source = getSource(projection);
verifyTileSquarness(source, 0, 1, 4);
verifyLocation(source, new LatLon(60, 18.1), 3);
@@ -133,10 +140,11 @@ public class TemplatedWMSTileSourceTest {
*/
@Test
public void testEPSG3006withoutbounds() {
- Main.setProjection(
+ Projection projection =
new CustomProjection("+proj=utm +zone=33 +ellps=GRS80 +towgs84=0,0,0,0,0,0,0 "
- + "+units=m +no_defs +axis=neu +wmssrs=EPSG:3006"));
- TemplatedWMSTileSource source = getSource();
+ + "+units=m +no_defs +axis=neu +wmssrs=EPSG:3006");
+ Main.setProjection(projection);
+ TemplatedWMSTileSource source = getSource(projection);
verifyTileSquarness(source, 0, 1, 4);
verifyLocation(source, new LatLon(60, 18.1), 3);
@@ -235,7 +243,7 @@ public class TemplatedWMSTileSourceTest {
assertEquals(x_size, Math.abs(t1.getX() - t2.getX()), x_size * 1e-05);
}
- private TemplatedWMSTileSource getSource() {
- return new TemplatedWMSTileSource(testImageryWMS);
+ private TemplatedWMSTileSource getSource(Projection projection) {
+ return new TemplatedWMSTileSource(testImageryWMS, projection);
}
}
diff --git a/test/unit/org/openstreetmap/josm/data/oauth/SignpostAdaptersTest.java b/test/unit/org/openstreetmap/josm/data/oauth/SignpostAdaptersTest.java
index 739fd12..6d4ae10 100644
--- a/test/unit/org/openstreetmap/josm/data/oauth/SignpostAdaptersTest.java
+++ b/test/unit/org/openstreetmap/josm/data/oauth/SignpostAdaptersTest.java
@@ -18,6 +18,7 @@ import org.openstreetmap.josm.testutils.JOSMTestRules;
import org.openstreetmap.josm.tools.HttpClient;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
/**
* Unit tests for class {@link SignpostAdapters}.
@@ -36,6 +37,15 @@ public class SignpostAdaptersTest {
}
/**
+ * Tests that {@code SignpostAdapters} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(SignpostAdapters.class);
+ }
+
+ /**
* Unit test of method {@link SignpostAdapters.OAuthConsumer#wrap}.
* @throws MalformedURLException never
*/
diff --git a/test/unit/org/openstreetmap/josm/data/osm/AbstractPrimitiveTest.java b/test/unit/org/openstreetmap/josm/data/osm/AbstractPrimitiveTest.java
new file mode 100644
index 0000000..9963c52
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/AbstractPrimitiveTest.java
@@ -0,0 +1,80 @@
+// 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 java.util.Collections;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of the {@code AbstractPrimitive} class.
+ */
+public class AbstractPrimitiveTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of {@link AbstractPrimitive#isUndeleted} method.
+ */
+ @Test
+ public void testIsUndeleted() {
+ AbstractPrimitive p = new Node(1);
+ p.setVisible(false);
+ p.setDeleted(false);
+ assertFalse(p.isVisible());
+ assertFalse(p.isDeleted());
+ assertTrue(p.isUndeleted());
+
+ p.setVisible(false);
+ p.setDeleted(true);
+ assertFalse(p.isVisible());
+ assertTrue(p.isDeleted());
+ assertFalse(p.isUndeleted());
+
+ p.setVisible(true);
+ p.setDeleted(false);
+ assertTrue(p.isVisible());
+ assertFalse(p.isDeleted());
+ assertFalse(p.isUndeleted());
+
+ p.setVisible(true);
+ p.setDeleted(true);
+ assertTrue(p.isVisible());
+ assertTrue(p.isDeleted());
+ assertFalse(p.isUndeleted());
+ }
+
+ /**
+ * Unit test of {@link AbstractPrimitive#hasTagDifferent} methods.
+ */
+ @Test
+ public void testHasTagDifferent() {
+ AbstractPrimitive p = new Node();
+
+ assertFalse(p.hasTagDifferent("foo", "bar"));
+ assertFalse(p.hasTagDifferent("foo", "bar", "baz"));
+ assertFalse(p.hasTagDifferent("foo", Collections.singleton("bar")));
+
+ p.put("foo", "bar");
+ assertTrue(p.hasTagDifferent("foo", "baz"));
+ assertFalse(p.hasTagDifferent("foo", "bar"));
+ assertFalse(p.hasTagDifferent("foo", "bar", "baz"));
+ assertFalse(p.hasTagDifferent("foo", Collections.singleton("bar")));
+
+ p.put("foo", "foo");
+ assertTrue(p.hasTagDifferent("foo", "bar"));
+ assertTrue(p.hasTagDifferent("foo", "bar", "baz"));
+ assertTrue(p.hasTagDifferent("foo", Collections.singleton("bar")));
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java b/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java
index 20d7f00..9984321 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/BBoxTest.java
@@ -1,6 +1,7 @@
// 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;
@@ -67,4 +68,87 @@ public class BBoxTest {
assertFalse(b5.isInWorld());
}
+ /**
+ * Test double constructor which might result in invalid bbox
+ */
+ @Test
+ public void testDoubleConstructor() {
+ assertTrue(new BBox(1, 2, 3, 4).isValid());
+ assertFalse(new BBox(Double.NaN, 2, 3, 4).isValid());
+ assertFalse(new BBox(1, Double.NaN, 3, 4).isValid());
+ assertFalse(new BBox(1, 2, Double.NaN, 4).isValid());
+ assertFalse(new BBox(1, 2, 3, Double.NaN).isValid());
+ }
+
+ /**
+ * Test Node constructor which might result in invalid bbox
+ */
+ @Test
+ public void testNodeConstructor() {
+ assertTrue(new BBox(new Node(LatLon.NORTH_POLE)).isValid());
+ assertFalse(new BBox(new Node()).isValid());
+ }
+
+ /**
+ * Unit test of {@link BBox#add(LatLon)} method.
+ */
+ @Test
+ public void testAddLatLon() {
+ BBox b = new BBox();
+ b.add((LatLon) null);
+ b.add(new LatLon(Double.NaN, Double.NaN));
+ assertFalse(b.isValid());
+ b.add(LatLon.NORTH_POLE);
+ assertTrue(b.isValid());
+ assertEquals(LatLon.NORTH_POLE, b.getCenter());
+ }
+
+ /**
+ * Unit test of {@link BBox#add(double, double)} method.
+ */
+ @Test
+ public void testAddDouble() {
+ BBox b = new BBox();
+ b.add(1, Double.NaN);
+ assertFalse(b.isValid());
+ b.add(Double.NaN, 2);
+ assertFalse(b.isValid());
+ b.add(1, 2);
+ assertTrue(b.isValid());
+ assertEquals(new LatLon(2, 1), b.getCenter());
+ }
+
+ /**
+ * Unit test of {@link BBox#addPrimitive} method.
+ */
+ @Test
+ public void testAddPrimitive() {
+ BBox b = new BBox();
+ b.addPrimitive(new Node(LatLon.NORTH_POLE), 0.5);
+ assertEquals(LatLon.NORTH_POLE, b.getCenter());
+ assertEquals(new LatLon(90.5, -0.5), b.getTopLeft());
+ assertEquals(new LatLon(89.5, +0.5), b.getBottomRight());
+ }
+
+ /**
+ * Unit test of {@link BBox#height} and {@link BBox#width} methods.
+ */
+ @Test
+ public void testHeightWidth() {
+ BBox b1 = new BBox(1, 2, 3, 5);
+ assertEquals(2, b1.width(), 1e-7);
+ assertEquals(3, b1.height(), 1e-7);
+ BBox b2 = new BBox();
+ assertEquals(0, b2.width(), 1e-7);
+ assertEquals(0, b2.height(), 1e-7);
+ }
+
+ /**
+ * Unit test of {@link BBox#toString} method.
+ */
+ @Test
+ public void testToString() {
+ assertEquals("[ x: Infinity -> -Infinity, y: Infinity -> -Infinity ]", new BBox().toString());
+ assertEquals("[ x: 1.0 -> 3.0, y: 2.0 -> 4.0 ]", new BBox(1, 2, 3, 4).toString());
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java b/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java
index 4375a41..64c283a 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java
@@ -6,12 +6,15 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import java.util.Arrays;
+import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.junit.Assert;
+import org.junit.After;
import org.junit.Test;
import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.gui.JosmUserIdentityManager;
/**
* Unit test of {@link ChangesetCache}
@@ -19,6 +22,14 @@ import org.openstreetmap.josm.TestUtils;
public class ChangesetCacheTest {
/**
+ * Clears cache after each unit test.
+ */
+ @After
+ public void after() {
+ ChangesetCache.getInstance().clear();
+ }
+
+ /**
* Unit test of {@link ChangesetCache#ChangesetCache}
*/
@Test
@@ -183,33 +194,98 @@ public class ChangesetCacheTest {
}
/**
- * Unit test of method {@link ChangesetCache#getOpenChangesets}.
+ * Unit test of methods {@link ChangesetCache#getOpenChangesets} / {@link ChangesetCache#getChangesets}.
*/
@Test
public void testGetOpenChangesets() {
final ChangesetCache cache = ChangesetCache.getInstance();
// empty cache => empty list
- Assert.assertTrue(
+ assertTrue(
"Empty cache should produce an empty list.",
cache.getOpenChangesets().isEmpty()
);
+ assertTrue(
+ "Empty cache should produce an empty list.",
+ cache.getChangesets().isEmpty()
+ );
// cache with only closed changesets => empty list
Changeset closedCs = new Changeset(1);
closedCs.setOpen(false);
cache.update(closedCs);
- Assert.assertTrue(
+ assertTrue(
"Cache with only closed changesets should produce an empty list.",
cache.getOpenChangesets().isEmpty()
);
+ assertEquals(1, cache.getChangesets().size());
// cache with open and closed changesets => list with only the open ones
Changeset openCs = new Changeset(2);
openCs.setOpen(true);
cache.update(openCs);
- Assert.assertEquals(
+ assertEquals(
Collections.singletonList(openCs),
cache.getOpenChangesets()
);
+ assertEquals(2, cache.getChangesets().size());
+ }
+
+ /**
+ * Unit test of method {@link ChangesetCache#getOpenChangesetsForCurrentUser}.
+ */
+ @Test
+ public void testGetOpenChangesetsForCurrentUser() {
+ final ChangesetCache cache = ChangesetCache.getInstance();
+ // empty cache => empty list
+ assertTrue(
+ "Empty cache should produce an empty list.",
+ cache.getOpenChangesetsForCurrentUser().isEmpty()
+ );
+
+ Changeset openCs1 = new Changeset(1);
+ openCs1.setOpen(true);
+ openCs1.setUser(User.getAnonymous());
+ cache.update(openCs1);
+
+ Changeset openCs2 = new Changeset(2);
+ openCs2.setOpen(true);
+ openCs2.setUser(User.createLocalUser("foo"));
+ cache.update(openCs2);
+
+ Changeset closedCs = new Changeset(3);
+ closedCs.setOpen(false);
+ cache.update(closedCs);
+
+ assertEquals(3, cache.getChangesets().size());
+
+ JosmUserIdentityManager.getInstance().setAnonymous();
+ assertEquals(2, cache.getOpenChangesetsForCurrentUser().size());
+
+ JosmUserIdentityManager.getInstance().setPartiallyIdentified("foo");
+ assertEquals(1, cache.getOpenChangesetsForCurrentUser().size());
+ }
+
+ /**
+ * Unit test of methods {@link ChangesetCache#remove}.
+ */
+ @Test
+ public void testRemove() {
+ final ChangesetCache cache = ChangesetCache.getInstance();
+ Changeset cs1 = new Changeset(1);
+ cache.update(cs1);
+ assertEquals(1, cache.getChangesets().size());
+
+ cache.remove((Changeset) null);
+ cache.remove(cs1);
+ assertTrue(cache.getChangesets().isEmpty());
+
+ Changeset cs2 = new Changeset(2);
+ cache.update((Collection<Changeset>) null);
+ cache.update(Arrays.asList(cs1, cs2));
+ assertEquals(2, cache.getChangesets().size());
+
+ cache.remove((Collection<Changeset>) null);
+ cache.remove(Arrays.asList(cs1, cs2));
+ assertTrue(cache.getChangesets().isEmpty());
}
}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/ChangesetDataSetTest.java b/test/unit/org/openstreetmap/josm/data/osm/ChangesetDataSetTest.java
index 375d5f2..036e199 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/ChangesetDataSetTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/ChangesetDataSetTest.java
@@ -1,18 +1,26 @@
// 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 static org.junit.Assert.fail;
+
import java.util.Date;
+import java.util.Iterator;
import java.util.Set;
-import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.TestUtils;
import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.ChangesetDataSet.ChangesetDataSetEntry;
import org.openstreetmap.josm.data.osm.ChangesetDataSet.ChangesetModificationType;
import org.openstreetmap.josm.data.osm.history.HistoryNode;
import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Logging;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -37,14 +45,14 @@ public class ChangesetDataSetTest {
// empty object, null parameter => IllegalArgumentException
try {
cds.getPrimitivesByModificationType(null);
- Assert.fail("Should have thrown an IllegalArgumentException as we gave a null argument.");
+ fail("Should have thrown an IllegalArgumentException as we gave a null argument.");
} catch (IllegalArgumentException e) {
Main.trace(e);
// Was expected
}
// empty object, a modification type => empty list
- Assert.assertTrue(
+ assertTrue(
"Empty data set should produce an empty list.",
cds.getPrimitivesByModificationType(
ChangesetModificationType.CREATED).isEmpty()
@@ -52,15 +60,45 @@ public class ChangesetDataSetTest {
// object with various items and modification types, fetch for CREATED
// => list containing only the CREATED item
- HistoryOsmPrimitive prim1 = new HistoryNode(1, 1, true, User.getAnonymous(), 1, new Date(), LatLon.ZERO);
- HistoryOsmPrimitive prim2 = new HistoryNode(2, 1, true, User.createLocalUser("test"), 1, new Date(), LatLon.NORTH_POLE);
- HistoryOsmPrimitive prim3 = new HistoryNode(3, 1, true, User.getAnonymous(), 1, new Date(), LatLon.SOUTH_POLE);
+ HistoryNode prim1 = new HistoryNode(1, 1, true, User.getAnonymous(), 1, new Date(), LatLon.ZERO);
+ HistoryNode prim2 = new HistoryNode(2, 1, true, User.createLocalUser("test"), 1, new Date(), LatLon.NORTH_POLE);
+ HistoryNode prim3 = new HistoryNode(3, 1, true, User.getAnonymous(), 1, new Date(), LatLon.SOUTH_POLE);
cds.put(prim1, ChangesetModificationType.CREATED);
cds.put(prim2, ChangesetModificationType.DELETED);
cds.put(prim3, ChangesetModificationType.UPDATED);
Set<HistoryOsmPrimitive> result = cds.getPrimitivesByModificationType(
ChangesetModificationType.CREATED);
- Assert.assertEquals("We should have found only one item.", 1, result.size());
- Assert.assertTrue("The item found is prim1.", result.contains(prim1));
+ assertEquals("We should have found only one item.", 1, result.size());
+ assertTrue("The item found is prim1.", result.contains(prim1));
+ }
+
+ /**
+ * Unit test of method {@link ChangesetDataSet#iterator}.
+ */
+ @Test
+ public void testIterator() {
+ final ChangesetDataSet cds = new ChangesetDataSet();
+ HistoryNode prim1 = new HistoryNode(1, 1, true, User.getAnonymous(), 1, new Date(), LatLon.ZERO);
+ cds.put(prim1, ChangesetModificationType.CREATED);
+ Iterator<ChangesetDataSetEntry> it = cds.iterator();
+ assertTrue(it.hasNext());
+ ChangesetDataSetEntry cdse = it.next();
+ assertEquals(ChangesetModificationType.CREATED, cdse.getModificationType());
+ assertEquals(prim1, cdse.getPrimitive());
+ assertFalse(it.hasNext());
+ try {
+ it.remove();
+ fail("remove should throw UnsupportedOperationException");
+ } catch (UnsupportedOperationException e) {
+ Logging.trace(e.getMessage());
+ }
+ }
+
+ /**
+ * Unit test of {@link ChangesetModificationType} enum.
+ */
+ @Test
+ public void testEnumChangesetModificationType() {
+ TestUtils.superficialEnumCodeCoverage(ChangesetModificationType.class);
}
}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/ChangesetDiscussionCommentTest.java b/test/unit/org/openstreetmap/josm/data/osm/ChangesetDiscussionCommentTest.java
new file mode 100644
index 0000000..ab8539c
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/ChangesetDiscussionCommentTest.java
@@ -0,0 +1,48 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Date;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests for class {@link ChangesetDiscussionComment}.
+ */
+public class ChangesetDiscussionCommentTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of {@link ChangesetDiscussionComment} constructor.
+ */
+ @Test
+ public void testChangesetDiscussionComment() {
+ Date d = new Date(1000);
+ User foo = User.createOsmUser(1, "foo");
+ ChangesetDiscussionComment cdc = new ChangesetDiscussionComment(d, foo);
+ assertEquals(d, cdc.getDate());
+ assertEquals(foo, cdc.getUser());
+ assertEquals("ChangesetDiscussionComment [date=Thu Jan 01 00:00:01 UTC 1970, user=id:1 name:foo, text='null']", cdc.toString());
+ }
+
+ /**
+ * Unit test of methods {@link ChangesetDiscussionComment#setText} / {@link ChangesetDiscussionComment#getText}.
+ */
+ @Test
+ public void testText() {
+ ChangesetDiscussionComment cdc = new ChangesetDiscussionComment(new Date(), null);
+ cdc.setText("foo");
+ assertEquals("foo", cdc.getText());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java b/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java
index 74c6dd9..b4f4718 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/ChangesetTest.java
@@ -1,8 +1,15 @@
// 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.assertNull;
+import static org.junit.Assert.assertTrue;
import static org.openstreetmap.josm.data.osm.Changeset.MAX_CHANGESET_TAG_LENGTH;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
@@ -10,6 +17,10 @@ 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.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.gui.DefaultNameFormatter;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -68,4 +79,222 @@ public class ChangesetTest {
// Was expected
}
}
+
+ /**
+ * Unit test of method {@link Changeset#compareTo}.
+ */
+ @Test
+ public void testCompareTo() {
+ Changeset cs1 = new Changeset(1);
+ Changeset cs2 = new Changeset(2);
+ assertEquals(0, cs1.compareTo(cs1));
+ assertEquals(-1, cs1.compareTo(cs2));
+ assertEquals(+1, cs2.compareTo(cs1));
+ }
+
+ /**
+ * Unit test of method {@link Changeset#getBounds}.
+ */
+ @Test
+ public void testGetBounds() {
+ Changeset cs = new Changeset();
+ assertNull(cs.getBounds());
+ cs.setMin(LatLon.NORTH_POLE);
+ cs.setMax(null);
+ assertNull(cs.getBounds());
+ cs.setMin(null);
+ cs.setMax(LatLon.SOUTH_POLE);
+ assertNull(cs.getBounds());
+ cs.setMin(LatLon.NORTH_POLE);
+ cs.setMax(LatLon.SOUTH_POLE);
+ assertEquals(new Bounds(90, 0, -90, 0), cs.getBounds());
+ }
+
+ /**
+ * Unit test of methods {@link Changeset#getContent} / {@link Changeset#setContent} / {@link Changeset#hasContent}.
+ */
+ @Test
+ public void testGetSetHasContent() {
+ Changeset cs = new Changeset();
+ assertNull(cs.getContent());
+ assertFalse(cs.hasContent());
+ ChangesetDataSet cds = new ChangesetDataSet();
+ cs.setContent(cds);
+ assertEquals(cds, cs.getContent());
+ assertTrue(cs.hasContent());
+ }
+
+ /**
+ * Unit test of method {@link Changeset#getDisplayName}.
+ */
+ @Test
+ public void testGetDisplayName() {
+ assertEquals("Changeset 0", new Changeset().getDisplayName(DefaultNameFormatter.getInstance()));
+ }
+
+ /**
+ * Unit test of method {@link Changeset#getName}.
+ */
+ @Test
+ public void testGetName() {
+ assertEquals("changeset 0", new Changeset().getName());
+ }
+
+ private static Date yesterday() {
+ final Calendar cal = Calendar.getInstance();
+ cal.add(Calendar.DATE, -1);
+ return cal.getTime();
+ }
+
+ /**
+ * Unit test of method {@link Changeset#hasEqualSemanticAttributes}.
+ */
+ @Test
+ public void testHasEqualSemanticAttributes() {
+ Changeset cs1 = new Changeset();
+ Changeset cs2 = new Changeset();
+ assertTrue(cs1.hasEqualSemanticAttributes(cs2));
+ assertFalse(cs1.hasEqualSemanticAttributes(null));
+ // Closed At
+ cs1.setClosedAt(null);
+ cs2.setClosedAt(new Date());
+ assertFalse(cs1.hasEqualSemanticAttributes(cs2));
+ cs1.setClosedAt(yesterday());
+ cs2.setClosedAt(new Date());
+ assertFalse(cs1.hasEqualSemanticAttributes(cs2));
+ cs1.setClosedAt(new Date());
+ cs2.setClosedAt(new Date());
+ assertTrue(cs1.hasEqualSemanticAttributes(cs2));
+ // Created At
+ cs1.setCreatedAt(null);
+ cs2.setCreatedAt(new Date());
+ assertFalse(cs1.hasEqualSemanticAttributes(cs2));
+ cs1.setCreatedAt(yesterday());
+ cs2.setCreatedAt(new Date());
+ assertFalse(cs1.hasEqualSemanticAttributes(cs2));
+ cs1.setCreatedAt(new Date());
+ cs2.setCreatedAt(new Date());
+ assertTrue(cs1.hasEqualSemanticAttributes(cs2));
+ // Id
+ cs1.setId(1);
+ cs2.setId(2);
+ assertFalse(cs1.hasEqualSemanticAttributes(cs2));
+ cs1.setId(1);
+ cs2.setId(1);
+ assertTrue(cs1.hasEqualSemanticAttributes(cs2));
+ // Max
+ cs1.setMax(null);
+ cs2.setMax(null);
+ assertTrue(cs1.hasEqualSemanticAttributes(cs2));
+ cs1.setMax(null);
+ cs2.setMax(LatLon.NORTH_POLE);
+ assertFalse(cs1.hasEqualSemanticAttributes(cs2));
+ cs1.setMax(LatLon.SOUTH_POLE);
+ cs2.setMax(LatLon.NORTH_POLE);
+ assertFalse(cs1.hasEqualSemanticAttributes(cs2));
+ cs1.setMax(LatLon.SOUTH_POLE);
+ cs2.setMax(LatLon.SOUTH_POLE);
+ assertTrue(cs1.hasEqualSemanticAttributes(cs2));
+ // Min
+ cs1.setMin(null);
+ cs2.setMin(null);
+ assertTrue(cs1.hasEqualSemanticAttributes(cs2));
+ cs1.setMin(null);
+ cs2.setMin(LatLon.SOUTH_POLE);
+ assertFalse(cs1.hasEqualSemanticAttributes(cs2));
+ cs1.setMin(LatLon.NORTH_POLE);
+ cs2.setMin(LatLon.SOUTH_POLE);
+ assertFalse(cs1.hasEqualSemanticAttributes(cs2));
+ cs1.setMin(LatLon.NORTH_POLE);
+ cs2.setMin(LatLon.NORTH_POLE);
+ assertTrue(cs1.hasEqualSemanticAttributes(cs2));
+ // Open
+ cs1.setOpen(false);
+ cs2.setOpen(true);
+ assertFalse(cs1.hasEqualSemanticAttributes(cs2));
+ cs1.setOpen(false);
+ cs2.setOpen(false);
+ assertTrue(cs1.hasEqualSemanticAttributes(cs2));
+ // Tags
+ Map<String, String> tags = new HashMap<>();
+ tags.put("foo", "bar");
+ cs2.setKeys(tags);
+ assertFalse(cs1.hasEqualSemanticAttributes(cs2));
+ cs1.setKeys(new HashMap<>(tags));
+ assertTrue(cs1.hasEqualSemanticAttributes(cs2));
+ // User
+ cs1.setUser(null);
+ cs2.setUser(User.createLocalUser("foo"));
+ assertFalse(cs1.hasEqualSemanticAttributes(cs2));
+ cs1.setUser(null);
+ cs2.setUser(null);
+ assertTrue(cs1.hasEqualSemanticAttributes(cs2));
+ cs1.setUser(User.createLocalUser("foo"));
+ cs2.setUser(User.createLocalUser("foo"));
+ assertTrue(cs1.hasEqualSemanticAttributes(cs2));
+ // Comment count
+ cs1.setCommentsCount(1);
+ cs2.setCommentsCount(2);
+ assertFalse(cs1.hasEqualSemanticAttributes(cs2));
+ cs1.setCommentsCount(1);
+ cs2.setCommentsCount(1);
+ assertTrue(cs1.hasEqualSemanticAttributes(cs2));
+ }
+
+ /**
+ * Unit test of methods {@link Changeset#keySet} / {@link Changeset#put} / {@link Changeset#remove} / {@link Changeset#removeAll}.
+ */
+ @Test
+ public void testKeySet() {
+ Changeset cs = new Changeset();
+ assertTrue(cs.keySet().isEmpty());
+ Map<String, String> tags = new HashMap<>();
+ tags.put("foo", "bar");
+ cs.setKeys(tags);
+ Collection<String> set = cs.keySet();
+ assertEquals(1, set.size());
+ assertEquals("foo", set.iterator().next());
+ cs.remove("foo");
+ assertTrue(cs.keySet().isEmpty());
+ cs.put("foo", "bar");
+ cs.put("bar", "foo");
+ assertEquals(2, cs.keySet().size());
+ cs.removeAll();
+ assertTrue(cs.keySet().isEmpty());
+ }
+
+ private static class CsVisitor implements Visitor {
+
+ boolean visited;
+
+ @Override
+ public void visit(Node n) {
+ // Do nothing
+ }
+
+ @Override
+ public void visit(Way w) {
+ // Do nothing
+ }
+
+ @Override
+ public void visit(Relation r) {
+ // Do nothing
+ }
+
+ @Override
+ public void visit(Changeset cs) {
+ visited = true;
+ }
+ }
+
+ /**
+ * Unit test of method {@link Changeset#visit}.
+ */
+ @Test
+ public void testVisit() {
+ CsVisitor v = new CsVisitor();
+ new Changeset().visit(v);
+ assertTrue(v.visited);
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/DataIntegrityProblemExceptionTest.java b/test/unit/org/openstreetmap/josm/data/osm/DataIntegrityProblemExceptionTest.java
new file mode 100644
index 0000000..cb001f6
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/DataIntegrityProblemExceptionTest.java
@@ -0,0 +1,37 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests for class {@link DataIntegrityProblemException}.
+ */
+public class DataIntegrityProblemExceptionTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of {@link DataIntegrityProblemException} constructor.
+ */
+ @Test
+ public void testDataIntegrityException() {
+ DataIntegrityProblemException e1 = new DataIntegrityProblemException("foo");
+ assertEquals("foo", e1.getMessage());
+ assertNull(e1.getHtmlMessage());
+ DataIntegrityProblemException e2 = new DataIntegrityProblemException("foo", "<html>bar</html>");
+ assertEquals("foo", e2.getMessage());
+ assertEquals("<html>bar</html>", e2.getHtmlMessage());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java b/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java
index e9fde65..aa28510 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/DataSetTest.java
@@ -1,7 +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.assertTrue;
+
import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
import org.junit.Assert;
@@ -57,6 +61,49 @@ public class DataSetTest {
}
/**
+ * Unit test of methods {@link DataSet#addChangeSetTag} / {@link DataSet#getChangeSetTags}.
+ */
+ @Test
+ public void testChangesetTags() {
+ final DataSet ds = new DataSet();
+ assertTrue(ds.getChangeSetTags().isEmpty());
+ ds.addChangeSetTag("foo", "bar");
+ assertEquals("bar", ds.getChangeSetTags().get("foo"));
+ }
+
+ /**
+ * Unit test of methods {@link DataSet#allNonDeletedPrimitives}
+ * / {@link DataSet#allNonDeletedCompletePrimitives}
+ * / {@link DataSet#allNonDeletedPhysicalPrimitives}.
+ */
+ @Test
+ public void testAllNonDeleted() {
+ final DataSet ds = new DataSet();
+ assertTrue(ds.allNonDeletedPrimitives().isEmpty());
+ assertTrue(ds.allNonDeletedCompletePrimitives().isEmpty());
+ assertTrue(ds.allNonDeletedPhysicalPrimitives().isEmpty());
+
+ Node n1 = new Node(1); n1.setCoor(LatLon.NORTH_POLE); n1.setDeleted(true); n1.setIncomplete(false); ds.addPrimitive(n1);
+ Node n2 = new Node(2); n2.setCoor(LatLon.NORTH_POLE); n2.setDeleted(false); n2.setIncomplete(false); ds.addPrimitive(n2);
+ Node n3 = new Node(3); n3.setCoor(LatLon.NORTH_POLE); n3.setDeleted(false); n3.setIncomplete(true); ds.addPrimitive(n3);
+
+ Way w1 = new Way(1); w1.setDeleted(true); w1.setIncomplete(false); ds.addPrimitive(w1);
+ Way w2 = new Way(2); w2.setDeleted(false); w2.setIncomplete(false); ds.addPrimitive(w2);
+ Way w3 = new Way(3); w3.setDeleted(false); w3.setIncomplete(true); ds.addPrimitive(w3);
+
+ Relation r1 = new Relation(1); r1.setDeleted(true); r1.setIncomplete(false); ds.addPrimitive(r1);
+ Relation r2 = new Relation(2); r2.setDeleted(false); r2.setIncomplete(false); ds.addPrimitive(r2);
+ Relation r3 = new Relation(3); r3.setDeleted(false); r3.setIncomplete(true); ds.addPrimitive(r3);
+
+ assertEquals(new HashSet<>(Arrays.asList(n2, n3, w2, w3, r2, r3)),
+ new HashSet<>(ds.allNonDeletedPrimitives()));
+ assertEquals(new HashSet<>(Arrays.asList(n2, w2, r2)),
+ new HashSet<>(ds.allNonDeletedCompletePrimitives()));
+ assertEquals(new HashSet<>(Arrays.asList(n2, w2)),
+ new HashSet<>(ds.allNonDeletedPhysicalPrimitives()));
+ }
+
+ /**
* Non-regression test for <a href="https://josm.openstreetmap.de/ticket/14186">Bug #14186</a>.
*/
@Test
diff --git a/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java b/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java
index d9d6709..b4351c1 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/FilterTest.java
@@ -1,6 +1,7 @@
// 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;
@@ -17,11 +18,14 @@ import org.junit.Test;
import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
import org.openstreetmap.josm.actions.search.SearchCompiler.ParseError;
import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Filter.FilterPreferenceEntry;
import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
import org.openstreetmap.josm.io.OsmReader;
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 Filter}.
@@ -186,7 +190,63 @@ public class FilterTest {
}
}
- private String filterCode(OsmPrimitive osm) {
+ /**
+ * Unit tests of {@link Filter.FilterPreferenceEntry} class.
+ */
+ @Test
+ public void testFilterPreferenceEntry() {
+ Filter f = new Filter();
+ FilterPreferenceEntry fpe = f.getPreferenceEntry();
+
+ assertTrue(fpe.enable);
+
+ assertFalse(fpe.case_sensitive);
+ assertFalse(fpe.hiding);
+ assertFalse(fpe.inverted);
+ assertFalse(fpe.mapCSS_search);
+ assertFalse(fpe.regex_search);
+
+ assertEquals("add", fpe.mode);
+ assertEquals("1", fpe.version);
+ assertEquals("", fpe.text);
+
+ f.allElements = !f.allElements;
+ f.caseSensitive = !f.caseSensitive;
+ f.enable = !f.enable;
+ f.hiding = !f.hiding;
+ f.inverted = !f.inverted;
+ f.mapCSSSearch = !f.mapCSSSearch;
+ f.mode = SearchMode.remove;
+ f.regexSearch = !f.regexSearch;
+ f.text = "foo";
+ fpe = f.getPreferenceEntry();
+
+ assertFalse(fpe.enable);
+
+ assertTrue(fpe.case_sensitive);
+ assertTrue(fpe.hiding);
+ assertTrue(fpe.inverted);
+ assertTrue(fpe.mapCSS_search);
+ assertTrue(fpe.regex_search);
+
+ assertEquals("remove", fpe.mode);
+ assertEquals("1", fpe.version);
+ assertEquals("foo", fpe.text);
+
+ assertEquals(fpe, new Filter(fpe).getPreferenceEntry());
+ }
+
+ /**
+ * Unit test of methods {@link FilterPreferenceEntry#equals} and {@link FilterPreferenceEntry#hashCode}.
+ */
+ @Test
+ public void testEqualsContract() {
+ EqualsVerifier.forClass(FilterPreferenceEntry.class).usingGetClass()
+ .suppress(Warning.NONFINAL_FIELDS)
+ .verify();
+ }
+
+ private static String filterCode(OsmPrimitive osm) {
if (!osm.isDisabled())
return "v";
if (!osm.isDisabledAndHidden())
diff --git a/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java b/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java
index b393a57..1498f39 100644
--- a/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java
+++ b/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveKeyHandlingTest.java
@@ -138,7 +138,7 @@ public class OsmPrimitiveKeyHandlingTest {
* Test hasEqualSemanticAttributes on two nodes with different tags.
*/
@Test
- public void testHasEqualSemanticAttributes_2() {
+ public void testHasEqualSemanticAttributes2() {
Node n1 = new Node(1);
n1.setCoor(LatLon.ZERO);
n1.put("key.1", "value.1");
diff --git a/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTypeTest.java b/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTypeTest.java
new file mode 100644
index 0000000..713ad4b
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/OsmPrimitiveTypeTest.java
@@ -0,0 +1,187 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Collection;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of the {@code OsmPrimitiveType} class.
+ */
+public class OsmPrimitiveTypeTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of {@link OsmPrimitiveType} enum.
+ */
+ @Test
+ public void testEnum() {
+ TestUtils.superficialEnumCodeCoverage(OsmPrimitiveType.class);
+ }
+
+ /**
+ * Unit test of {@link OsmPrimitiveType#getAPIName} method.
+ */
+ @Test
+ public void testGetApiName() {
+ assertEquals("node", OsmPrimitiveType.NODE.getAPIName());
+ assertEquals("way", OsmPrimitiveType.WAY.getAPIName());
+ assertEquals("relation", OsmPrimitiveType.RELATION.getAPIName());
+ }
+
+ /**
+ * Unit test of {@link OsmPrimitiveType#getOsmClass} method.
+ */
+ @Test
+ public void testGetOsmClass() {
+ assertEquals(Node.class, OsmPrimitiveType.NODE.getOsmClass());
+ assertEquals(Way.class, OsmPrimitiveType.WAY.getOsmClass());
+ assertEquals(Relation.class, OsmPrimitiveType.RELATION.getOsmClass());
+ assertNull(OsmPrimitiveType.CLOSEDWAY.getOsmClass());
+ assertNull(OsmPrimitiveType.MULTIPOLYGON.getOsmClass());
+ }
+
+ /**
+ * Unit test of {@link OsmPrimitiveType#getDataClass} method.
+ */
+ @Test
+ public void testGetDataClass() {
+ assertEquals(NodeData.class, OsmPrimitiveType.NODE.getDataClass());
+ assertEquals(WayData.class, OsmPrimitiveType.WAY.getDataClass());
+ assertEquals(RelationData.class, OsmPrimitiveType.RELATION.getDataClass());
+ assertEquals(WayData.class, OsmPrimitiveType.CLOSEDWAY.getDataClass());
+ assertEquals(RelationData.class, OsmPrimitiveType.MULTIPOLYGON.getDataClass());
+ }
+
+ /**
+ * Unit test of {@link OsmPrimitiveType#fromApiTypeName} method.
+ */
+ @Test
+ public void testFromApiTypeName() {
+ assertEquals(OsmPrimitiveType.NODE, OsmPrimitiveType.fromApiTypeName("node"));
+ assertEquals(OsmPrimitiveType.WAY, OsmPrimitiveType.fromApiTypeName("way"));
+ assertEquals(OsmPrimitiveType.RELATION, OsmPrimitiveType.fromApiTypeName("relation"));
+ }
+
+ /**
+ * Unit test of {@link OsmPrimitiveType#fromApiTypeName} method - error case.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testFromApiTypeNameError() {
+ OsmPrimitiveType.fromApiTypeName("foo");
+ }
+
+ /**
+ * Unit test of {@link OsmPrimitiveType#from(IPrimitive)} method.
+ */
+ @Test
+ public void testFromIPrimitive() {
+ assertEquals(OsmPrimitiveType.NODE, OsmPrimitiveType.from(new Node()));
+ assertEquals(OsmPrimitiveType.WAY, OsmPrimitiveType.from(new Way()));
+ assertEquals(OsmPrimitiveType.RELATION, OsmPrimitiveType.from(new Relation()));
+ }
+
+ /**
+ * Unit test of {@link OsmPrimitiveType#from(IPrimitive)} method - error case.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testFromIPrimitiveError() {
+ OsmPrimitiveType.from((IPrimitive) null);
+ }
+
+ /**
+ * Unit test of {@link OsmPrimitiveType#from(String)} method.
+ */
+ @Test
+ public void testFromString() {
+ assertEquals(OsmPrimitiveType.NODE, OsmPrimitiveType.from("node"));
+ assertEquals(OsmPrimitiveType.WAY, OsmPrimitiveType.from("WAY"));
+ assertEquals(OsmPrimitiveType.RELATION, OsmPrimitiveType.from("Relation"));
+ assertEquals(OsmPrimitiveType.CLOSEDWAY, OsmPrimitiveType.from("closedway"));
+ assertEquals(OsmPrimitiveType.MULTIPOLYGON, OsmPrimitiveType.from("multipolygon"));
+ assertNull(OsmPrimitiveType.from((String) null));
+ }
+
+ /**
+ * Unit test of {@link OsmPrimitiveType#dataValues} method.
+ */
+ @Test
+ public void testDataValues() {
+ Collection<OsmPrimitiveType> values = OsmPrimitiveType.dataValues();
+ assertEquals(3, values.size());
+ assertTrue(values.contains(OsmPrimitiveType.NODE));
+ assertTrue(values.contains(OsmPrimitiveType.WAY));
+ assertTrue(values.contains(OsmPrimitiveType.RELATION));
+ }
+
+ /**
+ * Unit test of {@link OsmPrimitiveType#newInstance} method.
+ */
+ @Test
+ public void testNewInstance() {
+ OsmPrimitive n = OsmPrimitiveType.NODE.newInstance(1, false);
+ OsmPrimitive w = OsmPrimitiveType.WAY.newInstance(2, false);
+ OsmPrimitive r = OsmPrimitiveType.RELATION.newInstance(3, false);
+
+ assertTrue(n instanceof Node);
+ assertTrue(w instanceof Way);
+ assertTrue(r instanceof Relation);
+
+ assertEquals(1, n.getId());
+ assertEquals(2, w.getId());
+ assertEquals(3, r.getId());
+ }
+
+ /**
+ * Unit test of {@link OsmPrimitiveType#newInstance} method - error case.
+ */
+ @Test(expected = AssertionError.class)
+ public void testNewInstanceError() {
+ OsmPrimitiveType.CLOSEDWAY.newInstance(1, false);
+ }
+
+ /**
+ * Unit test of {@link OsmPrimitiveType#newVersionedInstance} method.
+ */
+ @Test
+ public void testNewVersionedInstance() {
+ OsmPrimitive n = OsmPrimitiveType.NODE.newVersionedInstance(1, 4);
+ OsmPrimitive w = OsmPrimitiveType.WAY.newVersionedInstance(2, 5);
+ OsmPrimitive r = OsmPrimitiveType.RELATION.newVersionedInstance(3, 6);
+
+ assertTrue(n instanceof Node);
+ assertTrue(w instanceof Way);
+ assertTrue(r instanceof Relation);
+
+ assertEquals(1, n.getId());
+ assertEquals(2, w.getId());
+ assertEquals(3, r.getId());
+
+ assertEquals(4, n.getVersion());
+ assertEquals(5, w.getVersion());
+ assertEquals(6, r.getVersion());
+ }
+
+ /**
+ * Unit test of {@link OsmPrimitiveType#newVersionedInstance} method - error case.
+ */
+ @Test(expected = AssertionError.class)
+ public void testNewVersionedInstanceError() {
+ OsmPrimitiveType.CLOSEDWAY.newVersionedInstance(1, 0);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/UserTest.java b/test/unit/org/openstreetmap/josm/data/osm/UserTest.java
new file mode 100644
index 0000000..5181ff0
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/UserTest.java
@@ -0,0 +1,46 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Tests of {@link User}.
+ */
+public class UserTest {
+
+ /**
+ * Setup test
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Test method for {@link User#createOsmUser}.
+ */
+ @Test
+ public void testCreateOsmUser() {
+ try {
+ User user1 = User.createOsmUser(1, "name1");
+ assertEquals(1, user1.getId());
+ assertEquals("name1", user1.getName());
+ User user2 = User.createOsmUser(1, "name2");
+ assertSame(user1, user2);
+ assertEquals(1, user2.getId());
+ assertEquals("name2", user2.getName());
+ assertEquals(2, user2.getNames().size());
+ assertTrue(user2.getNames().contains("name1"));
+ assertTrue(user2.getNames().contains("name2"));
+ } finally {
+ User.clearUserMap();
+ }
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/event/ChangesetIdChangedEventTest.java b/test/unit/org/openstreetmap/josm/data/osm/event/ChangesetIdChangedEventTest.java
new file mode 100644
index 0000000..5b3b642
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/event/ChangesetIdChangedEventTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm.event;
+
+import static org.junit.Assert.assertEquals;
+
+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 ChangesetIdChangedEvent} class.
+ */
+public class ChangesetIdChangedEventTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of {@link ChangesetIdChangedEvent#toString}.
+ */
+ @Test
+ public void testToString() {
+ assertEquals("CHANGESET_ID_CHANGED", new ChangesetIdChangedEvent(null, null, 0, 0).toString());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/event/DataChangedEventTest.java b/test/unit/org/openstreetmap/josm/data/osm/event/DataChangedEventTest.java
new file mode 100644
index 0000000..59d1c15
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/event/DataChangedEventTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm.event;
+
+import static org.junit.Assert.assertEquals;
+
+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 DataChangedEvent} class.
+ */
+public class DataChangedEventTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of {@link DataChangedEvent#toString}.
+ */
+ @Test
+ public void testToString() {
+ assertEquals("DATA_CHANGED", new DataChangedEvent(null).toString());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/event/NodeMovedEventTest.java b/test/unit/org/openstreetmap/josm/data/osm/event/NodeMovedEventTest.java
new file mode 100644
index 0000000..6318720
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/event/NodeMovedEventTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm.event;
+
+import static org.junit.Assert.assertEquals;
+
+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 NodeMovedEvent} class.
+ */
+public class NodeMovedEventTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of {@link NodeMovedEvent#toString}.
+ */
+ @Test
+ public void testToString() {
+ assertEquals("NODE_MOVED", new NodeMovedEvent(null, null).toString());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/event/PrimitiveFlagsChangedEventTest.java b/test/unit/org/openstreetmap/josm/data/osm/event/PrimitiveFlagsChangedEventTest.java
new file mode 100644
index 0000000..7b787ad
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/event/PrimitiveFlagsChangedEventTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm.event;
+
+import static org.junit.Assert.assertEquals;
+
+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 PrimitiveFlagsChangedEvent} class.
+ */
+public class PrimitiveFlagsChangedEventTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of {@link PrimitiveFlagsChangedEvent#toString}.
+ */
+ @Test
+ public void testToString() {
+ assertEquals("PRIMITIVE_FLAGS_CHANGED", new PrimitiveFlagsChangedEvent(null, null).toString());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEventTest.java b/test/unit/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEventTest.java
new file mode 100644
index 0000000..ab75b43
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/event/PrimitivesAddedEventTest.java
@@ -0,0 +1,33 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm.event;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+
+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 PrimitivesAddedEvent} class.
+ */
+public class PrimitivesAddedEventTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of {@link PrimitivesAddedEvent#toString}.
+ */
+ @Test
+ public void testToString() {
+ assertEquals("PRIMITIVES_ADDED", new PrimitivesAddedEvent(null, Collections.emptyList(), false).toString());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEventTest.java b/test/unit/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEventTest.java
new file mode 100644
index 0000000..f135b71
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/event/PrimitivesRemovedEventTest.java
@@ -0,0 +1,33 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm.event;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collections;
+
+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 PrimitivesRemovedEvent} class.
+ */
+public class PrimitivesRemovedEventTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of {@link PrimitivesRemovedEvent#toString}.
+ */
+ @Test
+ public void testToString() {
+ assertEquals("PRIMITIVES_REMOVED", new PrimitivesRemovedEvent(null, Collections.emptyList(), false).toString());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/event/RelationMembersChangedEventTest.java b/test/unit/org/openstreetmap/josm/data/osm/event/RelationMembersChangedEventTest.java
new file mode 100644
index 0000000..3fc156b
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/event/RelationMembersChangedEventTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm.event;
+
+import static org.junit.Assert.assertEquals;
+
+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 RelationMembersChangedEvent} class.
+ */
+public class RelationMembersChangedEventTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of {@link RelationMembersChangedEvent#toString}.
+ */
+ @Test
+ public void testToString() {
+ assertEquals("RELATION_MEMBERS_CHANGED", new RelationMembersChangedEvent(null, null).toString());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/event/TagsChangedEventTest.java b/test/unit/org/openstreetmap/josm/data/osm/event/TagsChangedEventTest.java
new file mode 100644
index 0000000..fb1ac07
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/event/TagsChangedEventTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm.event;
+
+import static org.junit.Assert.assertEquals;
+
+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 TagsChangedEvent} class.
+ */
+public class TagsChangedEventTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of {@link TagsChangedEvent#toString}.
+ */
+ @Test
+ public void testToString() {
+ assertEquals("TAGS_CHANGED", new TagsChangedEvent(null, null, null).toString());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/osm/event/WayNodesChangedEventTest.java b/test/unit/org/openstreetmap/josm/data/osm/event/WayNodesChangedEventTest.java
new file mode 100644
index 0000000..57555a0
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/osm/event/WayNodesChangedEventTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.osm.event;
+
+import static org.junit.Assert.assertEquals;
+
+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 WayNodesChangedEvent} class.
+ */
+public class WayNodesChangedEventTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of {@link WayNodesChangedEvent#toString}.
+ */
+ @Test
+ public void testToString() {
+ assertEquals("WAY_NODES_CHANGED", new WayNodesChangedEvent(null, null).toString());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/projection/CustomProjectionTest.java b/test/unit/org/openstreetmap/josm/data/projection/CustomProjectionTest.java
index d580f31..254bcd3 100644
--- a/test/unit/org/openstreetmap/josm/data/projection/CustomProjectionTest.java
+++ b/test/unit/org/openstreetmap/josm/data/projection/CustomProjectionTest.java
@@ -9,6 +9,8 @@ import java.util.stream.Stream;
import org.junit.Rule;
import org.junit.Test;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.projection.CustomProjection.Polarity;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -70,4 +72,13 @@ public class CustomProjectionTest {
}
});
}
+
+ /**
+ * Test {@link CustomProjection.Polarity}.
+ */
+ @Test
+ public void testPolarity() {
+ assertEquals(LatLon.NORTH_POLE, Polarity.NORTH.getLatLon());
+ assertEquals(LatLon.SOUTH_POLE, Polarity.SOUTH.getLatLon());
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
index 2a8da91..d031cb6 100644
--- a/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
+++ b/test/unit/org/openstreetmap/josm/data/projection/ProjectionRegressionTest.java
@@ -179,6 +179,7 @@ public class ProjectionRegressionTest {
}
}
+ final boolean java9 = TestUtils.getJavaVersion() >= 9;
for (TestData data : allData) {
Projection proj = Projections.getProjectionByCode(data.code);
if (proj == null) {
@@ -187,20 +188,14 @@ public class ProjectionRegressionTest {
}
EastNorth en = proj.latlon2eastNorth(data.ll);
LatLon ll2 = proj.eastNorth2latlon(data.en);
- if (TestUtils.getJavaVersion() >= 9) {
- en = getRoundedToOsmPrecision(en.east(), en.north());
- ll2 = ll2.getRoundedToOsmPrecision();
- data.en = getRoundedToOsmPrecision(data.en.east(), data.en.north());
- data.ll2 = data.ll2.getRoundedToOsmPrecision();
- }
- if (!en.equals(data.en)) {
+ if (!(java9 ? equalsJava9(en, data.en) : en.equals(data.en))) {
String error = String.format("%s (%s): Projecting latlon(%s,%s):%n" +
" expected: eastnorth(%s,%s),%n" +
" but got: eastnorth(%s,%s)!%n",
proj.toString(), data.code, data.ll.lat(), data.ll.lon(), data.en.east(), data.en.north(), en.east(), en.north());
fail.append(error);
}
- if (!ll2.equals(data.ll2)) {
+ if (!(java9 ? equalsJava9(ll2, data.ll2) : ll2.equals(data.ll2))) {
String error = String.format("%s (%s): Inverse projecting eastnorth(%s,%s):%n" +
" expected: latlon(%s,%s),%n" +
" but got: latlon(%s,%s)!%n",
@@ -214,4 +209,23 @@ public class ProjectionRegressionTest {
throw new AssertionError(fail.toString());
}
}
+
+ private static boolean equalsDoubleMaxUlp(double d1, double d2) {
+ // Due to error accumulation in projection computation, the difference can reach hundreds of ULPs
+ // The worst error is 816 ULP (followed by 512 ULP then 400 ULP) with:
+ // WGS 72BE / UTM zone 12N (EPSG:32412): Projecting latlon(-19.603789209544317,-115.55033658613439):
+ // expected: eastnorth(22416.160243623483,-2174011.280696576),
+ // but got: eastnorth(22416.16024362645,-2174011.280696576)!
+ return Math.abs(d1 - d2) <= 850 * Math.ulp(d1);
+ }
+
+ private static boolean equalsJava9(EastNorth en1, EastNorth en2) {
+ return equalsDoubleMaxUlp(en1.east(), en2.east()) &&
+ equalsDoubleMaxUlp(en1.north(), en2.north());
+ }
+
+ private static boolean equalsJava9(LatLon ll1, LatLon ll2) {
+ return equalsDoubleMaxUlp(ll1.lat(), ll2.lat()) &&
+ equalsDoubleMaxUlp(ll1.lon(), ll2.lon());
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/data/projection/proj/LonLatTest.java b/test/unit/org/openstreetmap/josm/data/projection/proj/LonLatTest.java
new file mode 100644
index 0000000..a9288ef
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/projection/proj/LonLatTest.java
@@ -0,0 +1,30 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.projection.proj;
+
+import static org.junit.Assert.assertFalse;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Tests for {@link LonLat}.
+ */
+public class LonLatTest {
+ /**
+ * Setup rule.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Test {@link LonLat#lonIsLinearToEast}
+ */
+ @Test
+ public void testLonIsLinearToEast() {
+ assertFalse(new LonLat().lonIsLinearToEast());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/projection/proj/MercatorTest.java b/test/unit/org/openstreetmap/josm/data/projection/proj/MercatorTest.java
new file mode 100644
index 0000000..4405c43
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/projection/proj/MercatorTest.java
@@ -0,0 +1,30 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.projection.proj;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Tests for {@link Mercator}.
+ */
+public class MercatorTest {
+ /**
+ * Setup rule.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Test {@link Mercator#lonIsLinearToEast}
+ */
+ @Test
+ public void testLonIsLinearToEast() {
+ assertTrue(new Mercator().lonIsLinearToEast());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/OsmValidatorTest.java b/test/unit/org/openstreetmap/josm/data/validation/OsmValidatorTest.java
new file mode 100644
index 0000000..af001ac
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/validation/OsmValidatorTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
+
+/**
+ * Unit tests for class {@link OsmValidator}.
+ */
+public class OsmValidatorTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules().platform();
+
+ /**
+ * Tests that {@code OsmValidator} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(OsmValidator.class);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java
index 1b97917..0923099 100644
--- a/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java
@@ -71,6 +71,9 @@ public class OpeningHourTestTest {
key, "Su-Th sunset-24:00, 04:00-sunrise; Fr-Sa sunset-sunrise").get(0).getPrettifiedValue());
}
+ /**
+ * Test translated messages.
+ */
@Test
public void testI18n() {
assertTrue(openingHourTest.checkOpeningHourSyntax("opening_hours", ".", OpeningHourTest.CheckMode.POINTS_IN_TIME, false, "de")
@@ -117,7 +120,8 @@ public class OpeningHourTestTest {
public void testCheckOpeningHourSyntax4() {
assertThat(openingHourTest.checkOpeningHourSyntax(null, null), isEmpty());
assertThat(openingHourTest.checkOpeningHourSyntax(null, ""), isEmpty());
- assertThat(openingHourTest.checkOpeningHourSyntax(null, " "), isEmpty());
+ assertEquals("null - The value contains nothing meaningful which can be parsed.",
+ openingHourTest.checkOpeningHourSyntax(null, " ").get(0).getMessage());
}
/**
diff --git a/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.java b/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.java
index a7a5eb5..2cf6420 100644
--- a/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.java
+++ b/test/unit/org/openstreetmap/josm/data/validation/tests/RelationCheckerTest.java
@@ -138,6 +138,21 @@ public class RelationCheckerTest {
}
@Test
+ public void testBuildingMemberExpression() {
+ Relation r = createRelation("type=building");
+ r.addMember(new RelationMember("outline", new Way()));
+ r.addMember(new RelationMember("part", new Way()));
+ r.addMember(new RelationMember("level_-12", new Relation()));
+ r.addMember(new RelationMember("level_0", new Relation()));
+ r.addMember(new RelationMember("level_12", new Relation()));
+ r.addMember(new RelationMember("level_x", new Relation())); // fails
+
+ List<TestError> errors = testRelation(r);
+ assertEquals(1, errors.size());
+ assertEquals("Role 'level_x' unknown in templates 'outline/part/ridge/edge/entrance/level_-?\\d+'", 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")));
diff --git a/test/unit/org/openstreetmap/josm/data/validation/util/EntitiesTest.java b/test/unit/org/openstreetmap/josm/data/validation/util/EntitiesTest.java
new file mode 100644
index 0000000..7cc43c9
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/validation/util/EntitiesTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation.util;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
+
+/**
+ * Unit tests for class {@link Entities}.
+ */
+public class EntitiesTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Tests that {@code Entities} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(Entities.class);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/data/validation/util/ValUtilTest.java b/test/unit/org/openstreetmap/josm/data/validation/util/ValUtilTest.java
new file mode 100644
index 0000000..50980a5
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/data/validation/util/ValUtilTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.data.validation.util;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
+
+/**
+ * Unit tests for class {@link ValUtil}.
+ */
+public class ValUtilTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Tests that {@code ValUtil} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(ValUtil.class);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/ConditionalOptionPaneUtilTest.java b/test/unit/org/openstreetmap/josm/gui/ConditionalOptionPaneUtilTest.java
new file mode 100644
index 0000000..91dc268
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/ConditionalOptionPaneUtilTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
+
+/**
+ * Unit tests of {@link ConditionalOptionPaneUtil} class.
+ */
+public class ConditionalOptionPaneUtilTest {
+
+ /**
+ * Setup rule
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Tests that {@code ConditionalOptionPaneUtil} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(ConditionalOptionPaneUtil.class);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/ExceptionDialogUtilTest.java b/test/unit/org/openstreetmap/josm/gui/ExceptionDialogUtilTest.java
new file mode 100644
index 0000000..daeba52
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/ExceptionDialogUtilTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
+
+/**
+ * Unit tests of {@link ExceptionDialogUtil} class.
+ */
+public class ExceptionDialogUtilTest {
+
+ /**
+ * Setup rule
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Tests that {@code ExceptionDialogUtil} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(ExceptionDialogUtil.class);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.groovy b/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.groovy
deleted file mode 100644
index 90df07b..0000000
--- a/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.groovy
+++ /dev/null
@@ -1,327 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui
-
-import static org.junit.Assert.*
-
-import org.junit.BeforeClass
-import org.junit.Test
-import org.openstreetmap.josm.JOSMFixture
-import org.openstreetmap.josm.Main
-import org.openstreetmap.josm.data.osm.User
-import org.openstreetmap.josm.data.osm.UserInfo
-
-class JosmUserIdentityManagerTest {
-
- final shouldFail = new GroovyTestCase().&shouldFail
-
- @BeforeClass
- public static void initTestCase() {
- JOSMFixture.createUnitTestFixture().init()
- }
-
- @Test
- public void test_SingletonAccess() {
-
- JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
-
- // created ?
- assert im != null
-
- JosmUserIdentityManager im2 = JosmUserIdentityManager.getInstance()
-
- // only one instance
- assert im == im2
- }
-
- @Test
- public void test_setAnonymous() {
- JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
-
- im.setPartiallyIdentified "test"
- im.setAnonymous()
-
- assert im.isAnonymous()
- assert ! im.isPartiallyIdentified()
- assert ! im.isFullyIdentified()
-
- assert im.getUserId() == 0
- assert im.getUserName() == null
- assert im.getUserInfo() == null
- assert im.asUser() == User.anonymous
- }
-
- @Test
- public void test_setPartiallyIdentified() {
- JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
-
- im.setPartiallyIdentified "test"
-
- shouldFail(IllegalArgumentException) {
- im.setPartiallyIdentified null
- }
-
- shouldFail(IllegalArgumentException) {
- im.setPartiallyIdentified ""
- }
-
- shouldFail(IllegalArgumentException) {
- im.setPartiallyIdentified " \t "
- }
-
- im.setPartiallyIdentified "test"
-
- assert ! im.isAnonymous()
- assert im.isPartiallyIdentified()
- assert ! im.isFullyIdentified()
-
- assert im.getUserId() == 0
- assert im.getUserName() == "test"
- assert im.getUserInfo() == null
- assert im.asUser() == new User(0, "test")
- }
-
-
- @Test
- public void test_setFullyIdentified() {
- JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
-
- UserInfo userInfo = new UserInfo(id: 1, description: "a description")
-
- im.setFullyIdentified "test", userInfo
-
- shouldFail(IllegalArgumentException) {
- im.setFullyIdentified null, userInfo
- }
- shouldFail(IllegalArgumentException) {
- im.setFullyIdentified "", userInfo
- }
- shouldFail(IllegalArgumentException) {
- im.setFullyIdentified " \t ", userInfo
- }
- shouldFail(IllegalArgumentException) {
- im.setFullyIdentified "test", null
- }
-
- im.setFullyIdentified "test", userInfo
-
- assert ! im.isAnonymous()
- assert ! im.isPartiallyIdentified()
- assert im.isFullyIdentified()
-
- assert im.getUserId() == 1
- assert im.getUserName() == "test"
- assert im.getUserInfo() == userInfo
- assert im.asUser() == new User(1, "test")
- }
-
- /**
- * Preferences include neither an url nor a user name => we have an anonymous user
- */
- @Test
- public void initFromPreferences_1() {
- JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
-
- // reset it
- im. at userName = null
- im. at userInfo = null
-
- Main.pref.put "osm-server.url", null
- Main.pref.put "osm-server.username", null
-
- im.initFromPreferences()
-
- assert im.isAnonymous()
- }
-
- /**
- * Preferences include neither an url nor a user name => we have an anonymous user
- */
- @Test
- public void initFromPreferences_2() {
- JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
-
- // reset it
- im. at userName = null
- im. at userInfo = null
-
- // for this test we disable the listener
- Main.pref.removePreferenceChangeListener im
-
- try {
- Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
- Main.pref.put "osm-server.username", null
-
- im.initFromPreferences()
-
- assert im.isAnonymous()
- } finally {
- Main.pref.addPreferenceChangeListener im
- }
- }
-
- /**
- * Preferences include an user name => we have a partially identified user
- */
- @Test
- public void initFromPreferences_3() {
- JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
-
- // for this test we disable the listener
- Main.pref.removePreferenceChangeListener im
-
- try {
- // reset it
- im. at userName = null
- im. at userInfo = null
-
- Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
- Main.pref.put "osm-server.username", "test"
-
- im.initFromPreferences()
-
- assert im.isPartiallyIdentified()
- } finally {
- Main.pref.addPreferenceChangeListener im
- }
- }
-
- /**
- * Preferences include an user name which is different from the current
- * user name and we are currently fully identifed => josm user becomes
- * partially identified
- */
- @Test
- public void initFromPreferences_4() {
- JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
-
- // for this test we disable the listener
- Main.pref.removePreferenceChangeListener im
-
- try {
- im.setFullyIdentified "test1", new UserInfo(id: 1)
-
- Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
- Main.pref.put "osm-server.username", "test2"
-
- im.initFromPreferences()
-
- assert im.isPartiallyIdentified()
- } finally {
- Main.pref.addPreferenceChangeListener im
- }
- }
-
- /**
- * Preferences include an user name which is the same as the current
- * user name and we are currently fully identifed => josm user remains
- * fully identified
- */
- @Test
- public void initFromPreferences_5() {
- JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
-
- // for this test we disable the listener
- Main.pref.removePreferenceChangeListener im
-
- try {
- im.setFullyIdentified "test1", new UserInfo(id: 1)
-
- Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
- Main.pref.put "osm-server.username", "test1"
-
- im.initFromPreferences()
-
- assert im.isFullyIdentified()
- } finally {
- Main.pref.addPreferenceChangeListener im
- }
- }
-
- @Test
- public void apiUrlChanged() {
- JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
-
- // reset it
- im. at userName = null
- im. at userInfo = null
-
- Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
- assert im.isAnonymous()
-
- Main.pref.put "osm-server.url", null
- assert im.isAnonymous()
-
- // reset it
- im. at userName = "test"
- im. at userInfo = null
-
- Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
- assert im.isPartiallyIdentified()
- assert im.getUserName() == "test"
-
- Main.pref.put "osm-server.url", null
- assert im.isAnonymous()
-
- // reset it
- im. at userName = "test"
- im. at userInfo = new UserInfo(id:1)
-
- Main.pref.put "osm-server.url", "http://api.openstreetmap.org"
- assert im.isPartiallyIdentified()
- assert im.getUserName() == "test"
-
- // reset it
- im. at userName = "test"
- im. at userInfo = new UserInfo(id:1)
-
-
- Main.pref.put "osm-server.url", null
- assert im.isAnonymous()
- }
-
- @Test
- public void userNameChanged() {
- JosmUserIdentityManager im = JosmUserIdentityManager.getInstance()
-
- // reset it
- im. at userName = null
- im. at userInfo = null
-
- Main.pref.put "osm-server.username", "test"
- assert im.isPartiallyIdentified()
- assert im.getUserName() == "test"
-
- Main.pref.put "osm-server.username", null
- assert im.isAnonymous()
- assert im.asUser() == User.anonymous
-
- // reset it
- im. at userName = "test1"
- im. at userInfo = null
-
- Main.pref.put "osm-server.username", "test2"
- assert im.isPartiallyIdentified()
- assert im.getUserName() == "test2"
- assert im.asUser() == new User(0, "test2")
-
- Main.pref.put "osm-server.username", null
- assert im.isAnonymous()
-
- // reset it
- im. at userName = "test1"
- im. at userInfo = new UserInfo(id:1)
-
- Main.pref.put "osm-server.username", "test2"
- assert im.isPartiallyIdentified()
- assert im.getUserName() == "test2"
- assert im.asUser() == new User(0, "test2")
-
- // reset it
- im. at userName = "test1"
- im. at userInfo = new UserInfo(id:1)
-
-
- Main.pref.put "osm-server.username", null
- assert im.isAnonymous()
- }
-}
diff --git a/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.java b/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.java
new file mode 100644
index 0000000..eb7b2ec
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.java
@@ -0,0 +1,387 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui;
+
+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.assertSame;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.User;
+import org.openstreetmap.josm.data.osm.UserInfo;
+
+/**
+ * Unit tests of {@link JosmUserIdentityManager} class.
+ */
+public class JosmUserIdentityManagerTest {
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void initTestCase() {
+ JOSMFixture.createUnitTestFixture().init();
+ }
+
+ private static UserInfo newUserInfo() {
+ return newUserInfo(1, "a description");
+ }
+
+ private static UserInfo newUserInfo(int id, String description) {
+ UserInfo userInfo = new UserInfo();
+ userInfo.setId(id);
+ userInfo.setDescription(description);
+ return userInfo;
+ }
+
+ /**
+ * Test singleton access.
+ */
+ @Test
+ public void testSingletonAccess() {
+
+ JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+
+ // created ?
+ assertNotNull(im);
+
+ JosmUserIdentityManager im2 = JosmUserIdentityManager.getInstance();
+
+ // only one instance
+ assertSame(im, im2);
+ }
+
+ /**
+ * Unit test of {@link JosmUserIdentityManager#setAnonymous}.
+ */
+ @Test
+ public void testSetAnonymous() {
+ JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+
+ im.setPartiallyIdentified("test");
+ im.setAnonymous();
+
+ assertTrue(im.isAnonymous());
+ assertFalse(im.isPartiallyIdentified());
+ assertFalse(im.isFullyIdentified());
+
+ assertEquals(0, im.getUserId());
+ assertNull(im.getUserName());
+ assertNull(im.getUserInfo());
+ assertSame(User.getAnonymous(), im.asUser());
+ }
+
+ /**
+ * Unit test of {@link JosmUserIdentityManager#setPartiallyIdentified} - nominal case.
+ */
+ @Test
+ public void testSetPartiallyIdentified() {
+ JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+ im.setPartiallyIdentified("test");
+
+ assertFalse(im.isAnonymous());
+ assertTrue(im.isPartiallyIdentified());
+ assertFalse(im.isFullyIdentified());
+
+ assertEquals(0, im.getUserId());
+ assertEquals("test", im.getUserName());
+ assertNull(im.getUserInfo());
+ User usr = im.asUser();
+ assertEquals(0, usr.getId());
+ assertEquals("test", usr.getName());
+ }
+
+ /**
+ * Unit test of {@link JosmUserIdentityManager#setPartiallyIdentified} - null case.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testSetPartiallyIdentifiedNull() {
+ JosmUserIdentityManager.getInstance().setPartiallyIdentified(null);
+ }
+
+ /**
+ * Unit test of {@link JosmUserIdentityManager#setPartiallyIdentified} - empty case.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testSetPartiallyIdentifiedEmpty() {
+ JosmUserIdentityManager.getInstance().setPartiallyIdentified("");
+ }
+
+ /**
+ * Unit test of {@link JosmUserIdentityManager#setPartiallyIdentified} - blank case.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testSetPartiallyIdentifiedBlank() {
+ JosmUserIdentityManager.getInstance().setPartiallyIdentified(" \t ");
+ }
+
+ /**
+ * Unit test of {@link JosmUserIdentityManager#setFullyIdentified} - nominal case.
+ */
+ @Test
+ public void testSetFullyIdentified() {
+ JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+
+ UserInfo userInfo = newUserInfo();
+
+ im.setFullyIdentified("test", userInfo);
+
+ assertFalse(im.isAnonymous());
+ assertFalse(im.isPartiallyIdentified());
+ assertTrue(im.isFullyIdentified());
+
+ assertEquals(1, im.getUserId());
+ assertEquals("test", im.getUserName());
+ assertEquals(userInfo, im.getUserInfo());
+ User usr = im.asUser();
+ assertEquals(1, usr.getId());
+ assertEquals("test", usr.getName());
+ }
+
+ /**
+ * Unit test of {@link JosmUserIdentityManager#setFullyIdentified} - null name case.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testSetFullyIdentifiedNullName() {
+ JosmUserIdentityManager.getInstance().setFullyIdentified(null, newUserInfo());
+ }
+
+ /**
+ * Unit test of {@link JosmUserIdentityManager#setFullyIdentified} - empty name case.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testSetFullyIdentifiedEmptyName() {
+ JosmUserIdentityManager.getInstance().setFullyIdentified("", newUserInfo());
+ }
+
+ /**
+ * Unit test of {@link JosmUserIdentityManager#setFullyIdentified} - blank name case.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testSetFullyIdentifiedBlankName() {
+ JosmUserIdentityManager.getInstance().setFullyIdentified(" \t ", newUserInfo());
+ }
+
+ /**
+ * Unit test of {@link JosmUserIdentityManager#setFullyIdentified} - null info case.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testSetFullyIdentifiedNullInfo() {
+ JosmUserIdentityManager.getInstance().setFullyIdentified("test", null);
+ }
+
+ /**
+ * Preferences include neither an url nor a user name => we have an anonymous user
+ */
+ @Test
+ public void testInitFromPreferences1() {
+ JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+
+ // reset it
+ im.setAnonymous();
+
+ // for this test we disable the listener
+ Main.pref.removePreferenceChangeListener(im);
+
+ try {
+ Main.pref.put("osm-server.url", null);
+ Main.pref.put("osm-server.username", null);
+
+ im.initFromPreferences();
+
+ assertTrue(im.isAnonymous());
+ } finally {
+ Main.pref.addPreferenceChangeListener(im);
+ }
+ }
+
+ /**
+ * Preferences include neither an url nor a user name => we have an anonymous user
+ */
+ @Test
+ public void testInitFromPreferences2() {
+ JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+
+ // reset it
+ im.setAnonymous();
+
+ // for this test we disable the listener
+ Main.pref.removePreferenceChangeListener(im);
+
+ try {
+ Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
+ Main.pref.put("osm-server.username", null);
+
+ im.initFromPreferences();
+
+ assertTrue(im.isAnonymous());
+ } finally {
+ Main.pref.addPreferenceChangeListener(im);
+ }
+ }
+
+ /**
+ * Preferences include an user name => we have a partially identified user
+ */
+ @Test
+ public void testInitFromPreferences3() {
+ JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+
+ // for this test we disable the listener
+ Main.pref.removePreferenceChangeListener(im);
+
+ try {
+ // reset it
+ im.setAnonymous();
+
+ Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
+ Main.pref.put("osm-server.username", "test");
+
+ im.initFromPreferences();
+
+ assertTrue(im.isPartiallyIdentified());
+ } finally {
+ Main.pref.addPreferenceChangeListener(im);
+ }
+ }
+
+ /**
+ * Preferences include an user name which is different from the current
+ * user name and we are currently fully identifed => josm user becomes
+ * partially identified
+ */
+ @Test
+ public void testInitFromPreferences4() {
+ JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+
+ // for this test we disable the listener
+ Main.pref.removePreferenceChangeListener(im);
+
+ try {
+ im.setFullyIdentified("test1", newUserInfo());
+
+ Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
+ Main.pref.put("osm-server.username", "test2");
+
+ im.initFromPreferences();
+
+ assertTrue(im.isPartiallyIdentified());
+ } finally {
+ Main.pref.addPreferenceChangeListener(im);
+ }
+ }
+
+ /**
+ * Preferences include an user name which is the same as the current
+ * user name and we are currently fully identifed => josm user remains
+ * fully identified
+ */
+ @Test
+ public void testInitFromPreferences5() {
+ JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+
+ // for this test we disable the listener
+ Main.pref.removePreferenceChangeListener(im);
+
+ try {
+ im.setFullyIdentified("test1", new UserInfo());
+
+ Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
+ Main.pref.put("osm-server.username", "test1");
+
+ im.initFromPreferences();
+
+ assertTrue(im.isFullyIdentified());
+ } finally {
+ Main.pref.addPreferenceChangeListener(im);
+ }
+ }
+
+ @Test
+ public void testApiUrlChanged() {
+ JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+
+ // reset it
+ im.setAnonymous();
+
+ Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
+ assertTrue(im.isAnonymous());
+
+ Main.pref.put("osm-server.url", null);
+ assertTrue(im.isAnonymous());
+
+ // reset it
+ im.setPartiallyIdentified("test");
+
+ Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
+ assertTrue(im.isPartiallyIdentified());
+ assertEquals("test", im.getUserName());
+
+ Main.pref.put("osm-server.url", null);
+ assertTrue(im.isAnonymous());
+
+ // reset it
+ im.setFullyIdentified("test", newUserInfo());
+
+ Main.pref.put("osm-server.url", "http://api.openstreetmap.org");
+ assertTrue(im.isPartiallyIdentified());
+ assertEquals("test", im.getUserName());
+
+ // reset it
+ im.setFullyIdentified("test", newUserInfo());
+
+ Main.pref.put("osm-server.url", null);
+ assertTrue(im.isAnonymous());
+ }
+
+ @Test
+ //@Ignore
+ public void testUserNameChanged() {
+ JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+
+ // reset it
+ im.setAnonymous();
+
+ Main.pref.put("osm-server.username", "test");
+ assertTrue(im.isPartiallyIdentified());
+ assertEquals("test", im.getUserName());
+
+ Main.pref.put("osm-server.username", null);
+ assertTrue(im.isAnonymous());
+ assertEquals(User.getAnonymous(), im.asUser());
+
+ // reset it
+ im.setPartiallyIdentified("test1");
+
+ Main.pref.put("osm-server.username", "test2");
+ assertTrue(im.isPartiallyIdentified());
+ assertEquals("test2", im.getUserName());
+ User usr = im.asUser();
+ assertEquals(0, usr.getId());
+ assertEquals("test2", usr.getName());
+
+ Main.pref.put("osm-server.username", null);
+ assertTrue(im.isAnonymous());
+
+ // reset it
+ im.setFullyIdentified("test1", newUserInfo());
+
+ Main.pref.put("osm-server.username", "test2");
+ assertTrue(im.isPartiallyIdentified());
+ assertEquals("test2", im.getUserName());
+ usr = im.asUser();
+ assertEquals(0, usr.getId());
+ assertEquals("test2", usr.getName());
+
+ // reset it
+ im.setFullyIdentified("test1", newUserInfo());
+
+ Main.pref.put("osm-server.username", null);
+ assertTrue(im.isAnonymous());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/NavigatableComponentTest.java b/test/unit/org/openstreetmap/josm/gui/NavigatableComponentTest.java
index d023d7c..cc26409 100644
--- a/test/unit/org/openstreetmap/josm/gui/NavigatableComponentTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/NavigatableComponentTest.java
@@ -7,10 +7,13 @@ import static org.junit.Assert.assertThat;
import java.awt.Point;
import java.awt.Rectangle;
import java.awt.geom.Point2D;
+import java.util.Objects;
import javax.swing.JPanel;
import org.CustomMatchers;
+import org.hamcrest.CustomTypeSafeMatcher;
+import org.hamcrest.Matcher;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -111,7 +114,9 @@ public class NavigatableComponentTest {
public void testZoomToLatLon() {
component.zoomTo(new LatLon(10, 10));
Point2D shouldBeCenter = component.getPoint2D(new LatLon(10, 10));
- assertThat(shouldBeCenter, CustomMatchers.is(new Point2D.Double(WIDTH / 2, HEIGHT / 2)));
+ // 0.5 pixel tolerance, see isAfterZoom
+ assertEquals(shouldBeCenter.getX(), WIDTH / 2., 0.5);
+ assertEquals(shouldBeCenter.getY(), HEIGHT / 2., 0.5);
}
/**
@@ -125,19 +130,19 @@ public class NavigatableComponentTest {
// zoomToFactor(double)
component.zoomToFactor(0.5);
assertEquals(initialScale / 2, component.getScale(), 0.00000001);
- assertEquals(center, component.getCenter());
+ assertThat(component.getCenter(), isAfterZoom(center, component.getScale()));
component.zoomToFactor(2);
assertEquals(initialScale, component.getScale(), 0.00000001);
- assertEquals(center, component.getCenter());
+ assertThat(component.getCenter(), isAfterZoom(center, component.getScale()));
// zoomToFactor(EastNorth, double)
EastNorth newCenter = new EastNorth(10, 20);
component.zoomToFactor(newCenter, 0.5);
assertEquals(initialScale / 2, component.getScale(), 0.00000001);
- assertEquals(newCenter, component.getCenter());
+ assertThat(component.getCenter(), isAfterZoom(newCenter, component.getScale()));
component.zoomToFactor(newCenter, 2);
assertEquals(initialScale, component.getScale(), 0.00000001);
- assertEquals(newCenter, component.getCenter());
+ assertThat(component.getCenter(), isAfterZoom(newCenter, component.getScale()));
}
/**
@@ -165,17 +170,17 @@ public class NavigatableComponentTest {
component.zoomToFactor(0, 0, 0.5);
assertEquals(initialScale / 2, component.getScale(), 0.00000001);
- assertThat(component.getEastNorth(0, 0), CustomMatchers.is(testPoint1));
+ assertThat(component.getEastNorth(0, 0), isAfterZoom(testPoint1, component.getScale()));
component.zoomToFactor(0, 0, 2);
assertEquals(initialScale, component.getScale(), 0.00000001);
- assertThat(component.getEastNorth(0, 0), CustomMatchers.is(testPoint1));
+ assertThat(component.getEastNorth(0, 0), isAfterZoom(testPoint1, component.getScale()));
component.zoomToFactor(200, 150, 0.5);
assertEquals(initialScale / 2, component.getScale(), 0.00000001);
- assertThat(component.getEastNorth(200, 150), CustomMatchers.is(testPoint2));
+ assertThat(component.getEastNorth(200, 150), isAfterZoom(testPoint2, component.getScale()));
component.zoomToFactor(200, 150, 2);
assertEquals(initialScale, component.getScale(), 0.00000001);
- assertThat(component.getEastNorth(200, 150), CustomMatchers.is(testPoint2));
+ assertThat(component.getEastNorth(200, 150), isAfterZoom(testPoint2, component.getScale()));
}
@@ -203,4 +208,24 @@ public class NavigatableComponentTest {
assertThat(bounds.getMax(), CustomMatchers.is(component.getLatLon(WIDTH, 0)));
}
+ /**
+ * Check that EastNorth is the same as expected after zooming the NavigatableComponent.
+ *
+ * Adds tolerance of 0.5 pixel for pixel grid alignment, see
+ * {@link NavigatableComponent#zoomTo(EastNorth, double, boolean)}
+ * @param expected expected
+ * @param scale current scale
+ * @return Matcher object
+ */
+ private Matcher<EastNorth> isAfterZoom(EastNorth expected, double scale) {
+ return new CustomTypeSafeMatcher<EastNorth>(Objects.toString(expected)) {
+ @Override
+ protected boolean matchesSafely(EastNorth actual) {
+ // compare pixels (east/north divided by scale)
+ return Math.abs((expected.getX() - actual.getX()) / scale) <= 0.5
+ && Math.abs((expected.getY() - actual.getY()) / scale) <= 0.5;
+ }
+ };
+ }
+
}
diff --git a/test/unit/org/openstreetmap/josm/gui/datatransfer/ClipboardUtilsTest.java b/test/unit/org/openstreetmap/josm/gui/datatransfer/ClipboardUtilsTest.java
index 01979c9..a3798b7 100644
--- a/test/unit/org/openstreetmap/josm/gui/datatransfer/ClipboardUtilsTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/datatransfer/ClipboardUtilsTest.java
@@ -20,6 +20,7 @@ import org.junit.Test;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
/**
* Basic tests for the clipboard utils class.
@@ -119,4 +120,13 @@ public class ClipboardUtilsTest {
assertTrue(GraphicsEnvironment.isHeadless());
assertNull(ClipboardUtils.getSystemSelection());
}
+
+ /**
+ * Tests that {@code ClipboardUtils} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(ClipboardUtils.class);
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/gui/datatransfer/TagTransferableTest.java b/test/unit/org/openstreetmap/josm/gui/datatransfer/TagTransferableTest.java
new file mode 100644
index 0000000..de009a0
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/datatransfer/TagTransferableTest.java
@@ -0,0 +1,67 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.datatransfer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.gui.datatransfer.data.TagTransferData;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link TagTransferable} class.
+ */
+public class TagTransferableTest {
+
+ /**
+ * Setup tests
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Test of {@link TagTransferable#isDataFlavorSupported} method.
+ */
+ @Test
+ public void testIsDataFlavorSupported() {
+ TagTransferable tt = new TagTransferable(null);
+ assertTrue(tt.isDataFlavorSupported(TagTransferData.FLAVOR));
+ assertTrue(tt.isDataFlavorSupported(DataFlavor.stringFlavor));
+ assertFalse(tt.isDataFlavorSupported(DataFlavor.imageFlavor));
+ assertFalse(tt.isDataFlavorSupported(null));
+ }
+
+ /**
+ * Test of {@link RelationMemberTransferable#getTransferData} method - nominal case.
+ * @throws Exception if an error occurs
+ */
+ @Test
+ public void testGetTransferDataNominal() throws Exception {
+ Map<String, String> tags = new HashMap<>();
+ tags.put("foo", "bar");
+ TagTransferable tt = new TagTransferable(new TagTransferData(tags));
+ assertEquals("foo=bar", tt.getTransferData(DataFlavor.stringFlavor));
+ assertEquals(tags, ((TagTransferData) tt.getTransferData(TagTransferData.FLAVOR)).getTags());
+ }
+
+ /**
+ * Test of {@link TagTransferable#getTransferData} method - error case.
+ * @throws UnsupportedFlavorException always
+ * @throws IOException never
+ */
+ @Test(expected = UnsupportedFlavorException.class)
+ public void testGetTransferDataError() throws UnsupportedFlavorException, IOException {
+ new TagTransferable(null).getTransferData(null);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/ChangesetDialogTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/ChangesetDialogTest.java
new file mode 100644
index 0000000..c457546
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/ChangesetDialogTest.java
@@ -0,0 +1,32 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.dialogs;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.gui.dialogs.ChangesetDialog.LaunchChangesetManager;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
+
+/**
+ * Unit tests of {@link ChangesetDialog} class.
+ */
+public class ChangesetDialogTest {
+
+ /**
+ * Setup tests
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Tests that {@code LaunchChangesetManager} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(LaunchChangesetManager.class);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java
index cc595d5..57f7b8d 100644
--- a/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/dialogs/relation/sort/WayConnectionTypeCalculatorTest.java
@@ -4,6 +4,7 @@ package org.openstreetmap.josm.gui.dialogs.relation.sort;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -96,6 +97,12 @@ public class WayConnectionTypeCalculatorTest {
}
@Test
+ public void testEmpty() {
+ String actual = getConnections(wayConnectionTypeCalculator.updateLinks(new ArrayList<>()));
+ Assert.assertEquals("[]", actual);
+ }
+
+ @Test
public void testGeneric() {
Relation relation = getRelation("generic");
String actual = getConnections(wayConnectionTypeCalculator.updateLinks(relation.getMembers()));
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayerTest.java
new file mode 100644
index 0000000..7ae7bec
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayerTest.java
@@ -0,0 +1,203 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.awt.Point;
+import java.util.Collection;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.gui.jmapviewer.Coordinate;
+import org.openstreetmap.gui.jmapviewer.Projected;
+import org.openstreetmap.gui.jmapviewer.Tile;
+import org.openstreetmap.gui.jmapviewer.TileRange;
+import org.openstreetmap.gui.jmapviewer.TileXY;
+import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
+import org.openstreetmap.gui.jmapviewer.interfaces.IProjected;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileCache;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileLoaderListener;
+import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTMSTileSource;
+import org.openstreetmap.gui.jmapviewer.tilesources.TileSourceInfo;
+import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.data.imagery.TileLoaderFactory;
+import org.openstreetmap.josm.gui.layer.imagery.ImageryFilterSettings;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Test of the base {@link AbstractTileSourceLayer} class
+ */
+public class AbstractTileSourceLayerTest {
+
+ /**
+ * Setup test
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules().platform().projection().commands();
+
+ private static final class TMSTileStubSource extends AbstractTMSTileSource {
+ private TMSTileStubSource() {
+ super(new TileSourceInfo());
+ }
+
+ @Override
+ public double getDistance(double la1, double lo1, double la2, double lo2) {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ @Override
+ public Point latLonToXY(double lat, double lon, int zoom) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public ICoordinate xyToLatLon(int x, int y, int zoom) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public TileXY latLonToTileXY(double lat, double lon, int zoom) {
+ return new TileXY(lon / 2, lat / 2);
+ }
+
+ @Override
+ public ICoordinate tileXYToLatLon(int x, int y, int zoom) {
+ return new Coordinate(2*y, 2*x);
+ }
+
+ @Override
+ public IProjected tileXYtoProjected(int x, int y, int zoom) {
+ return new Projected(2*x, 2*y);
+ }
+
+ @Override
+ public TileXY projectedToTileXY(IProjected p, int zoom) {
+ return new TileXY(p.getEast() / 2, p.getNorth() / 2);
+ }
+
+ @Override
+ public boolean isInside(Tile inner, Tile outer) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public TileRange getCoveringTileRange(Tile tile, int newZoom) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ @Override
+ public String getServerCRS() {
+ return "EPSG:3857";
+ }
+ }
+
+ private static class TileSourceStubLayer extends AbstractTileSourceLayer<AbstractTMSTileSource> {
+
+ TileSourceStubLayer() {
+ super(new ImageryInfo());
+ hookUpMapView();
+ }
+
+ @Override
+ protected TileLoaderFactory getTileLoaderFactory() {
+ return new TileLoaderFactory() {
+ @Override
+ public TileLoader makeTileLoader(TileLoaderListener listener, Map<String, String> headers) {
+ return null;
+ }
+ };
+ }
+
+ @Override
+ public Collection<String> getNativeProjections() {
+ return null;
+ }
+
+ @Override
+ protected AbstractTMSTileSource getTileSource() {
+ return new TMSTileStubSource();
+ }
+
+ TileCache getTileCache() {
+ return tileCache;
+ }
+ }
+
+ private TileSourceStubLayer testLayer;
+ AtomicBoolean invalidated = new AtomicBoolean();
+
+ /**
+ * Create test layer
+ */
+ @Before
+ public void setUp() {
+ testLayer = new TileSourceStubLayer();
+ testLayer.addInvalidationListener(l -> invalidated.set(true));
+ }
+
+ /**
+ * Test {@link AbstractTileSourceLayer#filterChanged}
+ */
+ @Test
+ public void testFilterChanged() {
+ try {
+ ImageryFilterSettings filterSettings = new ImageryFilterSettings();
+ filterSettings.addFilterChangeListener(testLayer);
+ assertFalse(invalidated.get());
+ filterSettings.setGamma(0.5);
+ assertTrue(invalidated.get());
+ } finally {
+ invalidated.set(false);
+ }
+ }
+
+ /**
+ * Test {@link AbstractTileSourceLayer#clearTileCache}
+ */
+ @Test
+ public void testClearTileCache() {
+ testLayer.loadAllTiles(true);
+ assertTrue(testLayer.getTileCache().getTileCount() > 0);
+ testLayer.clearTileCache();
+ assertEquals(0, testLayer.getTileCache().getTileCount());
+ }
+
+ /**
+ * Test {@link AbstractTileSourceLayer#getAdjustAction}
+ */
+ @Test
+ public void testGetAdjustAction() {
+ assertNotNull(testLayer.getAdjustAction());
+ }
+
+ /**
+ * Test {@link AbstractTileSourceLayer#getInfoComponent}
+ */
+ @Test
+ public void testGetInfoComponent() {
+ assertNotNull(testLayer.getInfoComponent());
+ }
+
+ /**
+ * Test {@link AbstractTileSourceLayer.TileSourceLayerPopup}
+ */
+ @Test
+ public void testTileSourceLayerPopup() {
+ assertNotNull(testLayer.new TileSourceLayerPopup());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/LayerManagerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/LayerManagerTest.java
index 73a58b4..5997b31 100644
--- a/test/unit/org/openstreetmap/josm/gui/layer/LayerManagerTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/layer/LayerManagerTest.java
@@ -158,6 +158,7 @@ public class LayerManagerTest {
}
}
+ /** the tested layer manager */
protected LayerManager layerManager;
/**
@@ -396,7 +397,7 @@ public class LayerManagerTest {
}
/**
- * {@link LayerManager#addLayerChangeListener(LayerChangeListener, boolean)} fires fake add events
+ * {@link LayerManager#addAndFireLayerChangeListener(LayerChangeListener)} fires fake add events
*/
@Test
public void testAddLayerChangeListenerFire() {
@@ -405,7 +406,7 @@ public class LayerManagerTest {
TestLayer layer2 = new TestLayer();
layerManager.addLayer(layer1);
layerManager.addLayer(layer2);
- layerManager.addLayerChangeListener(new LayerChangeListener() {
+ layerManager.addAndFireLayerChangeListener(new LayerChangeListener() {
@Override
public void layerRemoving(LayerRemoveEvent e) {
fail();
@@ -420,7 +421,7 @@ public class LayerManagerTest {
public void layerAdded(LayerAddEvent e) {
fired.add(e.getAddedLayer());
}
- }, true);
+ });
assertEquals(Arrays.asList(layer1, layer2), fired);
}
@@ -451,7 +452,7 @@ public class LayerManagerTest {
}
/**
- * {@link LayerManager#removeLayerChangeListener(LayerChangeListener, boolean)} fires fake remove events
+ * {@link LayerManager#removeAndFireLayerChangeListener(LayerChangeListener)} fires fake remove events
*/
@Test
public void testRemoveLayerChangeListenerFire() {
@@ -476,8 +477,8 @@ public class LayerManagerTest {
fail();
}
};
- layerManager.addLayerChangeListener(listener, false);
- layerManager.removeLayerChangeListener(listener, true);
+ layerManager.addLayerChangeListener(listener);
+ layerManager.removeAndFireLayerChangeListener(listener);
assertEquals(Arrays.asList(layer1, layer2), fired);
}
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/MarkerLayerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/MarkerLayerTest.java
new file mode 100644
index 0000000..7de4d8e
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/layer/MarkerLayerTest.java
@@ -0,0 +1,43 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link MarkerLayer} class.
+ */
+public class MarkerLayerTest {
+
+ /**
+ * For creating layers
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules().commands();
+
+ /**
+ * Unit test of {@code Main.map.mapView.playHeadMarker}.
+ */
+ @Test
+ public void testPlayHeadMarker() {
+ try {
+ MarkerLayer layer = new MarkerLayer(new GpxData(), null, null, null);
+ assertNull(Main.map.mapView.playHeadMarker);
+ Main.getLayerManager().addLayer(layer);
+ assertNotNull(Main.map.mapView.playHeadMarker);
+ Main.getLayerManager().removeLayer(layer);
+ } finally {
+ Main.map.mapView.playHeadMarker = null;
+ }
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java b/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java
index 6aaaa94..b39aa88 100644
--- a/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java
@@ -3,32 +3,40 @@ package org.openstreetmap.josm.gui.layer.geoimage;
import static org.junit.Assert.assertEquals;
-import java.text.ParseException;
import java.util.Arrays;
import java.util.Collections;
import java.util.TimeZone;
import org.junit.BeforeClass;
+import org.junit.Rule;
import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
import org.openstreetmap.josm.data.coor.CachedLatLon;
import org.openstreetmap.josm.data.gpx.GpxData;
import org.openstreetmap.josm.io.GpxReaderTest;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
import org.openstreetmap.josm.tools.Pair;
import org.openstreetmap.josm.tools.date.DateUtils;
import org.openstreetmap.josm.tools.date.DateUtilsTest;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
/**
- * Unit tests of {@link CorrelateGpxWithImagesTest} class.
+ * Unit tests of {@link CorrelateGpxWithImages} class.
*/
public class CorrelateGpxWithImagesTest {
/**
* Setup test.
*/
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Setup test.
+ */
@BeforeClass
public static void setUp() {
- JOSMFixture.createUnitTestFixture().init();
DateUtilsTest.setTimeZone(TimeZone.getTimeZone("UTC"));
}
@@ -74,79 +82,7 @@ public class CorrelateGpxWithImagesTest {
final ImageEntry i0 = new ImageEntry();
i0.setExifTime(DateUtils.fromString("2016:01:03 11:59:54")); // 4 sec before start of GPX
i0.createTmp();
- assertEquals(Pair.create(CorrelateGpxWithImages.Timezone.ZERO, CorrelateGpxWithImages.Offset.seconds(-4)),
+ assertEquals(Pair.create(Timezone.ZERO, Offset.seconds(-4)),
CorrelateGpxWithImages.autoGuess(Collections.singletonList(i0), gpx));
}
-
- /**
- * Unit test of {@link CorrelateGpxWithImages.Timezone#formatTimezone}.
- */
- @Test
- public void testFormatTimezone() {
- assertEquals("+1:00", new CorrelateGpxWithImages.Timezone(1).formatTimezone());
- assertEquals("+6:30", new CorrelateGpxWithImages.Timezone(6.5).formatTimezone());
- assertEquals("-6:30", new CorrelateGpxWithImages.Timezone(-6.5).formatTimezone());
- assertEquals("+3:08", new CorrelateGpxWithImages.Timezone(Math.PI).formatTimezone());
- assertEquals("+2:43", new CorrelateGpxWithImages.Timezone(Math.E).formatTimezone());
- }
-
- /**
- * Unit test of {@link CorrelateGpxWithImages.Timezone#parseTimezone}.
- * @throws ParseException in case of parsing error
- */
- @Test
- public void testParseTimezone() throws ParseException {
- assertEquals(1, CorrelateGpxWithImages.Timezone.parseTimezone("+01:00").getHours(), 1e-3);
- assertEquals(1, CorrelateGpxWithImages.Timezone.parseTimezone("+1:00").getHours(), 1e-3);
- assertEquals(1.5, CorrelateGpxWithImages.Timezone.parseTimezone("+01:30").getHours(), 1e-3);
- assertEquals(11.5, CorrelateGpxWithImages.Timezone.parseTimezone("+11:30").getHours(), 1e-3);
- }
-
- /**
- * Unit test of {@link CorrelateGpxWithImages.Offset#formatOffset}.
- */
- @Test
- public void testFormatOffset() {
- assertEquals("0", CorrelateGpxWithImages.Offset.seconds(0).formatOffset());
- assertEquals("123", CorrelateGpxWithImages.Offset.seconds(123).formatOffset());
- assertEquals("-4242", CorrelateGpxWithImages.Offset.seconds(-4242).formatOffset());
- assertEquals("0.1", CorrelateGpxWithImages.Offset.milliseconds(100).formatOffset());
- assertEquals("0.120", CorrelateGpxWithImages.Offset.milliseconds(120).formatOffset());
- assertEquals("0.123", CorrelateGpxWithImages.Offset.milliseconds(123).formatOffset());
- assertEquals("1.2", CorrelateGpxWithImages.Offset.milliseconds(1200).formatOffset());
- assertEquals("1.234", CorrelateGpxWithImages.Offset.milliseconds(1234).formatOffset());
- }
-
- /**
- * Unit test of {@link CorrelateGpxWithImages.Offset#parseOffset}.
- * @throws ParseException in case of parsing error
- */
- @Test
- public void testParseOffest() throws ParseException {
- assertEquals(0, CorrelateGpxWithImages.Offset.parseOffset("0").getSeconds());
- assertEquals(4242L, CorrelateGpxWithImages.Offset.parseOffset("4242").getSeconds());
- assertEquals(-4242L, CorrelateGpxWithImages.Offset.parseOffset("-4242").getSeconds());
- assertEquals(0L, CorrelateGpxWithImages.Offset.parseOffset("-0").getSeconds());
- assertEquals(100L, CorrelateGpxWithImages.Offset.parseOffset("0.1").getMilliseconds());
- assertEquals(123L, CorrelateGpxWithImages.Offset.parseOffset("0.123").getMilliseconds());
- assertEquals(-42420L, CorrelateGpxWithImages.Offset.parseOffset("-42.42").getMilliseconds());
- }
-
- /**
- * Unit test of {@link CorrelateGpxWithImages.Offset#splitOutTimezone}.
- */
- @Test
- public void testSplitOutTimezone() {
- assertEquals("+1:00", CorrelateGpxWithImages.Offset.seconds(3602).splitOutTimezone().a.formatTimezone());
- assertEquals("2", CorrelateGpxWithImages.Offset.seconds(3602).splitOutTimezone().b.formatOffset());
- assertEquals("-7:00", CorrelateGpxWithImages.Offset.seconds(-7 * 3600 + 123).splitOutTimezone().a.formatTimezone());
- assertEquals("123", CorrelateGpxWithImages.Offset.seconds(-7 * 3600 + 123).splitOutTimezone().b.formatOffset());
- assertEquals(1, CorrelateGpxWithImages.Offset.seconds(35 * 3600 + 421).getDayOffset());
- assertEquals(11 * 3600 + 421, CorrelateGpxWithImages.Offset.seconds(35 * 3600 + 421).withoutDayOffset().getSeconds());
- assertEquals("+11:00", CorrelateGpxWithImages.Offset.seconds(35 * 3600 + 421).splitOutTimezone().a.formatTimezone());
- assertEquals(86400 + 421, CorrelateGpxWithImages.Offset.seconds(35 * 3600 + 421).splitOutTimezone().b.getSeconds());
- assertEquals(421, CorrelateGpxWithImages.Offset.seconds(35 * 3600 + 421).withoutDayOffset().splitOutTimezone().b.getSeconds());
- assertEquals("+1:00", CorrelateGpxWithImages.Offset.milliseconds(3602987).splitOutTimezone().a.formatTimezone());
- assertEquals("2.987", CorrelateGpxWithImages.Offset.milliseconds(3602987).splitOutTimezone().b.formatOffset());
- }
}
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/geoimage/OffsetTest.java b/test/unit/org/openstreetmap/josm/gui/layer/geoimage/OffsetTest.java
new file mode 100644
index 0000000..c536356
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/layer/geoimage/OffsetTest.java
@@ -0,0 +1,84 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.geoimage;
+
+import static org.junit.Assert.assertEquals;
+
+import java.text.ParseException;
+import java.util.TimeZone;
+
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.date.DateUtilsTest;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link Offset} class.
+ */
+public class OffsetTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ DateUtilsTest.setTimeZone(TimeZone.getTimeZone("UTC"));
+ }
+
+ /**
+ * Unit test of {@link Offset#formatOffset}.
+ */
+ @Test
+ public void testFormatOffset() {
+ assertEquals("0", Offset.seconds(0).formatOffset());
+ assertEquals("123", Offset.seconds(123).formatOffset());
+ assertEquals("-4242", Offset.seconds(-4242).formatOffset());
+ assertEquals("0.1", Offset.milliseconds(100).formatOffset());
+ assertEquals("0.120", Offset.milliseconds(120).formatOffset());
+ assertEquals("0.123", Offset.milliseconds(123).formatOffset());
+ assertEquals("1.2", Offset.milliseconds(1200).formatOffset());
+ assertEquals("1.234", Offset.milliseconds(1234).formatOffset());
+ }
+
+ /**
+ * Unit test of {@link Offset#parseOffset}.
+ * @throws ParseException in case of parsing error
+ */
+ @Test
+ public void testParseOffest() throws ParseException {
+ assertEquals(0, Offset.parseOffset("0").getSeconds());
+ assertEquals(4242L, Offset.parseOffset("4242").getSeconds());
+ assertEquals(-4242L, Offset.parseOffset("-4242").getSeconds());
+ assertEquals(0L, Offset.parseOffset("-0").getSeconds());
+ assertEquals(100L, Offset.parseOffset("0.1").getMilliseconds());
+ assertEquals(123L, Offset.parseOffset("0.123").getMilliseconds());
+ assertEquals(-42420L, Offset.parseOffset("-42.42").getMilliseconds());
+ }
+
+ /**
+ * Unit test of {@link Offset#splitOutTimezone}.
+ */
+ @Test
+ public void testSplitOutTimezone() {
+ assertEquals("+1:00", Offset.seconds(3602).splitOutTimezone().a.formatTimezone());
+ assertEquals("2", Offset.seconds(3602).splitOutTimezone().b.formatOffset());
+ assertEquals("-7:00", Offset.seconds(-7 * 3600 + 123).splitOutTimezone().a.formatTimezone());
+ assertEquals("123", Offset.seconds(-7 * 3600 + 123).splitOutTimezone().b.formatOffset());
+ assertEquals(1, Offset.seconds(35 * 3600 + 421).getDayOffset());
+ assertEquals(11 * 3600 + 421, Offset.seconds(35 * 3600 + 421).withoutDayOffset().getSeconds());
+ assertEquals("+11:00", Offset.seconds(35 * 3600 + 421).splitOutTimezone().a.formatTimezone());
+ assertEquals(86400 + 421, Offset.seconds(35 * 3600 + 421).splitOutTimezone().b.getSeconds());
+ assertEquals(421, Offset.seconds(35 * 3600 + 421).withoutDayOffset().splitOutTimezone().b.getSeconds());
+ assertEquals("+1:00", Offset.milliseconds(3602987).splitOutTimezone().a.formatTimezone());
+ assertEquals("2.987", Offset.milliseconds(3602987).splitOutTimezone().b.formatOffset());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/geoimage/TimezoneTest.java b/test/unit/org/openstreetmap/josm/gui/layer/geoimage/TimezoneTest.java
new file mode 100644
index 0000000..a667909
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/layer/geoimage/TimezoneTest.java
@@ -0,0 +1,60 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.layer.geoimage;
+
+import static org.junit.Assert.assertEquals;
+
+import java.text.ParseException;
+import java.util.TimeZone;
+
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.date.DateUtilsTest;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link Timezone} class.
+ */
+public class TimezoneTest {
+
+ /**
+ * Setup test.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Setup test.
+ */
+ @BeforeClass
+ public static void setUp() {
+ DateUtilsTest.setTimeZone(TimeZone.getTimeZone("UTC"));
+ }
+
+ /**
+ * Unit test of {@link Timezone#formatTimezone}.
+ */
+ @Test
+ public void testFormatTimezone() {
+ assertEquals("+1:00", new Timezone(1).formatTimezone());
+ assertEquals("+6:30", new Timezone(6.5).formatTimezone());
+ assertEquals("-6:30", new Timezone(-6.5).formatTimezone());
+ assertEquals("+3:08", new Timezone(Math.PI).formatTimezone());
+ assertEquals("+2:43", new Timezone(Math.E).formatTimezone());
+ }
+
+ /**
+ * Unit test of {@link Timezone#parseTimezone}.
+ * @throws ParseException in case of parsing error
+ */
+ @Test
+ public void testParseTimezone() throws ParseException {
+ assertEquals(1, Timezone.parseTimezone("+01:00").getHours(), 1e-3);
+ assertEquals(1, Timezone.parseTimezone("+1:00").getHours(), 1e-3);
+ assertEquals(1.5, Timezone.parseTimezone("+01:30").getHours(), 1e-3);
+ assertEquals(11.5, Timezone.parseTimezone("+11:30").getHours(), 1e-3);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactoryTest.java b/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactoryTest.java
index 9432cb4..e231cfa 100644
--- a/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactoryTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactoryTest.java
@@ -5,9 +5,11 @@ import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.gui.mappaint.mapcss.Condition.Context;
import org.openstreetmap.josm.gui.mappaint.mapcss.ConditionFactory.Op;
+import org.openstreetmap.josm.gui.mappaint.mapcss.ConditionFactory.PseudoClasses;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
/**
* Unit tests of {@link ConditionFactory}.
@@ -29,4 +31,13 @@ public class ConditionFactoryTest {
public void testTicket14368() throws Exception {
ConditionFactory.createKeyValueCondition("name", "Rodovia ([A-Z]{2,3}-[0-9]{2,4}", Op.REGEX, Context.PRIMITIVE, false);
}
+
+ /**
+ * Tests that {@code PseudoClasses} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(PseudoClasses.class);
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactoryTest.java b/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactoryTest.java
new file mode 100644
index 0000000..9c00bc3
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactoryTest.java
@@ -0,0 +1,32 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.mappaint.mapcss;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.gui.mappaint.mapcss.ExpressionFactory.Functions;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
+
+/**
+ * Unit tests of {@link ExpressionFactory}.
+ */
+public class ExpressionFactoryTest {
+
+ /**
+ * Setup rule
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Tests that {@code Functions} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(Functions.class);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java b/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java
index a9ab6a4..9731f9e 100644
--- a/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/preferences/plugin/PluginPreferenceTest.java
@@ -16,6 +16,7 @@ import org.openstreetmap.josm.TestUtils;
import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
import org.openstreetmap.josm.plugins.PluginDownloadTask;
+import org.openstreetmap.josm.plugins.PluginException;
import org.openstreetmap.josm.plugins.PluginInformation;
/**
@@ -40,13 +41,22 @@ public class PluginPreferenceTest {
}
/**
+ * Returns a dummy plugin information.
+ * @return a dummy plugin information
+ * @throws PluginException if an error occurs
+ */
+ public static PluginInformation getDummyPluginInformation() throws PluginException {
+ return new PluginInformation(
+ new File(TestUtils.getTestDataRoot() + "plugin/dummy_plugin.jar"), "dummy_plugin");
+ }
+
+ /**
* Unit test of {@link PluginPreference#buildDownloadSummary}.
* @throws Exception if an error occurs
*/
@Test
public void testBuildDownloadSummary() throws Exception {
- final PluginInformation dummy = new PluginInformation(
- new File(TestUtils.getTestDataRoot() + "plugin/dummy_plugin.jar"), "dummy_plugin");
+ final PluginInformation dummy = getDummyPluginInformation();
assertEquals("", PluginPreference.buildDownloadSummary(
new PluginDownloadTask(NullProgressMonitor.INSTANCE, Collections.<PluginInformation>emptyList(), "")));
assertEquals("", PluginPreference.buildDownloadSummary(
diff --git a/test/unit/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManagerTest.java b/test/unit/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManagerTest.java
new file mode 100644
index 0000000..2c3f2cf
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionManagerTest.java
@@ -0,0 +1,32 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.ac;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager.UserInputTag;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import nl.jqno.equalsverifier.EqualsVerifier;
+
+/**
+ * Unit tests of {@link AutoCompletionManager} class.
+ */
+public class AutoCompletionManagerTest {
+
+ /**
+ * Setup rule
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of methods {@link UserInputTag#equals} and {@link UserInputTag#hashCode}.
+ */
+ @Test
+ public void testEqualsContract() {
+ EqualsVerifier.forClass(UserInputTag.class).usingGetClass()
+ .verify();
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReaderTest.java b/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReaderTest.java
index 25559b8..21bca48 100644
--- a/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReaderTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetReaderTest.java
@@ -12,26 +12,27 @@ import java.util.List;
import java.util.stream.Collectors;
import org.junit.Assert;
-import org.junit.BeforeClass;
+import org.junit.Rule;
import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
import org.openstreetmap.josm.TestUtils;
import org.openstreetmap.josm.gui.tagging.presets.items.Check;
import org.openstreetmap.josm.gui.tagging.presets.items.Key;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
import org.xml.sax.SAXException;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
/**
* Unit tests of {@link TaggingPresetReader} class.
*/
public class TaggingPresetReaderTest {
/**
- * Setup test.
+ * Setup rule
*/
- @BeforeClass
- public static void setUp() {
- JOSMFixture.createUnitTestFixture().init();
- }
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules().platform();
/**
* #8954 - last checkbox in the preset is not added
diff --git a/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetsTest.java b/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetsTest.java
new file mode 100644
index 0000000..3f52beb
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetsTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.gui.tagging.presets;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
+
+/**
+ * Unit tests of {@link TaggingPresets} class.
+ */
+public class TaggingPresetsTest {
+
+ /**
+ * Setup rule
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Tests that {@code TaggingPresets} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(TaggingPresets.class);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTest.java b/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTest.java
index 64b5089..d555305 100644
--- a/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTest.java
+++ b/test/unit/org/openstreetmap/josm/io/CertificateAmendmentTest.java
@@ -8,9 +8,12 @@ import java.net.URLConnection;
import javax.net.ssl.SSLHandshakeException;
import org.junit.Assert;
-import org.junit.BeforeClass;
+import org.junit.Rule;
import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
/**
* Unit tests of {@link CertificateAmendment} class.
@@ -18,11 +21,19 @@ import org.openstreetmap.josm.JOSMFixture;
public class CertificateAmendmentTest {
/**
- * Setup test.
+ * Setup rule
*/
- @BeforeClass
- public static void setUp() {
- JOSMFixture.createUnitTestFixture().init();
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules().platform().https();
+
+ /**
+ * Tests that {@code CertificateAmendment} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(CertificateAmendment.class);
}
/**
@@ -31,7 +42,7 @@ public class CertificateAmendmentTest {
*/
@Test
public void testDefault() throws IOException {
- // something that is neither DST nor StartSSL
+ // something that is not embedded
connect("https://google.com", true);
}
@@ -52,16 +63,6 @@ public class CertificateAmendmentTest {
}
/**
- * Test <a href="https://www.startssl.com">StartSSL</a>.
- * @throws IOException in case of I/O error
- */
- @Test
- public void testStartSSL() throws IOException {
- connect("https://map.dgpsonline.eu", true);
- connect("https://www.startssl.com", true);
- }
-
- /**
* Test a broken certificate.
* @throws IOException in case of I/O error
*/
@@ -80,6 +81,15 @@ public class CertificateAmendmentTest {
connect("https://overpass-api.de", true);
}
+ /**
+ * Test Dutch government.
+ * @throws IOException in case of I/O error
+ */
+ @Test
+ public void testDutchGovernment() throws IOException {
+ connect("https://geodata.nationaalgeoregister.nl", true);
+ }
+
private static void connect(String url, boolean shouldWork) throws IOException {
URLConnection connection = new URL(url).openConnection();
try {
diff --git a/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java b/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java
index 1941c43..8bd3657 100644
--- a/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java
+++ b/test/unit/org/openstreetmap/josm/io/OverpassDownloadReaderTest.java
@@ -2,11 +2,15 @@
package org.openstreetmap.josm.io;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.util.regex.Matcher;
import org.junit.Rule;
import org.junit.Test;
import org.openstreetmap.josm.data.Bounds;
import org.openstreetmap.josm.gui.preferences.server.OverpassServerPreference;
+import org.openstreetmap.josm.io.OverpassDownloadReader.OverpassOutpoutFormat;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import org.openstreetmap.josm.tools.OverpassTurboQueryWizard;
import org.openstreetmap.josm.tools.Utils;
@@ -76,4 +80,26 @@ public class OverpassDownloadReaderTest {
final String query = OverpassDownloadReader.expandExtendedQueries("{{geocodeArea:foo-bar-baz-does-not-exist}}");
assertEquals("// Failed to evaluate {{geocodeArea:foo-bar-baz-does-not-exist}}\n", query);
}
+
+ /**
+ * Tests evaluating the overpass output format statements.
+ */
+ @Test
+ public void testOutputFormatStatement() {
+ for (OverpassOutpoutFormat oof : OverpassOutpoutFormat.values()) {
+ Matcher m = OverpassDownloadReader.OUTPUT_FORMAT_STATEMENT.matcher("[out:"+oof.getDirective()+"]");
+ assertTrue(m.matches());
+ assertEquals(oof.getDirective(), m.group(1));
+ }
+
+ assertTrue(OverpassDownloadReader.OUTPUT_FORMAT_STATEMENT.matcher(
+ "[out:pbf][timeout:25][bbox:{{bbox}}];\n" +
+ "(\n" +
+ " node[\"amenity\"=\"pharmacy\"];\n" +
+ " way[\"amenity\"=\"pharmacy\"];\n" +
+ " relation[\"amenity\"=\"pharmacy\"];\n" +
+ ");\n" +
+ "(._;>;);\n" +
+ "out meta;").matches());
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java b/test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java
new file mode 100644
index 0000000..b45bc09
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/io/imagery/WMSImageryTest.java
@@ -0,0 +1,38 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.io.imagery;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.io.imagery.WMSImagery.WMSGetCapabilitiesException;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+
+/**
+ * Unit tests of {@link WMSImagery} class.
+ */
+public class WMSImageryTest {
+
+ /**
+ * Setup test
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Unit test of {@code WMSImagery.WMSGetCapabilitiesException} class
+ */
+ @Test
+ public void testWMSGetCapabilitiesException() {
+ Exception cause = new Exception("test");
+ WMSGetCapabilitiesException exc = new WMSGetCapabilitiesException(cause, "bar");
+ assertEquals(cause, exc.getCause());
+ assertEquals("bar", exc.getIncomingData());
+ exc = new WMSGetCapabilitiesException("foo", "bar");
+ assertEquals("foo", exc.getMessage());
+ assertEquals("bar", exc.getIncomingData());
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java b/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java
index 1acafbd..606cb4d 100644
--- a/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java
+++ b/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java
@@ -14,7 +14,9 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.openstreetmap.josm.JOSMFixture;
import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.preferences.plugin.PluginPreferenceTest;
import org.openstreetmap.josm.plugins.PluginHandler.DeprecatedPlugin;
+import org.openstreetmap.josm.plugins.PluginHandler.PluginInformationAction;
import org.openstreetmap.josm.tools.Utils;
import nl.jqno.equalsverifier.EqualsVerifier;
@@ -83,4 +85,27 @@ public class PluginHandlerTest {
assertEquals(2, plugins.size());
assertFalse(plugins.contains("gpsbabelgui"));
}
+
+ /**
+ * Unit test of {@link PluginInformationAction} class.
+ * @throws PluginException if an error occurs
+ */
+ @Test
+ public void testPluginInformationAction() throws PluginException {
+ PluginInformationAction action = new PluginInformationAction(PluginPreferenceTest.getDummyPluginInformation());
+ assertEquals(
+ "Ant-Version: Apache Ant 1.9.6\n" +
+ "Author: Don-vip\n" +
+ "Created-By: 1.7.0_91-b02 (Oracle Corporation)\n" +
+ "Manifest-Version: 1.0\n" +
+ "Plugin-Canloadatruntime: true\n" +
+ "Plugin-Class: org.openstreetmap.josm.plugins.fr.epci.EpciPlugin\n" +
+ "Plugin-Date: 2015-11-19T08:21:07.645033Z\n" +
+ "Plugin-Description: Handling of French EPCIs (boundary=local_authority)\n" +
+ "Plugin-Early: true\n" +
+ "Plugin-Link: http://wiki.openstreetmap.org/wiki/FR:JOSM/Fr:Plugin/EPCI-fr\n" +
+ "Plugin-Mainversion: 7001\n" +
+ "Plugin-Version: 31772\n", action.getText());
+ action.actionPerformed(null);
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java b/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
index 5b7ecdd..e227211 100644
--- a/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
+++ b/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java
@@ -3,6 +3,7 @@ package org.openstreetmap.josm.testutils;
import java.io.File;
import java.io.IOException;
+import java.security.GeneralSecurityException;
import java.text.MessageFormat;
import java.util.TimeZone;
@@ -16,10 +17,12 @@ import org.openstreetmap.josm.Main;
import org.openstreetmap.josm.data.projection.Projections;
import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.io.CertificateAmendment;
import org.openstreetmap.josm.io.OsmApi;
import org.openstreetmap.josm.io.OsmApiInitializationException;
import org.openstreetmap.josm.io.OsmTransferCanceledException;
import org.openstreetmap.josm.tools.I18n;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.Logging;
import org.openstreetmap.josm.tools.MemoryManagerTest;
import org.openstreetmap.josm.tools.date.DateUtils;
@@ -45,6 +48,7 @@ public class JOSMTestRules implements TestRule {
private boolean commands;
private boolean allowMemoryManagerLeaks;
private boolean useMapStyles;
+ private boolean useHttps;
/**
* Disable the default timeout for this test. Use with care.
@@ -140,6 +144,15 @@ public class JOSMTestRules implements TestRule {
}
/**
+ * Set up HTTPS certificates
+ * @return this instance, for easy chaining
+ */
+ public JOSMTestRules https() {
+ useHttps = true;
+ return this;
+ }
+
+ /**
* Allow the execution of commands using {@link Main#undoRedo}
* @return this instance, for easy chaining
*/
@@ -221,6 +234,19 @@ public class JOSMTestRules implements TestRule {
Main.pref.put("osm-server.url", "http://invalid");
}
+ // Set Platform
+ if (platform) {
+ Main.determinePlatformHook();
+ }
+
+ if (useHttps) {
+ try {
+ CertificateAmendment.addMissingCertificates();
+ } catch (IOException | GeneralSecurityException ex) {
+ throw new JosmRuntimeException(ex);
+ }
+ }
+
if (useProjection) {
Main.setProjection(Projections.getProjectionByCode("EPSG:3857")); // Mercator
}
@@ -242,11 +268,6 @@ public class JOSMTestRules implements TestRule {
}
}
- // Set Platform
- if (platform) {
- Main.determinePlatformHook();
- }
-
if (useMapStyles) {
// Reset the map paint styles.
MapPaintStyles.readFromPreferences();
diff --git a/test/unit/org/openstreetmap/josm/tools/CheckParameterUtilTest.java b/test/unit/org/openstreetmap/josm/tools/CheckParameterUtilTest.java
new file mode 100644
index 0000000..55e2bde
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/tools/CheckParameterUtilTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
+
+/**
+ * Unit tests of {@link CheckParameterUtil} class.
+ */
+public class CheckParameterUtilTest {
+
+ /**
+ * Setup rule.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Tests that {@code CheckParameterUtil} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(CheckParameterUtil.class);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/tools/FontsManagerTest.java b/test/unit/org/openstreetmap/josm/tools/FontsManagerTest.java
index bd3f1d9..88440f8 100644
--- a/test/unit/org/openstreetmap/josm/tools/FontsManagerTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/FontsManagerTest.java
@@ -11,6 +11,7 @@ import org.junit.Test;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
/**
* Unit tests of {@link FontsManager} class.
@@ -41,4 +42,13 @@ public class FontsManagerTest {
fail("DroidSans font not found");
}
}
+
+ /**
+ * Tests that {@code FontsManager} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(FontsManager.class);
+ }
}
diff --git a/test/unit/org/openstreetmap/josm/tools/RightAndLefthandTrafficTest.java b/test/unit/org/openstreetmap/josm/tools/RightAndLefthandTrafficTest.java
index 8bb833e..349c0c1 100644
--- a/test/unit/org/openstreetmap/josm/tools/RightAndLefthandTrafficTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/RightAndLefthandTrafficTest.java
@@ -9,6 +9,7 @@ import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
/**
* Unit tests of {@link RightAndLefthandTraffic} class.
@@ -22,6 +23,15 @@ public class RightAndLefthandTrafficTest {
public JOSMTestRules rules = new JOSMTestRules().platform().projection().commands();
/**
+ * Tests that {@code RightAndLefthandTraffic} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(RightAndLefthandTraffic.class);
+ }
+
+ /**
* Test of {@link RightAndLefthandTraffic#isRightHandTraffic} method.
*/
@Test
diff --git a/test/unit/org/openstreetmap/josm/tools/StreamUtilsTest.java b/test/unit/org/openstreetmap/josm/tools/StreamUtilsTest.java
new file mode 100644
index 0000000..3ce6111
--- /dev/null
+++ b/test/unit/org/openstreetmap/josm/tools/StreamUtilsTest.java
@@ -0,0 +1,31 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.tools;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
+
+/**
+ * Unit tests of {@link StreamUtils} class.
+ */
+public class StreamUtilsTest {
+
+ /**
+ * Setup rule.
+ */
+ @Rule
+ @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+ public JOSMTestRules test = new JOSMTestRules();
+
+ /**
+ * Tests that {@code StreamUtils} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(StreamUtils.class);
+ }
+}
diff --git a/test/unit/org/openstreetmap/josm/tools/TerritoriesTest.java b/test/unit/org/openstreetmap/josm/tools/TerritoriesTest.java
index 7ade6f7..7fa85f0 100644
--- a/test/unit/org/openstreetmap/josm/tools/TerritoriesTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/TerritoriesTest.java
@@ -9,6 +9,7 @@ import org.openstreetmap.josm.data.coor.LatLon;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
/**
* Unit tests of {@link Territories} class.
@@ -22,10 +23,19 @@ public class TerritoriesTest {
public JOSMTestRules rules = new JOSMTestRules().platform().projection().commands();
/**
- * Test of {@link Territories#getIso3166Codes} method.
+ * Tests that {@code Territories} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
*/
@Test
- public void testGetIso3166Codes() {
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(Territories.class);
+ }
+
+ /**
+ * Test of {@link Territories#isIso3166Code} method.
+ */
+ @Test
+ public void testIsIso3166Code() {
check("Paris", new LatLon(48.8567, 2.3508), "EU", "FR", "FX");
}
diff --git a/test/unit/org/openstreetmap/josm/tools/UtilsTest.java b/test/unit/org/openstreetmap/josm/tools/UtilsTest.java
index f86adc2..723b360 100644
--- a/test/unit/org/openstreetmap/josm/tools/UtilsTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/UtilsTest.java
@@ -17,6 +17,7 @@ import org.junit.Test;
import org.openstreetmap.josm.testutils.JOSMTestRules;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
/**
* Unit tests of {@link Utils} class.
@@ -30,6 +31,15 @@ public class UtilsTest {
public JOSMTestRules rules = new JOSMTestRules();
/**
+ * Tests that {@code Utils} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(Utils.class);
+ }
+
+ /**
* Test of {@link Utils#strip} method.
*/
@Test
diff --git a/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java b/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java
index b9df7ac..290edbb 100644
--- a/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java
@@ -15,6 +15,7 @@ import org.openstreetmap.josm.testutils.JOSMTestRules;
import org.openstreetmap.josm.tools.UncheckedParseException;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
+import net.trajano.commons.testing.UtilityClassTestUtil;
/**
* Unit tests of {@link DateUtils} class.
@@ -31,6 +32,15 @@ public class DateUtilsTest {
public JOSMTestRules test = new JOSMTestRules().i18n().preferences();
/**
+ * Tests that {@code DateUtils} satisfies utility class criterias.
+ * @throws ReflectiveOperationException if an error occurs
+ */
+ @Test
+ public void testUtilityClass() throws ReflectiveOperationException {
+ UtilityClassTestUtil.assertUtilityClassWellDefined(DateUtils.class);
+ }
+
+ /**
* Allows to override the timezone used in {@link DateUtils} for unit tests.
* @param zone the timezone to use
*/
@@ -208,13 +218,4 @@ public class DateUtilsTest {
DateUtils.PROP_ISO_DATES.put(iso);
}
}
-
- /**
- * Unit test to reach 100% code coverage.
- */
- @Test
- @SuppressFBWarnings(value = "ISC_INSTANTIATE_STATIC_CLASS")
- public void testCoverage() {
- assertNotNull(new DateUtils());
- }
}
diff --git a/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java b/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java
index a525310..78e8422 100644
--- a/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java
+++ b/test/unit/org/openstreetmap/josm/tools/template_engine/TemplateParserTest.java
@@ -236,6 +236,25 @@ public class TemplateParserTest {
}
@Test
+ public void testSetAnd() throws ParseError {
+ TemplateParser parser = new TemplateParser("!{(parent(type=child) type=parent) & (parent type=child subtype=parent) '{name}'}");
+ DatasetFactory ds = new DatasetFactory();
+ Relation parent1 = ds.addRelation(1);
+ parent1.put("type", "parent");
+ parent1.put("subtype", "parent");
+ parent1.put("name", "name_parent1");
+ Node child = ds.addNode(1);
+ child.put("type", "child");
+ parent1.addMember(new RelationMember("", child));
+
+ StringBuilder sb = new StringBuilder();
+ TemplateEntry entry = parser.parse();
+ entry.appendText(sb, child);
+
+ Assert.assertEquals("name_parent1", sb.toString());
+ }
+
+ @Test
public void testSetOr() throws ParseError {
TemplateParser parser = new TemplateParser("!{(parent(type=type1) type=parent1) | (parent type=type2 type=parent2) '{name}'}");
DatasetFactory ds = new DatasetFactory();
diff --git a/tools/checkstyle/josm_checks.xml b/tools/checkstyle/josm_checks.xml
index 44dbe86..9027596 100644
--- a/tools/checkstyle/josm_checks.xml
+++ b/tools/checkstyle/josm_checks.xml
@@ -14,7 +14,7 @@ JOSM Checkstyle rules
<property name="charset" value="UTF-8"/>
<module name="TreeWalker">
<module name="BooleanExpressionComplexity">
- <property name="max" value="6"/>
+ <property name="max" value="7"/>
</module>
<module name="CatchParameterName">
<property name="format" value="^(e[1-9]?|t|ex[1-9]?|[a-z][a-z][a-zA-Z]+)$"/>
diff --git a/tools/findbugs/josm-filter.xml b/tools/findbugs/josm-filter.xml
index 629a76d..5662957 100644
--- a/tools/findbugs/josm-filter.xml
+++ b/tools/findbugs/josm-filter.xml
@@ -10,6 +10,9 @@
<Bug pattern="EQ_DOESNT_OVERRIDE_EQUALS" />
</Match>
<Match>
+ <Bug pattern="NM_CONFUSING" />
+ </Match>
+ <Match>
<Bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE" />
</Match>
<Match>
@@ -19,10 +22,26 @@
<Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED" />
</Match>
<Match>
+ <Bug pattern="UI_INHERITANCE_UNSAFE_GETRESOURCE" />
+ </Match>
+ <Match>
<Bug pattern="UWF_FIELD_NOT_INITIALIZED_IN_CONSTRUCTOR" />
</Match>
<Match>
+ <Bug pattern="EI_EXPOSE_REP2" />
+ <Class name="org.openstreetmap.josm.tools.CopyList" />
+ </Match>
+ <Match>
+ <Bug pattern="MS_CANNOT_BE_FINAL" />
+ <Class name="org.openstreetmap.josm.Main" />
+ </Match>
+ <Match>
+ <Bug pattern="MS_SHOULD_BE_FINAL" />
+ <Class name="org.openstreetmap.josm.Main" />
+ </Match>
+
+ <Match>
<Class name="~com.*" />
</Match>
<Match>
diff --git a/tools/pmd/josm-ruleset.xml b/tools/pmd/josm-ruleset.xml
index 6201bf3..fe99608 100644
--- a/tools/pmd/josm-ruleset.xml
+++ b/tools/pmd/josm-ruleset.xml
@@ -16,11 +16,16 @@
<rule ref="rulesets/java/finalizers.xml"/>
<rule ref="rulesets/java/imports.xml"/>
<rule ref="rulesets/java/migrating.xml"/>
- <rule ref="rulesets/java/naming.xml"/>
+ <rule ref="rulesets/java/naming.xml"/>-->
<rule ref="rulesets/java/optimizations.xml">
<exclude name="LocalVariableCouldBeFinal"/>
<exclude name="MethodArgumentCouldBeFinal"/>
- </rule>-->
+ <exclude name="AvoidInstantiatingObjectsInLoops"/>
+ <exclude name="PrematureDeclaration"/>
+ <exclude name="SimplifyStartsWith"/>
+ <exclude name="UseStringBufferForStringAppends"/>
+ <exclude name="UseArrayListInsteadOfVector"/>
+ </rule>
<rule ref="rulesets/java/strictexception.xml">
<exclude name="ExceptionAsFlowControl"/>
<exclude name="AvoidRethrowingException"/>
@@ -31,6 +36,7 @@
<exclude name="AvoidStringBufferField"/>
<exclude name="StringToString"/>
<exclude name="UselessStringValueOf"/>
+ <exclude name="InefficientEmptyStringCheck"/>
</rule>
<rule ref="rulesets/java/typeresolution.xml">
<exclude name="LooseCoupling"/>
--
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